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

[ui-strings] Consistent language use applied across UI strings (backport #1110) #1133

Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 6, 2024

Summary

Correct spelling mistakes and base UI review performed:

  • VM = virtual machine
  • addon = add-on
  • Remove random capitalisation where not applicable
  • Remove double-spaces after a period
  • Expand "config" to "configuration"
  • Expand "admin" to "administrator"
  • Expand "docs" to "documentation
  • Remove the use of the ampersand
  • CDROM/cdrom to "CD-ROM"
  • Expand "args" to "argument(s)"

Related Issue #
Issue #6407


This is an automatic backport of pull request #1110 done by [Mergify](https://mergify.com).

[ui-strings] Consistent language use applied across UI string

(cherry picked from commit f519a8f)

# Conflicts:
#	pkg/harvester/l10n/en-us.yaml
@mergify mergify bot added the Conflicts label Sep 6, 2024
Copy link
Author

mergify bot commented Sep 6, 2024

Cherry-pick of f519a8f has failed:

On branch mergify/bp/release-harvester-v1.4/pr-1110
Your branch is up to date with 'origin/release-harvester-v1.4'.

You are currently cherry-picking commit f519a8f22.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/harvester/config/harvester-map.js
	modified:   pkg/harvester/config/harvester.js
	modified:   shell/assets/translations/en-us.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/harvester/l10n/en-us.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@a110605 a110605 closed this Sep 6, 2024
@mergify mergify bot deleted the mergify/bp/release-harvester-v1.4/pr-1110 branch September 6, 2024 03:16
@a110605 a110605 restored the mergify/bp/release-harvester-v1.4/pr-1110 branch September 6, 2024 03:26
@a110605 a110605 reopened this Sep 6, 2024
@harvester harvester deleted a comment from mergify bot Sep 6, 2024
@a110605
Copy link
Collaborator

a110605 commented Sep 6, 2024

Done resolve conflict.

@a110605 a110605 added Backport to v1.4 Backport PR target v1.4 and removed Conflicts labels Sep 6, 2024
Copy link
Collaborator

@torchiaf torchiaf left a comment

Choose a reason for hiding this comment

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

LGTM

@a110605 a110605 merged commit 6efa13b into release-harvester-v1.4 Sep 9, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/release-harvester-v1.4/pr-1110 branch September 9, 2024 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport to v1.4 Backport PR target v1.4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants