diff --git a/modules/admin-gui/resources/ca/editcas/editcapage.xhtml b/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
index 962315bf8b..27448e1193 100644
--- a/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
+++ b/modules/admin-gui/resources/ca/editcas/editcapage.xhtml
@@ -213,7 +213,7 @@
-
-
diff --git a/modules/admin-gui/resources/languages/languagefile.en.properties b/modules/admin-gui/resources/languages/languagefile.en.properties
index cda47f25da..f018337985 100644
--- a/modules/admin-gui/resources/languages/languagefile.en.properties
+++ b/modules/admin-gui/resources/languages/languagefile.en.properties
@@ -1894,8 +1894,6 @@ ALLOWBACKDATEDREVOCATION = Allow Backdated Revocation
ALPHANUMERIC = alphanumeric [0-9][A-Z]
-ALTERNATIVESIGNINGALGORITHM = Alternative Signing Algorithm
-
ANYCA = Any CA
AREYOUSUREACTIVATECA = Are you sure you want to activate the CA?
@@ -2629,7 +2627,11 @@ SIGNINGALGORITHM = Signing Algorithm
SIGNINGALGORITHM_FILTERED = Signing Algorithms supported by the keys present in the selected crypto token
-SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Alternative signing algorithm if a hybrid certificate is desired.
+SIGNINGALGORITHM_ALTERNATIVE = Alternative Signing Algorithm
+
+SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Select an alternative signing algorithm to activate hybrid certificates
+
+SIGNINGALGORITHM_ALTERNATIVE_NONE = - None alternative signature
SIGNREQUEST = Sign Certificate Request
diff --git a/modules/admin-gui/resources/languages/languagefile.fr.properties b/modules/admin-gui/resources/languages/languagefile.fr.properties
index f998236668..fb013f36ed 100644
--- a/modules/admin-gui/resources/languages/languagefile.fr.properties
+++ b/modules/admin-gui/resources/languages/languagefile.fr.properties
@@ -1897,8 +1897,6 @@ ALLOWBACKDATEDREVOCATION = Autoriser la révocation antidatée
ALPHANUMERIC = Alpha-numérique [0-9][A-Z]
-ALTERNATIVESIGNINGALGORITHM = Algorithme de signature alternative
-
ANYCA = Toutes les AC
AREYOUSUREACTIVATECA = Êtes-vous sûr de vouloir activer cette AC ?
@@ -2630,9 +2628,13 @@ SIGNEDBYEXTERNALCA = Signé par une AC externe
SIGNINGALGORITHM = Algorithme de signature
-SIGNINGALGORITHM_FILTERED = Algorithmes de signature supportés par les clés présentes dans le conteneur (Crypto Token) sélectionné
+SIGNINGALGORITHM_FILTERED = Algorithmes de signature supportés par les clés présentes dans le conteneur de clés sélectionné
+
+SIGNINGALGORITHM_ALTERNATIVE = Algorithme de signature alternative
+
+SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Sélectionner un algorithme de signature alternative pour activer les certificats hybrides
-SIGNINGALGORITHM_ALTERNATIVE_FILTERED = Algorithme de signature alternative, pour un certificat hybride
+SIGNINGALGORITHM_ALTERNATIVE_NONE = – Aucune signature alternative
SIGNREQUEST = Signer une requête de certificat
diff --git a/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java b/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java
index 55c19f8886..b3b08601f0 100644
--- a/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java
+++ b/modules/admin-gui/src/org/ejbca/ui/web/admin/ca/EditCAsMBean.java
@@ -1104,7 +1104,7 @@ public List getAvailableSigningAlgList() {
public List getAvailableSigningAlgListNoneOption() {
final List resultList = getAvailableSigningAlgList();
- resultList.add(0, new SelectItem(null, "Select an algorithm to activate hybrid certificates."));
+ resultList.add(0, new SelectItem(null, getEjbcaWebBean().getText("SIGNINGALGORITHM_ALTERNATIVE_NONE")));
return resultList;
}