fix(i18n): sync locale fixes and no-wrap reformat#297
Merged
TheWitness merged 1 commit intoCacti:developfrom Mar 19, 2026
Merged
fix(i18n): sync locale fixes and no-wrap reformat#297TheWitness merged 1 commit intoCacti:developfrom
TheWitness merged 1 commit intoCacti:developfrom
Conversation
This was referenced Mar 18, 2026
Member
|
@somethingwithproof , now sv-SE.po. How does this happen? |
6bcc622 to
e87fc21
Compare
TheWitness
approved these changes
Mar 19, 2026
Contributor
Author
|
The sv-SE conflict was a PO header timestamp. Weblate updated the PO-Revision-Date on develop after the branch was created, so the rebase hit a conflict on the header block. Resolved by keeping the upstream (newer) timestamp. No translation content was affected. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR consolidates and improves upon #296 and #291.
Changes:
Supersedes #296 and #291.