better phrasing consistency

lib/AccountManager/L10N/fr.pm

@@ -28,8 +28,8 @@ msgstr "<a href=\"%1\">Cette comparaison des usages de l'attribut eduPersonAffil
 
 #. (entityid)
 #: templates/web/edugain/create_accounts.tt2.html:4 templates/web/renater/create_accounts.tt2.html:5
-msgid "<strong>Success:</strong> your identity as administrator of the Service Provider with entityID <strong>%1</strong> has been validated!"
-msgstr "<strong>Succès:</strong> votre identité comme administrateur du service <strong>%1</strong> a été validée!"
+msgid "<strong>Success:</strong> your identity as administrator of the Service Provider <strong>%1</strong> has been validated!"
+msgstr "<strong>Succès:</strong> votre identité comme administrateur du fournisseur de service <strong>%1</strong> a été validée!"
 
 #: templates/web/renater/index.tt2.html:129
 msgid "About"
@@ -59,8 +59,8 @@ msgstr "En tant que membre de l'accord GÉANT 2020 Framework Partnership Agreeme
 
 #. (sp.displayname)
 #: templates/web/edugain/select_email.tt2.html:13 templates/web/renater/select_email.tt2.html:13
-msgid "Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '%1'."
-msgstr "Avant de pouvoir créer des comptes de test sur ce fournisseur d'identité, nous devons nous assurer que vous êtes un administateur légitime de '%1'."
+msgid "Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of the Service Provider <strong>%1</strong>."
+msgstr "Avant de pouvoir créer des comptes de test sur ce fournisseur d'identité, nous devons nous assurer que vous êtes un administateur légitime du fournisseur de service <strong>%1</strong>."
 
 #: templates/web/edugain/create_accounts.tt2.html:50 templates/web/renater/create_accounts.tt2.html:52
 msgid "Below is the list of user attributes associated to this test account."
@@ -117,10 +117,6 @@ msgstr "Liste des attributs utilisateur"
 msgid "More information"
 msgstr "Plus d'information"
 
-#: lib/AccountManager/App.pm:295
-msgid "My organization"
-msgstr "Mon organisme"
-
 #: templates/web/edugain/complete_challenge.tt2.html:29 templates/web/edugain/select_email.tt2.html:38 templates/web/edugain/select_sp.tt2.html:37 templates/web/renater/complete_challenge.tt2.html:29 templates/web/renater/select_email.tt2.html:38 templates/web/renater/select_sp.tt2.html:37
 msgid "Next"
 msgstr "Suivant"

templates/web/edugain/create_accounts.tt2.html

 [% WRAPPER index.tt2.html %]
 <div class="row">
     <div class="callout success">
-        [% lh.maketext("<strong>Success:</strong> your identity as administrator of the Service Provider with entityID <strong>[_1]</strong> has been validated!", entityid) %]
+        [% lh.maketext("<strong>Success:</strong> your identity as administrator of the Service Provider <strong>[_1]</strong> has been validated!", entityid) %]
     </div>
 </div>
 

templates/web/edugain/select_email.tt2.html

@@ -10,7 +10,7 @@
 
     <div class="content clearfix">
         <h2>[% lh.maketext("Select your email address") %]</h2>
-        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.display_name()) %]</p>
+        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of the Service Provider <strong>[_1]</strong>.", entityid) %]</p>
 
     [% IF sp.contacts.defined %]
         <fieldset>

templates/web/renater/create_accounts.tt2.html

@@ -2,7 +2,7 @@
 <div class="row">
     <div class="small-12 columns">
         <p class="callout alert-callout-border success text-center">
-        [% lh.maketext("<strong>Success:</strong> your identity as administrator of the Service Provider with entityID <strong>[_1]</strong> has been validated!", entityid) %]
+        [% lh.maketext("<strong>Success:</strong> your identity as administrator of the Service Provider <strong>[_1]</strong> has been validated!", entityid) %]
         </p>
     </div>
 </div>

templates/web/renater/select_email.tt2.html

@@ -10,7 +10,7 @@
 
     <div class="content clearfix">
         <h2>[% lh.maketext("Select your email address") %]</h2>
-        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.display_name()) %]</p>
+        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of the Service Provider <strong>[_1]</strong>.", entityid) %]</p>
 
     [% IF sp.contacts.defined %]
         <fieldset>