diff options
| author | guillep2k <18600385+guillep2k@users.noreply.github.com> | 2020-03-02 15:25:36 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 15:25:36 -0300 |
| commit | 5e1438ba92fe5b4398ebf468e4ede21c7ef60409 (patch) | |
| tree | 40096ee69a4ac5df46428a3cf1ae7ee3bee8078e /options/locale | |
| parent | b5ecc82d6e22b5701bfadc1ebc430b9c7fef0cc8 (diff) | |
| download | gitea-5e1438ba92fe5b4398ebf468e4ede21c7ef60409.tar.gz gitea-5e1438ba92fe5b4398ebf468e4ede21c7ef60409.zip | |
Admin page for managing user e-mail activation (#10557)
* Implement mail activation admin panel
* Add export comments
* Fix another export comment
* again...
* And again!
* Apply suggestions by @lunny
* Add UI for user activated emails
* Make new activation UI work
* Fix lint
* Prevent admin from self-deactivate; add modal
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'options/locale')
| -rw-r--r-- | options/locale/locale_en-US.ini | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4a38dc62c1..be478ad44b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -440,7 +440,11 @@ manage_openid = Manage OpenID Addresses email_desc = Your primary email address will be used for notifications and other operations. theme_desc = This will be your default theme across the site. primary = Primary +activated = Activated +requires_activation = Requires activation primary_email = Make Primary +activate_email = Send Activation +activations_pending = Activations Pending delete_email = Remove email_deletion = Remove Email Address email_deletion_desc = The email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue? @@ -1724,6 +1728,7 @@ organizations = Organizations repositories = Repositories hooks = Default Webhooks authentication = Authentication Sources +emails = User Emails config = Configuration notices = System Notices monitor = Monitoring @@ -1793,6 +1798,7 @@ dashboard.gc_times = GC Times users.user_manage_panel = User Account Management users.new_account = Create User Account users.name = Username +users.full_name = Full Name users.activated = Activated users.admin = Admin users.restricted = Restricted @@ -1824,6 +1830,19 @@ users.still_own_repo = This user still owns one or more repositories. Delete or users.still_has_org = This user is a member of an organization. Remove the user from any organizations first. users.deletion_success = The user account has been deleted. +emails.email_manage_panel = User Email Management +emails.primary = Primary +emails.activated = Activated +emails.filter_sort.email = Email +emails.filter_sort.email_reverse = Email (reverse) +emails.filter_sort.name = User Name +emails.filter_sort.name_reverse = User Name (reverse) +emails.updated = Email updated +emails.not_updated = Failed to update the requested email address: %v +emails.duplicate_active = This email address is already active for a different user. +emails.change_email_header = Update Email Properties +emails.change_email_text = Are your sure you want to update this email address? + orgs.org_manage_panel = Organization Management orgs.name = Name orgs.teams = Teams |