Skip to content

Weblate: Merge with develop to resolve conflict#8672

Merged
tristanlabelle merged 2 commits into
developfrom
i18n/merge-weblate
May 18, 2026
Merged

Weblate: Merge with develop to resolve conflict#8672
tristanlabelle merged 2 commits into
developfrom
i18n/merge-weblate

Conversation

@tristanlabelle

Copy link
Copy Markdown
Contributor

Weblate locked because of a race between git and weblate changes. Merge weblate/develop to resolve.

For maintainers

  • Maintainers can push commits to my branch
  • Maintainers can merge this PR for me

Chris Kreuz and others added 2 commits May 18, 2026 07:32
Currently translated at 100.0% (269 of 269 strings)

Translation: Couchers/Web app - Global
Translate-URL: https://translate.couchershq.org/projects/couchers/web-app-global/de/
@tristanlabelle
tristanlabelle requested a review from nabramow as a code owner May 18, 2026 08:34
@vercel

vercel Bot commented May 18, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
couchers Ready Ready Preview May 18, 2026 8:36am

Request Review

@tristanlabelle
tristanlabelle enabled auto-merge May 18, 2026 08:34
@tristanlabelle
tristanlabelle requested a review from c-kreuz May 18, 2026 08:35
@tristanlabelle
tristanlabelle requested a review from a team May 18, 2026 09:16
@tristanlabelle tristanlabelle changed the title Weblate: Merge with develop to unblock Weblate: Merge with develop to resolve conflict May 18, 2026
@tristanlabelle
tristanlabelle merged commit c600514 into develop May 18, 2026
9 checks passed
@tristanlabelle
tristanlabelle deleted the i18n/merge-weblate branch May 18, 2026 09:26
@github-actions

Copy link
Copy Markdown
Contributor

📝 Release Notes

This PR does not need to be included in release notes.

Reason: This PR only resolves a Weblate/git merge conflict and updates two German localization strings. It is an internal translation maintenance change, not a significant user-facing feature, UX improvement, important bug fix, or major technical infrastructure change.

🤖 Bot Debug Information

Model: couchers.openai.gpt-5.4
Decision: exclude
Reasoning: This PR only resolves a Weblate/git merge conflict and updates two German localization strings. It is an internal translation maintenance change, not a significant user-facing feature, UX improvement, important bug fix, or major technical infrastructure change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants