From f113c87a1551de95ec17c4007a7ceab8c491d657 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Wed, 11 Jan 2023 19:35:20 +0100 Subject: [PATCH] LSaddon::mail: fix catch all message suffix in HTML mode --- src/includes/addons/LSaddons.mail.php | 13 ++- src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 81133 -> 81461 bytes src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 96 ++++++++++++------ src/lang/ldapsaisie.pot | 88 ++++++++++------ 4 files changed, 132 insertions(+), 65 deletions(-) diff --git a/src/includes/addons/LSaddons.mail.php b/src/includes/addons/LSaddons.mail.php index 397cab40..25898080 100644 --- a/src/includes/addons/LSaddons.mail.php +++ b/src/includes/addons/LSaddons.mail.php @@ -120,7 +120,11 @@ LSerror :: defineError('MAIL_01', (is_array($MAIL_CATCH_ALL)?implode(',', $MAIL_CATCH_ALL):$MAIL_CATCH_ALL) ); $msg .= sprintf( - _("\n\n\nMail initialy intended for %s."), + ( + $html? + _("

Mail initialy intended for %s.

"): + _("\n\n\nMail initialy intended for %s.") + ), (is_array($to)?implode(',', $to):$to)); $to = ( is_array($MAIL_CATCH_ALL)? @@ -147,7 +151,12 @@ LSerror :: defineError('MAIL_01', if (isset($MAIL_CATCH_ALL) && $MAIL_CATCH_ALL) { $logger -> debug("Mail catched: remove $header header"); $msg .= sprintf( - _("\nBCC: %s"), + ( + $html? + _("

%s: %s

"): + _("\n%s: %s") + ), + strtoupper($header), (is_array($headers[$header])?implode(',', $headers[$header]):$headers[$header])); unset($headers[$header]); continue; diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index a50fdbe0cc8225849da7764296189c0ba19bde99..f9f6f0fe8160cec22f9ad77f192bef6bc897f328 100644 GIT binary patch delta 14083 zcmaLc34Bh+zsK?OL=uwNcM_2xVu_FtYedAp#9B)%B?v;Sv2Ty1c1jznN>z)Zw2Er2 zZHiWDi>gw!wzjIJYH6#qy`S%yaj)0^b?-f|&hwt%%$#%P%yOP5di#;@jwim}3k7|b zIvi7d947=r3Oi1x99Ti6jx#*Yal&x~=EN+Fz!g{!KgB9|5);s;rsGt?hS&o$P}e<- zp?D3W(65%;-s{AY38r8KmcoTt1UDglaXz)4!aBq^F%ctbn+x|x#WPTSK8Qu}HYTAj zCpE)nsOv34b!aVCcf8zyOnwR;Vl?{Kb)0?}haK@XOvF3b6RXy9oD^J$y6|<>`Bmc` zCl4m#I&6c*@d0Y&^3>BYdK;4oCknv+s39DVnu6u19&bTk{LsdG zP;gd#ljK5BNnSxUI8iwLd%#Ei}^;c|s z3j>KC*>c|`)3MyB3l>04L0MG07#qi9UgDNm0#i^An3=@*=OZ(h0zKh!)Dy2lJ>fdk z9PUJQZ5>fRjs2dKpPQwu5WnMCoWIjNq$vKB@FqnC1 zf`d>)_&#dUe1=TFa}@hwZW=Yk5vV!diCT=sDD=Y$sPm%HA8TPSCSVYHyOD_?)8D!P zOA~KHP00!L$GfPZ{R8#ne$C7i7ewv%2xKET?NIF(AWfYt?1VoceRirfcL&KCjr`|z zcJZkSAC`D7Y=)884y)rhWT85nk%x0`A%o<^wlv#w47Mjef@LtIl{vow)*v2$j&BngTX7v|AwU0uo zoa(44oQi6{6!YK)%*p+o56J}J$Eel+1!}ckN8RvuEQXIU5DT$DDq$$*rII#$GF)S4UHp7B?~>lEa}L#Pu@qn`K?mc;@c%xaB8t@4IA z9#`WKEXjMiH_ox%K#gq6=hzu|1V>{$D^cyYVP_2MOsj!p#u5#~OE?JI@t7au9@GUU zbT#F-P^-C1is`_+*o`=n4|QxhGC0nUNZ*~9?&eEt25QmmLk8Ii=wafnUYl8qjj6bc z8p61qW}gqj2E-e%A^wbsSc$u72nS;VzJwa7i!g+t9y{xlmo?KW7pjQFswcdUz-Fb(}YdBl|hd5rlc*^z$2=zCLev8u$13;`W3ep5k*HPDnM`F0mZ6^L0G7nNsG$wYU>>n0M&l%` zgPTwnx@zO%tgKqZ9Z>D&VHEDdhIkEip9(|G?s^Vuaerq78P=7v5w$9PScy|G1+^%@ z=R;52e7G6X_pFaGS>>!y`3kDTS8ybj<)gjIk!9uljOs{}Ow(>QdNov^lj(p}N16RS z9d*JF)>`bHD#S~WL2>q@rYw4lS#*7oYdf>C1^$J4pvGg(FQ(T~bN?81-7e$IZuwvw z5sY^;T#Aa%qZW;a`s!F7%VRg|G}Ic{fV$967>sdK&6Bmq zGQ{s=bNm+dAR*JtqE5z6#IJhEXtm$Lcq~5MJXt5~NW2|eV$K<6?mA#J@e&&!Ky}dX z1+%#7U?bu*)QvY{1-yre7(CPLvL4u-*t?R9hU!n$h0FD$?xQX^@MZJF!!eL}EJosV48V6#?LNR9xEFPwZ1n1c z&&UMfaV(1GP(yhib;2X`!M`yCoh&o-rBF9W!Xnrj3t}JCbw}I!shFF19%>|)p{Dd` z7UMsN%xMbL!=xqViCdz2*aP!oDyn0{Q5Twxy3rC;2iBu5xD}h@Zft=$mYSbl$ykE8 z59+}t*?9U=#=kQKD=CP>`xu24UokiCjOth#=Eotndm$}M&o(xh`E=U z?baK$dsd^?&=qWoA>LQbjr(E^3YKFS9>qfVE9yo$mYb2ujanO_sP{!QYDxy9-u-h> zLw^W0QYWwoUPN8*A$l<2H8Zu|ATqi^K2(F^s0&7+p11{S1iE2y?1O4I5w$oMVL5yg z3*+b3v#9g#qK5oW)b;*BotJNgdta{;PDcB+5>~?))ZF($jmQ9;gDX)}6S30R0b_~1 zs3+fs-SIc@qLF6ia1>s<
    K4Og##ILM@umH_UgyK&(!@0CmA^ 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 delta 13742 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 aGjQ7s&(7oTT=Q9Q``y%?ZQr{#`+op!7duV> diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index b7c64671..981d8887 100644 --- a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: LdapSaisie\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2023-01-09 19:11+0100\n" +"PO-Revision-Date: 2023-01-11 19:45+0100\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -229,6 +229,38 @@ msgstr "Erreur MAIL : %{msg}" msgid "MAIL : Error sending your email" msgstr "MAIL : Erreur durant l'envoie de votre mail" +#: includes/addons/LSaddons.mail.php:125 +#, php-format +msgid "

    Mail initialy intended for %s.

    " +msgstr "

    Mail initialement adressé à %s.

    " + +#: includes/addons/LSaddons.mail.php:126 +#, php-format +msgid "" +"\n" +"\n" +"\n" +"Mail initialy intended for %s." +msgstr "" +"\n" +"\n" +"\n" +"Mail initialement adressé à %s." + +#: includes/addons/LSaddons.mail.php:156 +#, php-format +msgid "

    %s: %s

    " +msgstr "

    %s: %s

    " + +#: includes/addons/LSaddons.mail.php:157 +#, php-format +msgid "" +"\n" +"%s: %s" +msgstr "" +"\n" +"%s: %s" + #: includes/addons/LSaddons.phpldapadmin.php:27 msgid "PhpLdapAdmin Support : The constant %{const} is not defined." msgstr "Support PhpLdapAdmin : La constante %{const} n'est pas définie." @@ -237,15 +269,15 @@ msgstr "Support PhpLdapAdmin : La constante %{const} n'est pas définie." msgid "Show my support information" msgstr "Voir mes informations pour le support" -#: includes/addons/LSaddons.showSupportInfo.php:65 +#: includes/addons/LSaddons.showSupportInfo.php:66 msgid "%{name}: Support information" msgstr "%{name} : Informations pour le support" -#: includes/addons/LSaddons.showSupportInfo.php:72 +#: includes/addons/LSaddons.showSupportInfo.php:73 msgid "Download" msgstr "Télécharger" -#: includes/addons/LSaddons.showSupportInfo.php:77 +#: includes/addons/LSaddons.showSupportInfo.php:78 #: includes/addons/LSaddons.accesslog.php:181 #: includes/addons/LSaddons.showTechInfo.php:117 msgid "Go back" @@ -1311,16 +1343,16 @@ msgstr "" msgid "Your new password has been sent to %{mail}." msgstr "Votre nouveau mot de passe vous a été envoyé à l'adresse %{mail}." -#: includes/class/class.LSsession.php:2950 templates/default/select.tpl:20 +#: includes/class/class.LSsession.php:2952 templates/default/select.tpl:20 #: templates/default/recoverpassword.tpl:17 templates/default/login.tpl:16 msgid "Level" msgstr "Niveau" -#: includes/class/class.LSsession.php:3118 +#: includes/class/class.LSsession.php:3120 msgid "LSsession : The constant '%{const}' is not defined." msgstr "LSsession : La constante '%{const}' n'est pas définie." -#: includes/class/class.LSsession.php:3121 +#: includes/class/class.LSsession.php:3123 msgid "" "LSsession : The addon '%{addon}' support is uncertain. Verify system " "compatibility and the add-on configuration." @@ -1328,53 +1360,53 @@ msgstr "" "LSsession : Le support de l'addon '%{addon}' est incertain. Vérifiez la " "compatibilité du système et la configuration de l'add-on." -#: includes/class/class.LSsession.php:3124 +#: includes/class/class.LSsession.php:3126 msgid "" "LSsession : LDAP server's configuration data are invalid. Can't connect." msgstr "" "LSsession : Les données de configuration du serveur LDAP sont invalide. " "Impossible de s'y connecter." -#: includes/class/class.LSsession.php:3127 +#: includes/class/class.LSsession.php:3129 msgid "LSsession : Failed to load LSobject type '%{type}' : unknon type." msgstr "" "LSsession : Impossible de charger le type d'LSobject '%{type}' : type " "inconnu." -#: includes/class/class.LSsession.php:3130 +#: includes/class/class.LSsession.php:3132 msgid "LSsession : Failed to load LSclass '%{class}'." msgstr "LSsession : Impossible de charger la LSclass '%{class}'." -#: includes/class/class.LSsession.php:3133 +#: includes/class/class.LSsession.php:3135 msgid "LSsession : Login or password incorrect." msgstr "LSsession : Identifiant ou mot de passe incorrects." -#: includes/class/class.LSsession.php:3136 +#: includes/class/class.LSsession.php:3138 msgid "LSsession : Impossible to identify you : Duplication of identities." msgstr "LSsession : Impossible de vous identifier : Duplication d'identité." -#: includes/class/class.LSsession.php:3139 +#: includes/class/class.LSsession.php:3141 msgid "LSsession : Can't load class of authentification (%{class})." msgstr "" "LSsession : Impossible de charger la classe d'authentification (%{class})." -#: includes/class/class.LSsession.php:3142 +#: includes/class/class.LSsession.php:3144 msgid "LSsession : Can't connect to LDAP server." msgstr "LSsession : Impossible de se connecter au serveur LDAP." -#: includes/class/class.LSsession.php:3145 +#: includes/class/class.LSsession.php:3147 msgid "LSsession : Impossible to authenticate you." msgstr "LSsession : Impossible de vous identifier." -#: includes/class/class.LSsession.php:3148 +#: includes/class/class.LSsession.php:3150 msgid "LSsession : Your are not authorized to do this action." msgstr "LSsession : Vous n'êtes pas autorisé à faire cette action." -#: includes/class/class.LSsession.php:3151 +#: includes/class/class.LSsession.php:3153 msgid "LSsession : Some informations are missing to display this page." msgstr "LSsession : Des informations sont manquantes pour afficher cette page." -#: includes/class/class.LSsession.php:3154 +#: includes/class/class.LSsession.php:3156 msgid "" "LSsession : The function '%{function}' of the custom action " "'%{customAction}' does not exists or is not configured." @@ -1382,24 +1414,24 @@ msgstr "" "LSsession : La fonction '%{function}' de l'action personnalisée " "'%{customAction}' n'existe pas ou n'est pas configurée." -#: includes/class/class.LSsession.php:3157 +#: includes/class/class.LSsession.php:3159 msgid "LSsession : Fail to retrieve user's LDAP credentials from LSauth." msgstr "" "LSsession : Erreur en récupérant les identifiants LDAP de l'utilisateur " "depuis LSauth." -#: includes/class/class.LSsession.php:3160 +#: includes/class/class.LSsession.php:3162 msgid "" "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials." msgstr "" "LSsession : Impossible de se reconnecter au serveur LDAP avec les " "identifiants de l'utilisateur." -#: includes/class/class.LSsession.php:3163 +#: includes/class/class.LSsession.php:3165 msgid "LSsession : No import/export format define for this object type." msgstr "LSsession : Aucun format d'entrée/sortie défini pour ce type d'objet." -#: includes/class/class.LSsession.php:3166 +#: includes/class/class.LSsession.php:3168 msgid "" "LSsession : Error during creation of list of levels. Contact administrators. " "(Code : %{code})" @@ -1407,13 +1439,13 @@ msgstr "" "LSsession : Erreur durant la création de la liste des niveaux. Contacter les " "administrateurs. (Code : %{type})" -#: includes/class/class.LSsession.php:3169 +#: includes/class/class.LSsession.php:3171 msgid "LSsession : The password recovery is disabled for this LDAP server." msgstr "" "LSsession : La récupération de mot de passe est désactivée pour ce serveur " "LDAP." -#: includes/class/class.LSsession.php:3172 +#: includes/class/class.LSsession.php:3174 msgid "" "LSsession : Some informations are missing to recover your password. Contact " "administrators." @@ -1421,7 +1453,7 @@ msgstr "" "LSsession : Des informations sont manques pour pouvoir récupérer votre mot " "de passe. Contacter les administrateurs." -#: includes/class/class.LSsession.php:3175 +#: includes/class/class.LSsession.php:3177 msgid "" "LSsession : Error during password recovery. Contact administrators.(Step : " "%{step})" @@ -1429,7 +1461,7 @@ msgstr "" "LSsession : Erreur durant la récupération de votre mot de passe. Contacter " "les administrateurs. (Etape : %{step})" -#: includes/class/class.LSsession.php:3178 +#: includes/class/class.LSsession.php:3180 msgid "" "LSsession : The function '%{func}' configured for the view '%{view}' of the " "LSaddon '%{addon}' is not declared in the LSaddon file." @@ -1437,11 +1469,11 @@ msgstr "" "LSsession : la fonction '%{func}' configurée pour la vue '%{view}' du " "LSaddon '%{addon}' n'est pas déclaré dans le fichier du LSaddon." -#: includes/class/class.LSsession.php:3181 +#: includes/class/class.LSsession.php:3183 msgid "LSsession : Failed to load resource file '%{file}'." msgstr "LSsession : Impossible de charger le fichier de ressource '%{file}'." -#: includes/class/class.LSsession.php:3184 +#: includes/class/class.LSsession.php:3186 msgid "" "LSsession : The function '%{func}' configured for the view '%{view}' of the " "LSaddon '%{addon}' doesn't exist." @@ -1449,11 +1481,11 @@ msgstr "" "LSsession : la fonction '%{func}' configurée pour la vue '%{view}' du " "LSaddon '%{addon}' n'existe pas." -#: includes/class/class.LSsession.php:3187 +#: includes/class/class.LSsession.php:3189 msgid "LSsession : invalid related object's DN pass in parameter." msgstr "LSsession : DN d'objet en relation incorrect dans les paramètres." -#: includes/class/class.LSsession.php:3190 +#: includes/class/class.LSsession.php:3192 msgid "" "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please " "upgrade it." @@ -1461,7 +1493,7 @@ msgstr "" "LSsession : le LSaddon %{addon} utilise toujours l'ancien type d'URL de " "vues. Merci de le mettre à jour." -#: includes/class/class.LSsession.php:3193 +#: includes/class/class.LSsession.php:3195 msgid "" "LSsession : You have been redirect from an old-style URL %{url}. Please " "upgrade this link." @@ -1469,7 +1501,7 @@ msgstr "" "LSsession : Vous avez été redirigé depuis une ancienne URL %{url}. Merci de " "le mettre à jour ce lien." -#: includes/class/class.LSsession.php:3196 +#: includes/class/class.LSsession.php:3198 msgid "" "LSsession : You always seem to use %{old} in your custom code: Please " "upgrade it and use %{new}.
    \n"
diff --git a/src/lang/ldapsaisie.pot b/src/lang/ldapsaisie.pot
index 1d2d55e3..e6f57359 100644
--- a/src/lang/ldapsaisie.pot
+++ b/src/lang/ldapsaisie.pot
@@ -174,6 +174,32 @@ msgstr ""
 msgid "MAIL : Error sending your email"
 msgstr ""
 
+#: includes/addons/LSaddons.mail.php:125
+#, php-format
+msgid "
    Mail initialy intended for %s.
    "
+msgstr ""
+
+#: includes/addons/LSaddons.mail.php:126
+#, php-format
+msgid ""
+"\n"
+"\n"
+"\n"
+"Mail initialy intended for %s."
+msgstr ""
+
+#: includes/addons/LSaddons.mail.php:156
+#, php-format
+msgid "
    %s: %s
    "
+msgstr ""
+
+#: includes/addons/LSaddons.mail.php:157
+#, php-format
+msgid ""
+"\n"
+"%s: %s"
+msgstr ""
+
 #: includes/addons/LSaddons.phpldapadmin.php:27
 msgid "PhpLdapAdmin Support : The constant %{const} is not defined."
 msgstr ""
@@ -182,15 +208,15 @@ msgstr ""
 msgid "Show my support information"
 msgstr ""
 
-#: includes/addons/LSaddons.showSupportInfo.php:65
+#: includes/addons/LSaddons.showSupportInfo.php:66
 msgid "%{name}: Support information"
 msgstr ""
 
-#: includes/addons/LSaddons.showSupportInfo.php:72
+#: includes/addons/LSaddons.showSupportInfo.php:73
 msgid "Download"
 msgstr ""
 
-#: includes/addons/LSaddons.showSupportInfo.php:77
+#: includes/addons/LSaddons.showSupportInfo.php:78
 #: includes/addons/LSaddons.accesslog.php:181
 #: includes/addons/LSaddons.showTechInfo.php:117
 msgid "Go back"
@@ -1126,136 +1152,136 @@ msgstr ""
 msgid "Your new password has been sent to %{mail}."
 msgstr ""
 
-#: includes/class/class.LSsession.php:2950 templates/default/select.tpl:20
+#: includes/class/class.LSsession.php:2952 templates/default/select.tpl:20
 #: templates/default/recoverpassword.tpl:17 templates/default/login.tpl:16
 msgid "Level"
 msgstr ""
 
-#: includes/class/class.LSsession.php:3118
+#: includes/class/class.LSsession.php:3120
 msgid "LSsession : The constant '%{const}' is not defined."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3121
+#: includes/class/class.LSsession.php:3123
 msgid ""
 "LSsession : The addon '%{addon}' support is uncertain. Verify system "
 "compatibility and the add-on configuration."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3124
+#: includes/class/class.LSsession.php:3126
 msgid ""
 "LSsession : LDAP server's configuration data are invalid. Can't connect."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3127
+#: includes/class/class.LSsession.php:3129
 msgid "LSsession : Failed to load LSobject type '%{type}' : unknon type."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3130
+#: includes/class/class.LSsession.php:3132
 msgid "LSsession : Failed to load LSclass '%{class}'."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3133
+#: includes/class/class.LSsession.php:3135
 msgid "LSsession : Login or password incorrect."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3136
+#: includes/class/class.LSsession.php:3138
 msgid "LSsession : Impossible to identify you : Duplication of identities."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3139
+#: includes/class/class.LSsession.php:3141
 msgid "LSsession : Can't load class of authentification (%{class})."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3142
+#: includes/class/class.LSsession.php:3144
 msgid "LSsession : Can't connect to LDAP server."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3145
+#: includes/class/class.LSsession.php:3147
 msgid "LSsession : Impossible to authenticate you."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3148
+#: includes/class/class.LSsession.php:3150
 msgid "LSsession : Your are not authorized to do this action."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3151
+#: includes/class/class.LSsession.php:3153
 msgid "LSsession : Some informations are missing to display this page."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3154
+#: includes/class/class.LSsession.php:3156
 msgid ""
 "LSsession : The function '%{function}' of the custom action "
 "'%{customAction}' does not exists or is not configured."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3157
+#: includes/class/class.LSsession.php:3159
 msgid "LSsession : Fail to retrieve user's LDAP credentials from LSauth."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3160
+#: includes/class/class.LSsession.php:3162
 msgid ""
 "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3163
+#: includes/class/class.LSsession.php:3165
 msgid "LSsession : No import/export format define for this object type."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3166
+#: includes/class/class.LSsession.php:3168
 msgid ""
 "LSsession : Error during creation of list of levels. Contact administrators. "
 "(Code : %{code})"
 msgstr ""
 
-#: includes/class/class.LSsession.php:3169
+#: includes/class/class.LSsession.php:3171
 msgid "LSsession : The password recovery is disabled for this LDAP server."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3172
+#: includes/class/class.LSsession.php:3174
 msgid ""
 "LSsession : Some informations are missing to recover your password. Contact "
 "administrators."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3175
+#: includes/class/class.LSsession.php:3177
 msgid ""
 "LSsession : Error during password recovery. Contact administrators.(Step : "
 "%{step})"
 msgstr ""
 
-#: includes/class/class.LSsession.php:3178
+#: includes/class/class.LSsession.php:3180
 msgid ""
 "LSsession : The function '%{func}' configured for the view '%{view}' of the "
 "LSaddon '%{addon}' is not declared in the LSaddon file."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3181
+#: includes/class/class.LSsession.php:3183
 msgid "LSsession : Failed to load resource file '%{file}'."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3184
+#: includes/class/class.LSsession.php:3186
 msgid ""
 "LSsession : The function '%{func}' configured for the view '%{view}' of the "
 "LSaddon '%{addon}' doesn't exist."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3187
+#: includes/class/class.LSsession.php:3189
 msgid "LSsession : invalid related object's DN pass in parameter."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3190
+#: includes/class/class.LSsession.php:3192
 msgid ""
 "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please "
 "upgrade it."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3193
+#: includes/class/class.LSsession.php:3195
 msgid ""
 "LSsession : You have been redirect from an old-style URL %{url}. Please "
 "upgrade this link."
 msgstr ""
 
-#: includes/class/class.LSsession.php:3196
+#: includes/class/class.LSsession.php:3198
 msgid ""
 "LSsession : You always seem to use %{old} in your custom code: Please "
 "upgrade it and use %{new}.
    \n"