From fdd2265bc4a0894fa5a33bc4c5fd026593185c8b Mon Sep 17 00:00:00 2001 From: Pavel Vomacka Date: Fri, 20 May 2016 12:46:53 +0200 Subject: Change 'Restore' to 'Remove Hold' To be consistent with CLI the restoring certificate is renamed to removing certificate hold in all WebUI components. https://fedorahosted.org/freeipa/ticket/5878 Reviewed-By: Petr Vobornik --- ipaserver/plugins/internal.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ipaserver/plugins') diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index bfcee1a6e..850156c34 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -215,6 +215,7 @@ class i18n_messages(Command): "refresh": _("Refresh"), "refresh_title": _("Reload current settings from the server."), "remove": _("Delete"), + "remove_hold": _("Remove hold"), "reset": _("Reset"), "reset_password_and_login": _("Reset Password and Login"), "restore": _("Restore"), @@ -384,6 +385,7 @@ class i18n_messages(Command): "find_validnotbefore_to": _("Valid not before to"), "fingerprints": _("Fingerprints"), "get_certificate": _("Get Certificate"), + "hold_removed": _("Certificate Hold Removed"), "issue_certificate": _("Issue New Certificate for ${entity} ${primary_key}"), "issue_certificate_generic": _("Issue New Certificate"), "issued_by": _("Issued By"), @@ -399,13 +401,13 @@ class i18n_messages(Command): "present": _("${count} certificate(s) present"), "privilege_withdrawn": _("Privilege Withdrawn"), "reason": _("Reason for Revocation"), + "remove_hold": _("Remove Hold"), + "remove_certificate_hold": _("Remove Certificate Hold for ${entity} ${primary_key}"), + "remove_certificate_hold_simple": _("Remove Certificate Hold"), + "remove_certificate_hold_confirmation": _("To confirm your intention to remove the certificate hold, click the \"Remove hold\" button."), "remove_from_crl": _("Remove from CRL"), "request_message": _("
  1. Create a certificate database or use an existing one. To create a new database:
    # certutil -N -d <database path>
  2. Create a CSR with subject CN=<${cn_name}>,O=<realm>, for example:
    # certutil -R -d <database path> -a -g <key size> -s 'CN=${cn},O=${realm}'
  3. Copy and paste the CSR (from -----BEGIN NEW CERTIFICATE REQUEST----- to -----END NEW CERTIFICATE REQUEST-----) into the text area below:
"), "requested": _("Certificate requested"), - "restore_certificate": _("Restore Certificate for ${entity} ${primary_key}"), - "restore_certificate_simple": _("Restore Certificate"), - "restore_confirmation": _("To confirm your intention to restore this certificate, click the \"Restore\" button."), - "restored": _("Certificate restored"), "revocation_reason": _("Revocation reason"), "revoke_certificate": _("Revoke Certificate for ${entity} ${primary_key}"), "revoke_certificate_simple": _("Revoke Certificate"), -- cgit