]> source.dussan.org Git - gitea.git/commitdiff
Swap word order in Comment and Close (#31148) (#31165)
authorGiteabot <teabot@gitea.io>
Thu, 30 May 2024 01:07:27 +0000 (09:07 +0800)
committerGitHub <noreply@github.com>
Thu, 30 May 2024 01:07:27 +0000 (01:07 +0000)
Backport #31148 by @techknowlogick

Reduce accident closing of tickets only to re-open them right away. This
aligns the text on these buttons with what GitHub has.

Commit is authored by @LazyDodo, and was committed to the Blender fork
by @brechtvl

Background details:
https://projects.blender.org/infrastructure/gitea-custom/pulls/7

Co-authored-by: techknowlogick <techknowlogick@gitea.com>
Co-authored-by: Ray Molenkamp <github@lazydodo.com>
options/locale/locale_en-US.ini

index afb860cfc07d8ff6f945ac3e2fcaed67961e1a11..0c3bd1bf669ae85657ca74f0a1f70f36c2ebaa8f 100644 (file)
@@ -1554,9 +1554,9 @@ issues.no_content = No description provided.
 issues.close = Close Issue
 issues.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s
 issues.comment_manually_pull_merged_at = manually merged commit %[1]s into %[2]s %[3]s
-issues.close_comment_issue = Comment and Close
+issues.close_comment_issue = Close with Comment
 issues.reopen_issue = Reopen
-issues.reopen_comment_issue = Comment and Reopen
+issues.reopen_comment_issue = Reopen with Comment
 issues.create_comment = Comment
 issues.comment.blocked_user = Cannot create or edit comment because you are blocked by the poster or repository owner.
 issues.closed_at = `closed this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`