Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-3.4] New Crowdin updates #4166

Closed
ks-ci-bot opened this issue Jul 18, 2023 · 0 comments
Closed

[release-3.4] New Crowdin updates #4166

ks-ci-bot opened this issue Jul 18, 2023 · 0 comments
Assignees

Comments

@ks-ci-bot
Copy link
Collaborator

Manual cherrypick required.

#4154 failed to apply on top of branch "release-3.4":

Applying: New translations l10n-projects-applicationWorkloads-apps-composedApps-details.js (Korean)
Using index info to reconstruct a base tree...
M	locales/ko/l10n-projects-applicationWorkloads-apps-composedApps-details.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-projects-applicationWorkloads-apps-composedApps-list.js (Korean)
Using index info to reconstruct a base tree...
M	locales/ko/l10n-projects-applicationWorkloads-apps-composedApps-list.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-projects-applicationWorkloads-services-list.js (Korean)
Using index info to reconstruct a base tree...
M	locales/ko/l10n-projects-applicationWorkloads-services-list.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-projects-grayscaleRelease.js (Korean)
Using index info to reconstruct a base tree...
M	locales/ko/l10n-projects-grayscaleRelease.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-clusterManagement-clusters.js (Korean)
Using index info to reconstruct a base tree...
M	locales/ko/l10n-clusterManagement-clusters.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-devopsProjects-continuousDeployments-list.js (Korean)
Using index info to reconstruct a base tree...
M	locales/ko/l10n-devopsProjects-continuousDeployments-list.js
Falling back to patching base and 3-way merge...
Auto-merging locales/ko/l10n-devopsProjects-continuousDeployments-list.js
No changes -- Patch already applied.
Applying: New translations l10n-projects-applicationWorkloads-pods-details.js (Chinese Simplified)
Using index info to reconstruct a base tree...
M	locales/zh/l10n-projects-applicationWorkloads-pods-details.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-devopsProjects-continuousDeployments-list.js (Korean)
Using index info to reconstruct a base tree...
M	locales/ko/l10n-devopsProjects-continuousDeployments-list.js
Falling back to patching base and 3-way merge...
Auto-merging locales/ko/l10n-devopsProjects-continuousDeployments-list.js
No changes -- Patch already applied.
Applying: New translations l10n-devopsProjects-pipeline-details.js (French)
Using index info to reconstruct a base tree...
M	locales/fr/l10n-devopsProjects-pipeline-details.js
Falling back to patching base and 3-way merge...
Auto-merging locales/fr/l10n-devopsProjects-pipeline-details.js
CONFLICT (content): Merge conflict in locales/fr/l10n-devopsProjects-pipeline-details.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 New translations l10n-devopsProjects-pipeline-details.js (French)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Leioy pushed a commit to Leioy/console that referenced this issue Sep 25, 2024
* chore: update version



* chore: update npm scripts



* chore: update yarn.lock



---------

Signed-off-by: donniean <donniean1@gmail.com>
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

No branches or pull requests

2 participants