CLDR-17940 Fix translation for Indochina Time in Tajik.

[yumaoka]

CLDR-17940

• This PR completes the ticket.

ALLOW_MANY_COMMITS=true

[srl295]

@yumaoka need to merge from main to unbreak without losing the approval, or can use the squash button (may need new approval)

[yumaoka]

@yumaoka need to merge from main to unbreak without losing the approval, or can use the squash button (may need new approval)

So the main branch revision I created my brach from was broken (test failure), and I need to rebase my branch with the latest main revision. Can you tell me how to update my branch without losing the approvals?

[srl295]

@yumaoka need to merge from main to unbreak without losing the approval, or can use the squash button (may need new approval)

So the main branch revision I created my brach from was broken (test failure), and I need to rebase my branch with the latest main revision. Can you tell me how to update my branch without losing the approvals?

I'd do this (assuming upstream is the main fork)

$ git fetch upstream
$ git merge upstream/main -m 'CLDR-17940 merge from main'
$ git push

it won't lose the approvals.