Merge pull request 'Cumulative English improvements (May 2024)' (#3668) from 0ko/forgejo:i18n-20240508 into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3668
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>

options/locale/locale_en-US.ini

@@ -728,8 +728,8 @@ cancel = Cancel
 language = Language
 ui = Theme
 hints = Hints
+additional_repo_units_hint = Suggest to enable additional repository units
 additional_repo_units_hint_description = Display an "Add more units..." button for repositories that do not have all available units enabled.
-additional_repo_units_hint = Encourage enabling additional repository units
 update_hints = Update hints
 update_hints_success = Hints have been updated.
 hidden_comment_types = Hidden comment types
@@ -1351,7 +1351,7 @@ editor.file_editing_no_longer_exists = The file being edited, "%s", no longer ex
 editor.file_deleting_no_longer_exists = The file being deleted, "%s", no longer exists in this repository.
 editor.file_changed_while_editing = The file contents have changed since you started editing. <a target="_blank" rel="noopener noreferrer" href="%s">Click here</a> to see them or <strong>Commit changes again</strong> to overwrite them.
 editor.file_already_exists = A file named "%s" already exists in this repository.
-editor.commit_id_not_matching = The commit ID does not match the one you was editing. Commit to a new branch and then merge.
+editor.commit_id_not_matching = The file was changed while you were editing it. Commit to a new branch and then merge.
 editor.push_out_of_date = The push appears to be out of date.
 editor.commit_empty_file_header = Commit an empty file
 editor.commit_empty_file_text = The file you're about to commit is empty. Proceed?