Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fixed all grammatical errors in locale_en-US.ini#35053

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
wxiaoguang merged 9 commits intogo-gitea:mainfromJoshdike:Joshdike
Jul 14, 2025

Conversation

@Joshdike
Copy link
Contributor

No description provided.

@GiteaBotGiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelJul 11, 2025
@JamesSkemp
Copy link

Based upon casing, I wonder if the period additions for lines 323 and 353 is correct?

1038 and 1039 also read fine to me as they were; the original it's flows better than it is (IMO).

1105 has a url that should probably be URL to match the other instance.

@Joshdike
Copy link
ContributorAuthor

Based upon casing, I wonder if the period additions for lines 323 and 353 is correct?

1038 and 1039 also read fine to me as they were; the original it's flows better than it is (IMO).

1105 has a url that should probably be URL to match the other instance.

The period additions in 323 and 353 doesn't matter but i could remove them.
Same goes for 1038 and 1039.
You are right about 1105. I should make it URL instead of url

@dr-1
Copy link
Contributor

I still see quite a few language issues in the file. The fixes in this PR are great but I would suggest to remove the "all" from the commit message when squashing and merging. Happy to contribute a separate PR after that's done to fix more of the issues.

delvh reacted with thumbs up emoji

@GiteaBotGiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelsJul 12, 2025
Copy link
Contributor

@wxiaoguangwxiaoguang left a comment

Choose a reason for hiding this comment

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

Thank you very much!

Joshdike reacted with heart emoji
@GiteaBotGiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labelsJul 14, 2025
@wxiaoguang
Copy link
Contributor

wxiaoguang commentedJul 14, 2025•
edited
Loading

Hmm .... just found that the new text is too long for a "menu item" 🤣

Detailsimage
Joshdike reacted with laugh emoji

@Joshdike
Copy link
ContributorAuthor

Hmmn. We can use "Block user from this organization"
what do you think?

@wxiaoguang
Copy link
Contributor

Hmmn. We can use "Block user from this organization" what do you think?

Yep, so your original "Block user from organization" should work

@Joshdike
Copy link
ContributorAuthor

Yep, so your original "Block user from organization" should work
Alright. I guess you will commit it directly after this merge?

Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
password_algorithm = Password Hash Algorithm
invalid_password_algorithm = Invalid password hash algorithm
password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements andstrength. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems.
password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements andstrengths. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems.
Copy link
Contributor

@dr-1dr-1Jul 14, 2025•
edited
Loading

Choose a reason for hiding this comment

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

It depends on what is meant here.

"Algorithm A has this (qualitative) strength and algorithm B has that strength" → strengths
vs.
"Algorithms A and B differ in how strong they are" → strength

Based on the subsequent sentence, I guess it's more the first meaning.

@wxiaoguangwxiaoguangenabled auto-merge (squash)July 14, 2025 13:04
@wxiaoguangwxiaoguang merged commitb861d86 intogo-gitea:mainJul 14, 2025
26 checks passed
@GiteaBotGiteaBot added this to the1.25.0 milestoneJul 14, 2025
@JoshdikeJoshdike deleted the Joshdike branchJuly 14, 2025 13:53
zjjhot added a commit to zjjhot/gitea that referenced this pull requestJul 16, 2025
* giteaofficial/main:  Send email on Workflow Run Success/Failure (go-gitea#34982)  [skip ci] Updated translations via Crowdin  Replace `poetry` with `uv` (go-gitea#35084)  nix flake update (go-gitea#35085)  Use monospace font in PR command line instructions (go-gitea#35074)  Add gitignore rules to exclude LLM instruction files (go-gitea#35076)  [skip ci] Updated translations via Crowdin  Fix form property assignment edge case (go-gitea#35073)  Improve submodule relative path handling (go-gitea#35056)  Fixed all grammatical errors in locale_en-US.ini (go-gitea#35053)  UI: add hover background to table rows in user and repo admin page (go-gitea#35072)
saschazepter pushed a commit to saschazepter/forgejo that referenced this pull requestJul 22, 2025
This commit has the following:* partial port of changes from [gitea#35053](go-gitea/gitea#35053) ([corresponding WCP](https://codeberg.org/forgejo/forgejo/pulls/8591))    * some changes were applied    * some strings we've fixed ourself before    * some strings we don't have* a few fixes I wanted to propose but didn't want to dedicate a PR just to add a full stop to one stringCo-authored-by: DJ Phoenix <dikejoshua@gmail.com>Reviewed-on:https://codeberg.org/forgejo/forgejo/pulls/8593Reviewed-by: Robert Wolff <mahlzahn@posteo.de>Reviewed-by: Gusted <gusted@noreply.codeberg.org>
@go-giteago-gitea locked asresolvedand limited conversation to collaboratorsOct 12, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.

Reviewers

@wxiaoguangwxiaoguangwxiaoguang approved these changes

@delvhdelvhdelvh approved these changes

+1 more reviewer

@dr-1dr-1dr-1 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.modifies/translation

Projects

None yet

Milestone

1.25.0

Development

Successfully merging this pull request may close these issues.

6 participants

@Joshdike@JamesSkemp@dr-1@wxiaoguang@delvh@GiteaBot
[8]ページ先頭
©2009-2025 Movatter.jp