Skip to content

Conversation

@dr-1
Copy link
Contributor

@dr-1 dr-1 commented Jul 18, 2025

#35015

For easier review, the changes are split into separate commits by broad category. The extended commit messages include brief summaries. I am happy to make a separate pull request for each category if preferred.

While many of the changes are corrections, some are influenced by style. In those cases I have aimed mainly for consistency throughout the file, picking a style variant that I think is widely accepted and aids clarity.

There are additional things that could be improved that I have not touched. For example, contractions (phrasing variants such as "doesn't" vs. "does not") could be made more consistent. Not sure how colloquial or formal the maintainers would like the UI to be.

- Corrections of tense, number, part of speech and other grammatical
  aspects
- Revert errors introduced in b861d86
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 18, 2025
Dominik Rubo added 3 commits July 19, 2025 12:36
- Use ellipsis consistently, replacing those instances where separate
  dot characters were used. Lead ellipsis with non-breaking space. In
  quoted code, separate dots are left in place, as ease of typing and
  identifying characters takes precedence over typography there.
- Use periods instead of commas to separate sentences
- Add commas where they aid parsing of a sentence
- Add periods after sentences where neighboring sentences in the UI have
  one
- Remove them where neighboring sentences in the UI don't have one
- Use en dash instead of hyphen in range specifier
- Use em dash instead of hyphen to separate summaries
- Use apostrophe instead of quotation mark in possessives
- Un-parenthesize where parentheses are not needed
- Punctuate "e.g."
- Capitalization
- Hyphenation
- American English spelling variant
- Consistent spelling of "username", "color blindness", "resynchronize"
- Spell out "and" in sentences, replacing ampersand and plus sign
- Fix other misspelled words
- Use "email address" consistently. Distinguish from "email" as a
  message for clarity.
- Expand "pulls" to "pull requests"
- Remove redundant sentence
- Spell out "characters"
- Change prepositions in some phrases for more idiomatic ones
- Clarify sorting field being a range, not a boolean
- Insert omitted words where they aid in parsing a sentence
- Replace "refused" with "declined" which has less emotional weight
- Replace "whilst" with the more commonly used "while"
- Replace wordy expression: "currently" instead of "at this time"
- Other replacements for more natural or common phrasing
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jul 19, 2025
@dr-1 dr-1 marked this pull request as ready for review July 19, 2025 15:08
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 19, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 20, 2025
Co-authored-by: delvh <dev.lh@web.de>
Signed-off-by: Dominik Rubo <dr-1@posteo.net>
dr-1 and others added 2 commits July 22, 2025 17:31
Co-authored-by: delvh <dev.lh@web.de>
Signed-off-by: Dominik Rubo <dr-1@posteo.net>
Co-authored-by: delvh <dev.lh@web.de>
Signed-off-by: Dominik Rubo <dr-1@posteo.net>
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 23, 2025
@lunny lunny merged commit 43831ff into go-gitea:main Jul 23, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone Jul 23, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 23, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 28, 2025
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix migrate input box bug (go-gitea#35166)
  [skip ci] Updated translations via Crowdin
  Only hide dropzone when no files have been uploaded (go-gitea#35156)
  Change some columns from text to longtext and fix column wrong type caused by xorm (go-gitea#35141)
  [skip ci] Updated translations via Crowdin
  Add `owner` and `parent` fields clarification to docs (go-gitea#35023)
  Improve language in en-US locale strings (go-gitea#35124)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 21, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/translation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants