Merge pull request 'Fixes & Improvements for English locale' (#2437) from 0ko/forgejo:english240222 into forgejo

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

options/locale/locale_ar.ini

@@ -324,7 +324,7 @@ twofa_disable = تعطيل الاستيثاق الثنائي
 retype_new_password = تأكيد كلمة المرور الجديدة
 manage_emails = أدر عناوين البريد الإلكتروني
 then_enter_passcode = وأدخل رمز الدخول الظاهر في التطبيق:
-change_password = حدّث كلمة المرور
+update_password = حدّث كلمة المرور
 continue = استمر
 emails = عناوين البريد الإلكتروني
 confirm_delete_account = أكُد الحذف

options/locale/locale_bg.ini

@@ -47,7 +47,7 @@ ssh_gpg_keys = SSH / GPG Ключове
 comment_type_group_milestone = Етап
 manage_emails = Управление на адресите на ел. поща
 permission_read = Четене
-change_password = Обновяване на паролата
+update_password = Обновяване на паролата
 biography_placeholder = Разкажете ни малко за себе си! (Можете да използвате Markdown)
 orgs = Управление на организациите
 continue = Продължаване

options/locale/locale_cs-CZ.ini

@@ -689,7 +689,7 @@ uploaded_avatar_is_too_big=Nahraný soubor (%d KiB) přesahuje maximální velik
 update_avatar_success=Vaše avatar byl aktualizován.
 update_user_avatar_success=Uživatelův avatar byl aktualizován.
 
-change_password=Aktualizovat heslo
+update_password=Aktualizovat heslo
 old_password=Stávající heslo
 new_password=Nové heslo
 retype_new_password=Potvrdit nové heslo

options/locale/locale_de-DE.ini

@@ -707,7 +707,7 @@ uploaded_avatar_is_too_big=Die hochgeladene Dateigröße (%d KiB) überschreitet
 update_avatar_success=Dein Profilbild wurde geändert.
 update_user_avatar_success=Der Avatar des Benutzers wurde aktualisiert.
 
-change_password=Passwort aktualisieren
+update_password=Passwort aktualisieren
 old_password=Aktuelles Passwort
 new_password=Neues Passwort
 retype_new_password=Neues Passwort bestätigen

options/locale/locale_el-GR.ini

@@ -688,7 +688,7 @@ uploaded_avatar_is_too_big=Το μέγεθος αρχείου που ανέβη
 update_avatar_success=Η εικόνα σας έχει ενημερωθεί.
 update_user_avatar_success=Το avatar του χρήστη ενημερώθηκε.
 
-change_password=Ενημέρωση Κωδικού Πρόσβασης
+update_password=Ενημέρωση Κωδικού Πρόσβασης
 old_password=Τρέχων Κωδικός Πρόσβασης
 new_password=Νέος Κωδικός Πρόσβασης
 retype_new_password=Επιβεβαίωση Νέου Κωδικού Πρόσβασης

options/locale/locale_en-US.ini

@@ -711,16 +711,17 @@ uploaded_avatar_is_too_big = The uploaded file size (%d KiB) exceeds the maximum
 update_avatar_success = Your avatar has been updated.
 update_user_avatar_success = The user's avatar has been updated.
 
-change_password = Update Password
+change_password = Change password
-old_password = Current Password
+update_password = Update Password
-new_password = New Password
+old_password = Current password
-retype_new_password = Confirm New Password
+new_password = New password
+retype_new_password = Confirm new password
 password_incorrect = The current password is incorrect.
 change_password_success = Your password has been updated. Sign in using your new password from now on.
 password_change_disabled = Non-local users cannot update their password through the Forgejo web interface.
 
 emails = Email Addresses
-manage_emails = Manage Email Addresses
+manage_emails = Manage email addresses
 manage_themes = Select default theme
 manage_openid = Manage OpenID Addresses
 email_desc = Your primary email address will be used for notifications, password recovery and, provided that it is not hidden, web-based Git operations.
@@ -741,7 +742,7 @@ theme_update_error = The selected theme does not exist.
 openid_deletion = Remove OpenID Address
 openid_deletion_desc = Removing this OpenID address from your account will prevent you from signing in with it. Continue?
 openid_deletion_success = The OpenID address has been removed.
-add_new_email = Add New Email Address
+add_new_email = Add email address
 add_new_openid = Add New OpenID URI
 add_email = Add Email Address
 add_openid = Add OpenID URI
@@ -759,7 +760,7 @@ manage_gpg_keys = Manage GPG Keys
 add_key = Add Key
 ssh_desc = These public SSH keys are associated with your account. The corresponding private keys allow full access to your repositories. SSH keys that have been verified can be used to verify SSH-signed Git commits.
 principal_desc = These SSH certificate principals are associated with your account and allow full access to your repositories.
-gpg_desc = These public GPG keys are associated with your account. Keep your private keys safe as they allow commits to be verified.
+gpg_desc = These public GPG keys are associated with your account and used to verify your commits. Keep your private keys safe as they allow to sign commits with your identity.
 ssh_helper = <strong>Need help?</strong> Have a look at the guide to <a href="%s">create your own SSH keys</a> or solve <a href="%s">common problems</a> you may encounter using SSH.
 gpg_helper = <strong>Need help?</strong> Have a look at the guide <a href="%s">about GPG</a>.
 add_new_key = Add SSH Key
@@ -882,7 +883,7 @@ oauth2_application_remove_description = Removing an OAuth2 application will prev
 oauth2_application_locked = Forgejo pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected behavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information.
 
 authorized_oauth2_applications = Authorized OAuth2 Applications
-authorized_oauth2_applications_description = You have granted access to your personal Forgejo account to these third party applications. Please revoke access for applications you no longer need.
+authorized_oauth2_applications_description = You have granted access to your personal Forgejo account to these third party applications. Please revoke access for applications that are no longer in use.
 revoke_key = Revoke
 revoke_oauth2_grant = Revoke Access
 revoke_oauth2_grant_description = Revoking access for this third party application will prevent this application from accessing your data. Are you sure?
@@ -927,7 +928,7 @@ hooks.desc = Add webhooks which will be triggered for <strong>all repositories</
 
 orgs_none = You are not a member of any organizations.
 repos_none = You do not own any repositories.
-blocked_users_none = You haven't blocked any users.
+blocked_users_none = There are no blocked users.
 
 delete_account = Delete Your Account
 delete_prompt = This operation will permanently delete your user account. It <strong>CANNOT</strong> be undone.
@@ -1672,7 +1673,7 @@ issues.dependency.issue_closing_blockedby = Closing this issue is blocked by the
 issues.dependency.issue_close_blocks = This issue blocks closing of the following issues
 issues.dependency.pr_close_blocks = This pull request blocks closing of the following issues
 issues.dependency.issue_close_blocked = You need to close all issues blocking this issue before you can close it.
-issues.dependency.issue_batch_close_blocked = "Cannot batch close issues that you choose, because issue #%d still has open dependencies"
+issues.dependency.issue_batch_close_blocked = "Cannot batch close chosen issues, because issue #%d still has open dependencies"
 issues.dependency.pr_close_blocked = You need to close all issues blocking this pull request before you can merge it.
 issues.dependency.blocks_short = Blocks
 issues.dependency.blocked_by_short = Depends on
@@ -2843,7 +2844,7 @@ dashboard.reinit_missing_repos = Reinitialize all missing Git repositories for w
 dashboard.sync_external_users = Synchronize external user data
 dashboard.cleanup_hook_task_table = Cleanup hook_task table
 dashboard.cleanup_packages = Cleanup expired packages
-dashboard.cleanup_actions = Cleanup actions expired logs and artifacts
+dashboard.cleanup_actions = Cleanup expired logs and artifacts from actions
 dashboard.server_uptime = Server Uptime
 dashboard.current_goroutine = Current Goroutines
 dashboard.current_memory_usage = Current Memory Usage
@@ -3537,7 +3538,7 @@ owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuild.
 owner.settings.cleanuprules.title = Manage Cleanup Rules
 owner.settings.cleanuprules.add = Add Cleanup Rule
 owner.settings.cleanuprules.edit = Edit Cleanup Rule
-owner.settings.cleanuprules.none = No cleanup rules available. Please consult the documentation.
+owner.settings.cleanuprules.none = There are no cleanup rules yet.
 owner.settings.cleanuprules.preview = Cleanup Rule Preview
 owner.settings.cleanuprules.preview.overview = %d packages are scheduled to be removed.
 owner.settings.cleanuprules.preview.none = Cleanup rule does not match any packages.

options/locale/locale_eo.ini

@@ -674,7 +674,7 @@ manage_emails = Mastrumi retpoŝtadresojn
 generate_token_name_duplicate = <strong>%s</strong> jam uziĝis kiel programnomo iam. Bonvolu elekti novan.
 permission_read = Lega
 ssh_helper = <strong>Ĉu bezonas helpon?</strong> Legetu la gvidon pri <a href="%s">kreado de SSH-ŝlosiloj</a> aŭ ripari <a href="%s">oftajn problemojn</a> kiujn vi eble trafus uzante SSH.
-change_password = Konservi pasvorton
+update_password = Konservi pasvorton
 ssh_key_been_used = Ĉi tiu SSH-ŝlosilo estas jam aldonita al la servilo.
 password_change_disabled = Nelokaj uzantoj ne povas ŝanĝi sian pasvorton per la Forgejo retfasado.
 emails = Retpoŝadresoj

options/locale/locale_es-ES.ini

@@ -706,7 +706,7 @@ uploaded_avatar_is_too_big=El tamaño del archivo subido (%d KiB) excede el tama
 update_avatar_success=Su avatar ha sido actualizado.
 update_user_avatar_success=El avatar del usuario se ha actualizado.
 
-change_password=Actualizar contraseña
+update_password=Actualizar contraseña
 old_password=Contraseña actual
 new_password=Nueva contraseña
 retype_new_password=Confirme la nueva contraseña

options/locale/locale_fa-IR.ini

@@ -526,7 +526,7 @@ uploaded_avatar_not_a_image=فایل بار‌گذاری شده تصویر نم
 update_avatar_success=آواتار شما تغییر کرد.
 update_user_avatar_success=آواتار کاربر بروز رسانی شده است.
 
-change_password=تغییر گذرواژه
+update_password=تغییر گذرواژه
 old_password=گذارواژه فعلی
 new_password=گذرواژه جدید
 password_incorrect=گذرواژه فعلی شما اشتباه است.

options/locale/locale_fi-FI.ini

@@ -500,7 +500,7 @@ delete_current_avatar=Poista nykyinen profiilikuva
 uploaded_avatar_not_a_image=Palvelimelle lähetetty tiedosto ei ole kuva.
 update_avatar_success=Profiilikuva on päivitetty.
 
-change_password=Päivitä salasana
+update_password=Päivitä salasana
 old_password=Nykyinen salasana
 new_password=Uusi salasana
 password_incorrect=Nykyinen salasanasi on virheellinen.

options/locale/locale_fr-FR.ini

@@ -706,7 +706,7 @@ uploaded_avatar_is_too_big=La taille du fichier téléversé (%d Kio) dépasse l
 update_avatar_success=Votre avatar a été mis à jour.
 update_user_avatar_success=L'avatar de l'utilisateur a été mis à jour.
 
-change_password=Modifier le mot de passe
+update_password=Modifier le mot de passe
 old_password=Mot de passe actuel
 new_password=Nouveau mot de passe
 retype_new_password=Confirmer le nouveau mot de passe

options/locale/locale_hu-HU.ini

@@ -425,7 +425,7 @@ delete_current_avatar=Jelenlegi profilkép törlése
 uploaded_avatar_not_a_image=A feltöltött fájl nem kép.
 update_avatar_success=A profilképe frissítve lett.
 
-change_password=Jelszó frissítése
+update_password=Jelszó frissítése
 old_password=Jelenlegi jelszó
 new_password=Új jelszó
 password_incorrect=A megadott jelenlegi jelszó helytelen.

options/locale/locale_id-ID.ini

@@ -347,7 +347,7 @@ delete_current_avatar=Hapus Avatar Saat Ini
 uploaded_avatar_not_a_image=Berkas yang diunggah bukanlah gambar.
 update_avatar_success=Avatar Anda telah diperbarui.
 
-change_password=Perbarui kata sandi
+update_password=Perbarui kata sandi
 old_password=Kata Sandi Saat Ini
 new_password=Kata Sandi Baru
 password_incorrect=Kata sandi saat ini salah.

options/locale/locale_is-IS.ini

@@ -472,7 +472,7 @@ uploaded_avatar_not_a_image=Skráin sem hlaðin var upp er ekki mynd.
 update_avatar_success=Notandamynd þín hefur verið uppfærð.
 update_user_avatar_success=Notandamynd þessara notanda hefur verið uppfærð.
 
-change_password=Uppfæra Lykilorð
+update_password=Uppfæra Lykilorð
 old_password=Núverandi Lykilorð
 new_password=Nýtt Lykilorð
 password_incorrect=Núverandi lykilorðið er rangt.

options/locale/locale_it-IT.ini

@@ -569,7 +569,7 @@ uploaded_avatar_not_a_image=Il file caricato non è un'immagine.
 update_avatar_success=Il tuo avatar è stato aggiornato.
 update_user_avatar_success=L'avatar dell'utente è stato aggiornato.
 
-change_password=Aggiorna Password
+update_password=Aggiorna Password
 old_password=Password attuale
 new_password=Nuova Password
 password_incorrect=La password attuale non è corretta.

options/locale/locale_ja-JP.ini

@@ -702,7 +702,7 @@ uploaded_avatar_is_too_big=アップロードされたファイルサイズ(%d K
 update_avatar_success=アバターを更新しました。
 update_user_avatar_success=ユーザーのアバターを更新しました。
 
-change_password=パスワードを更新
+update_password=パスワードを更新
 old_password=現在のパスワード
 new_password=新しいパスワード
 retype_new_password=新しいパスワードの確認

options/locale/locale_ko-KR.ini

@@ -403,7 +403,7 @@ delete_current_avatar=현재 아바타 삭제
 uploaded_avatar_not_a_image=업로드 된 파일은 이미지가 아닙니다.
 update_avatar_success=아바타가 변경되었습니다.
 
-change_password=비밀번호 변경
+update_password=비밀번호 변경
 old_password=현재 비밀번호
 new_password=새 비밀번호
 password_incorrect=현재 비밀번호가 올바르지 않습니다.

options/locale/locale_lv-LV.ini

@@ -661,7 +661,7 @@ uploaded_avatar_not_a_image=Augšupielādētais fails nav attēls.
 update_avatar_success=Profila attēls tika saglabāts.
 update_user_avatar_success=Lietotāja profila attēls tika atjaunots.
 
-change_password=Mainīt paroli
+update_password=Mainīt paroli
 old_password=Pašreizējā parole
 new_password=Jauna parole
 password_incorrect=Ievadīta nepareiza pašreizējā parole.

options/locale/locale_nl-NL.ini

@@ -695,7 +695,7 @@ uploaded_avatar_not_a_image=Het geüploade bestand is geen afbeelding.
 update_avatar_success=Je avatar is bijgewerkt.
 update_user_avatar_success=De avatar van de gebruiker is bijgewerkt.
 
-change_password=Wachtwoord bijwerken
+update_password=Wachtwoord bijwerken
 old_password=Huidige wachtwoord
 new_password=Nieuw wachtwoord
 password_incorrect=Het wachtwoord is niet correct.

options/locale/locale_pl-PL.ini

@@ -553,7 +553,7 @@ delete_current_avatar=Usuń obecny Avatar
 uploaded_avatar_not_a_image=Załadowany plik nie jest obrazem.
 update_avatar_success=Twój awatar został zmieniony.
 
-change_password=Aktualizuj hasło
+update_password=Aktualizuj hasło
 old_password=Aktualne hasło
 new_password=Nowe hasło
 password_incorrect=Bieżące hasło nie jest prawidłowe.

options/locale/locale_pt-BR.ini

@@ -705,7 +705,7 @@ uploaded_avatar_is_too_big=O tamanho do arquivo enviado (%d KiB) excede o tamanh
 update_avatar_success=Seu avatar foi atualizado.
 update_user_avatar_success=O avatar do usuário foi atualizado.
 
-change_password=Atualizar senha
+update_password=Atualizar senha
 old_password=Senha atual
 new_password=Nova senha
 retype_new_password=Confirmar nova senha

options/locale/locale_pt-PT.ini

@@ -688,7 +688,7 @@ uploaded_avatar_is_too_big=O tamanho do ficheiro carregado (%d KiB) excede o tam
 update_avatar_success=O seu avatar foi substituído.
 update_user_avatar_success=O avatar do utilizador foi modificado.
 
-change_password=Substituir a senha
+update_password=Substituir a senha
 old_password=Senha corrente
 new_password=Nova senha
 retype_new_password=Confirme a nova senha

options/locale/locale_ru-RU.ini

@@ -707,7 +707,7 @@ uploaded_avatar_is_too_big=Размер загружаемого файла (%d
 update_avatar_success=Ваш аватар был изменен.
 update_user_avatar_success=Аватар пользователя обновлён.
 
-change_password=Обновить пароль
+update_password=Обновить пароль
 old_password=Текущий пароль
 new_password=Новый пароль
 retype_new_password=Подтверждение нового пароля

options/locale/locale_si-LK.ini

@@ -513,7 +513,7 @@ uploaded_avatar_not_a_image=උඩුගත කරන ලද ගොනුව ර
 update_avatar_success=ඔබගේ අවතාරය යාවත්කාලීන කර ඇත.
 update_user_avatar_success=පරිශීලකයාගේ අවතාරය යාවත්කාලීන කර ඇත.
 
-change_password=මුරපදය යාවත්කාල කරන්න
+update_password=මුරපදය යාවත්කාල කරන්න
 old_password=වත්මන් මුරපදය
 new_password=නව මුරපදය
 password_incorrect=වත්මන් මුරපදය වැරදිය.

options/locale/locale_sk-SK.ini

@@ -642,7 +642,7 @@ uploaded_avatar_not_a_image=Nahraný súbor nieje obrázok.
 update_avatar_success=Váš avatar sa aktualizoval.
 update_user_avatar_success=Užívateľov avatar bol aktualizovaný.
 
-change_password=Aktualizovať heslo
+update_password=Aktualizovať heslo
 old_password=Aktuálne heslo
 new_password=Nové heslo
 password_incorrect=Aktuálne heslo nie je správne.

options/locale/locale_sv-SE.ini

@@ -448,7 +448,7 @@ delete_current_avatar=Tag bort aktuell avatar
 uploaded_avatar_not_a_image=Den uppladdade filen är inte en bild.
 update_avatar_success=Din avatar har blivit uppdaterad.
 
-change_password=Ändra Lösenordet
+update_password=Ändra Lösenordet
 old_password=Nuvarande lösenord
 new_password=Nytt lösenord
 password_incorrect=Det nuvarande lösenordet är felaktigt.

options/locale/locale_tr-TR.ini

@@ -688,7 +688,7 @@ uploaded_avatar_is_too_big=Yüklenen dosyanın boyutu (%d KiB), azami boyutu (%d
 update_avatar_success=Profil resminiz değiştirildi.
 update_user_avatar_success=Kullanıcının avatarı güncellendi.
 
-change_password=Parolayı Güncelle
+update_password=Parolayı Güncelle
 old_password=Mevcut Parola
 new_password=Yeni Parola
 retype_new_password=Yeni Parolayı Onayla

options/locale/locale_uk-UA.ini

@@ -589,7 +589,7 @@ uploaded_avatar_not_a_image=Завантажений файл не є зобра
 update_avatar_success=Ваш аватар був змінений.
 update_user_avatar_success=Аватар користувача оновлено.
 
-change_password=Оновити пароль
+update_password=Оновити пароль
 old_password=Поточний пароль
 new_password=Новий пароль
 password_incorrect=Поточний пароль неправильний.

options/locale/locale_zh-CN.ini

@@ -707,7 +707,7 @@ uploaded_avatar_is_too_big=上传的文件大小(%d KiB) 超过最大限制(%d K
 update_avatar_success=您的头像已更新。
 update_user_avatar_success=用户头像已更新。
 
-change_password=更新密码
+update_password=更新密码
 old_password=当前密码
 new_password=新的密码
 retype_new_password=确认新密码

options/locale/locale_zh-TW.ini

@@ -641,7 +641,7 @@ uploaded_avatar_not_a_image=上傳的檔案不是圖片
 update_avatar_success=您的大頭貼已更新
 update_user_avatar_success=已更新使用者的大頭貼。
 
-change_password=更新密碼
+update_password=更新密碼
 old_password=目前的密碼
 new_password=新的密碼
 retype_new_password=確認新密碼

templates/user/auth/change_passwd_inner.tmpl

@@ -2,7 +2,7 @@
 		{{template "base/alert" .}}
 		{{end}}
 		<h4 class="ui top attached header center">
-			{{ctx.Locale.Tr "settings.change_password"}}
+			{{ctx.Locale.Tr "settings.update_password"}}
 		</h4>
 		<div class="ui attached segment">
 			<form class="ui form" action="{{.ChangePasscodeLink}}" method="post">
@@ -17,7 +17,7 @@
 			</div>
 			<div class="inline field">
 				<label></label>
-				<button class="ui primary button">{{ctx.Locale.Tr "settings.change_password"}}</button>
+				<button class="ui primary button">{{ctx.Locale.Tr "settings.update_password"}}</button>
 			</div>
 			</form>
 		</div>

templates/user/settings/account.tmpl

@@ -1,7 +1,7 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
 	<div class="user-setting-content">
 		<h4 class="ui top attached header">
-			{{ctx.Locale.Tr "settings.password"}}
+			{{ctx.Locale.Tr "settings.change_password"}}
 		</h4>
 		<div class="ui attached segment">
 			{{if or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2)}}
@@ -24,7 +24,7 @@
 				</div>
 
 				<div class="field">
-					<button class="ui primary button">{{ctx.Locale.Tr "settings.change_password"}}</button>
+					<button class="ui primary button">{{ctx.Locale.Tr "settings.update_password"}}</button>
 					<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
 				</div>
 			</form>