Fix: Swap order of "Comment and Close"

People keep accidentally closing tickets only to re-open them right
away, I suspect it's the left to right nature of the "Comment and
Close" button, people scan the toolbar left to right, first button
they see "Comment..." they go "yeah! that's it!" click it, then read
"and close" and go "oh.....no"

This PR changes the order to "Close with Comment" highlighting that
the closing of the ticket is the most important action being taken.

Ideally we'd be able to change a single translation in the custom
folder but there is seemingly no fallback to the original file, a
complete `locale_en-US.ini` has to be supplied, I included a patch
to make upgrades to newer gitea versions easier in the future.

We eventually want to get upstream to fix this, but given humans
with squishy noodles are involved, probably better to try this out
locally first and prove this actually changes the user behaviour.

options/locale/patches/comment_and_close_fix.diff

@@ -0,0 +1,13 @@
+diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
+index 0a3d12d7a..95eb07c62 100644
+--- a/options/locale/locale_en-US.ini
++++ b/options/locale/locale_en-US.ini
+@@ -1549,7 +1549,7 @@ 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.create_comment = Comment