From 8d3c6251a73419d3b0d0dc1cd1024c45837728af Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Wed, 8 May 2024 08:58:25 +0500 Subject: [PATCH] [I18N] English improvements (May 2024) - `editor.commit_id_not_matching` was reported by https://codeberg.org/kita. I confirmed the meaning on next.forgejo.org. - `additional_repo_units_hint` was suggested by https://codeberg.org/leana8959. (cherry picked from commit b11eddfaa83b1d27b864c50de1c82dbbcb293f4f) --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 0c463b505a..50c4155ada 100644 --- a/options/locale/locale_en-US.ini +++ b/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. Click here to see them or Commit changes again 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?