Skip to content

luci-app-upnp: restore translations: ACL, intro - #7434

Merged
systemcrash merged 1 commit into
openwrt:masterfrom
stokito:luci-app-upnp-restore-i18n
Nov 30, 2024
Merged

luci-app-upnp: restore translations: ACL, intro#7434
systemcrash merged 1 commit into
openwrt:masterfrom
stokito:luci-app-upnp-restore-i18n

Conversation

@stokito

@stokito stokito commented Nov 30, 2024

Copy link
Copy Markdown
Contributor

Fixes for the #7407

@systemcrash please merge before conflicts

@systemcrash
systemcrash merged commit 2e46cfc into openwrt:master Nov 30, 2024
@systemcrash

Copy link
Copy Markdown
Contributor

Merged - thanks for the quick fixes @stokito

@Self-Hosting-Group

Copy link
Copy Markdown
Contributor

This restores errors...For example, ACLs and not ACL.

@systemcrash

Copy link
Copy Markdown
Contributor

Minor. i18n people may fix if it's deemed weird, on the next pass.

@stokito
stokito deleted the luci-app-upnp-restore-i18n branch November 30, 2024 21:57
@stokito

stokito commented Nov 30, 2024

Copy link
Copy Markdown
Contributor Author

Yes, the Weblate will show such strings as "Needs for a review"

@Self-Hosting-Group

Self-Hosting-Group commented Nov 30, 2024

Copy link
Copy Markdown
Contributor

Just seen: IPv6 hint not in ACL text. (IMHO, when it comes to security, e.g. with an ACL, the "IPv6 always allowed" hint is actually still important)

@stokito

stokito commented Nov 30, 2024

Copy link
Copy Markdown
Contributor Author

It's in templates/upnp.pot file but here we just have outdated translations without the the hint yet translated.

@hnyman

hnyman commented Dec 1, 2024

Copy link
Copy Markdown
Contributor

Well, there is a new Weblate conflict thanks to these changes from outside Weblate...

Rebasing (1/2)
Auto-merging applications/luci-app-upnp/po/pl/upnp.po
CONFLICT (content): Merge conflict in applications/luci-app-upnp/po/pl/upnp.po
error: could not apply af2fe15d36... Translated using Weblate (Polish)
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 af2fe15d36... Translated using Weblate (Polish)
 (1)

Weblate is really picky if changes are done while it has commits with translations to the same strings.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants