synch'ing with mike recent commits

diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
index f9749d3..381f51b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
@@ -196,7 +196,9 @@
        </TMPL_LOOP> </TMPL_IF>
        <tr>
                <td></td>
-               <td><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" ALT="Add New Member" border=0 ></td>
+               <td>
+                       <input type=hidden name=type value=<TMPL_VAR NAME="type">>
+                       <input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" ALT="Add New Member" border=0 ></td>
        </tr>
 
        </table>

diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
index 1f1b56a..adfd0e5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
@@ -63,35 +63,28 @@
                <TMPL_VAR NAME="borrowernotes"><!--</a>-->
                <p align=right>
                </font>
-               <TMPL_IF name="A">
-                       <form action=/cgi-bin/koha/memberentry.pl method=post>
+               <TMPL_IF name="I">
+                       <form action=/cgi-bin/koha/imemberentry.pl method=post>
                                <input type=hidden name=bornum value="<TMPL_VAR NAME="bornum">">
-                               <INPUT TYPE=submit class="button" value="Modify">
+                               <INPUT TYPE=submit class="button" value="Modifier">
                        </form>
-               </TMPL_IF>
-               <TMPL_IF name="C">
+               <TMPL_ELSE>
                        <form action=/cgi-bin/koha/memberentry.pl method=post>
                                <input type=hidden name=bornum value="<TMPL_VAR NAME="bornum">">
-                               <INPUT TYPE=submit class="button" value="Modify">
-                       </form>
-               </TMPL_IF>
-               <TMPL_IF name="I">
-                       <form action=/cgi-bin/koha/imemberentry.pl method=post>
-                               <input type=hidden name=bornum value="<TMPL_VAR NAME="bornum">">
-                               <INPUT TYPE=submit class="button" value="Modify">
+                               <INPUT TYPE=submit class="button" value="Modifier">
                        </form>
                </TMPL_IF>
                <form action=/cgi-bin/koha/deletemem.pl method=post>
                         <input type=hidden name=member value="<TMPL_VAR NAME="bornum">">
-                       <INPUT TYPE=submit class="button" value="Delete">
+                       <INPUT TYPE=submit class="button" value="Supprimer">
                </form>
                <form action=/cgi-bin/koha/member-password.pl method=post>
                        <input type=hidden name=member value=<TMPL_VAR NAME=bornum>>
-                       <input type=submit class="button" value="Change Password">
+                       <input type=submit class="button" value="Changer identifiant web">
                </form>
                <form action=/cgi-bin/koha/member-flags.pl method=post>
                        <input type=hidden name=member value=<TMPL_VAR NAME=bornum>>
-                       <input type=submit class="button" value="Modify User Flags">
+                       <input type=submit class="button" value="Modifier autorisations">
                </form>
 
        </TD>