Skip to content

i18n - backport round-2 translations to 17.2-stable - #1078

Merged
adamlazik1 merged 1 commit into
theforeman:17.2-stablefrom
ogajduse:i18n-r2-17.2-stable
Oct 20, 2026
Merged

adamlazik1 merged 1 commit into
theforeman:17.2-stablefrom
ogajduse:i18n-r2-17.2-stable

Conversation

@ogajduse

@ogajduse ogajduse commented Oct 19, 2026 •

Copy link
Copy Markdown
Member

Backport of #1071 for Foreman 5.0.

A cherry-pick conflicts: the branches have diverged in source — 6 msgids exist only on 17.2-stable and 21 only on master — so taking master's catalogs would drop translations for the 6 and add 21 strings this branch doesn't have.

This ports the translation values for msgids this branch already has. The .pot is untouched, no msgids are added or removed, and all 617 entries stay translated in fr/ja/ko/zh_CN. JS catalogs regenerated with rake plugin:po_to_json, .mo with msgfmt.

Comment thread locale/fr/foreman_remote_execution.po Outdated
Comment on lines +1492 to +1493
msgstr ""
"La requête dynamique est toujours en cours de traitement. Vous pouvez {viewTheHosts} ciblé par la requête."

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the empty string be here or is it an error?

Comment thread locale/ja/foreman_remote_execution.po Outdated
Comment on lines +1318 to +1319
msgstr ""
"ホストインターフェイスの ip アドレスは fqdn よりも優先されますか? DNS が fqdn を適切に解決しない場合、これは役に立ちます。remote_execution_connect_by_ip というパラメーターを設定し、ホストごとにこれをオーバーライドすることができます。デュアルスタックのホストの場合は、remote_execution_connect_by_ip_prefer_ipv6 設定を検討する必要があります"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Ports the translation values from a0ba922 (theforeman#1071) for msgids this
branch has. A cherry-pick conflicts and would be wrong: the branches
have diverged in source (6 msgids exist only here, 21 only on master),
so taking master's catalogs would drop the 6 and add 21 strings this
branch does not have.

Values only - the .pot is untouched, no msgids added or removed, and
all 617 entries stay translated in fr/ja/ko/zh_CN. JS catalogs
regenerated with rake plugin:po_to_json; .mo with msgfmt.
@ogajduse
ogajduse force-pushed the i18n-r2-17.2-stable branch from 3c55937 to ded8a07 Compare October 19, 2026 16:03

@adamlazik1 adamlazik1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adamlazik1
adamlazik1 merged commit 5e4866f into theforeman:17.2-stable Oct 20, 2026
25 of 39 checks passed
@adamlazik1

Copy link
Copy Markdown
Contributor

Thanks @ogajduse !

@ogajduse
ogajduse deleted the i18n-r2-17.2-stable branch October 20, 2026 15:23
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