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

New Crowdin updates #4154

Merged
merged 288 commits into from
Jul 18, 2023
Merged

New Crowdin updates #4154

merged 288 commits into from
Jul 18, 2023

Conversation

ks-ci-bot
Copy link
Collaborator

No description provided.

ks-ci-bot added 30 commits June 8, 2023 18:38
@ks-ci-bot
Copy link
Collaborator Author

@ks-ci-bot: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ks-ci-bot ks-ci-bot added do-not-merge/release-note-label-needed needs-rebase size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 27, 2023
@ks-ci-bot ks-ci-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed needs-rebase size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 18, 2023
@harrisonliu5
Copy link
Contributor

/lgtm
/approve

@ks-ci-bot ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Jul 18, 2023
@ks-ci-bot
Copy link
Collaborator Author

LGTM label has been added.

Git tree hash: 4d9c068b3d23e632f90c17980b02ef8fa6903a1c

@ks-ci-bot
Copy link
Collaborator Author

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harrisonliu5, ks-ci-bot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ks-ci-bot ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 18, 2023
@harrisonliu5
Copy link
Contributor

/cherry-pick release-3.4

@ks-ci-bot
Copy link
Collaborator Author

@harrisonliu5: once the present PR merges, I will cherry-pick it on top of release-3.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-3.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ks-ci-bot ks-ci-bot merged commit 1ddf7b9 into master Jul 18, 2023
@ks-ci-bot
Copy link
Collaborator Author

@harrisonliu5: #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".

In response to this:

/cherry-pick release-3.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ks-ci-bot
Copy link
Collaborator Author

@harrisonliu5: new issue created for failed cherrypick: #4166

In response to this:

/cherry-pick release-3.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants