diff -ur bugzilla-4.2/template/fr/default/search/boolean-charts.html.tmpl bugzilla/template/fr/default/search/boolean-charts.html.tmpl
--- template/fr/default/search/boolean-charts.html.tmpl	2011-12-03 17:09:05.000000000 +0100
+++ template/fr/default/search/boolean-charts.html.tmpl	2012-05-31 14:03:23.000000000 +0200
@@ -178,8 +178,8 @@
   <div class="any_all_select">
     <select name="[% name FILTER html %]" id="[% name FILTER html %]"
             onchange="fix_query_string(this)">
-      <option value="ET">Correspond à TOUS les critères qui suivent :</option>
-      <option value="OU" [% ' selected="selected"' IF selected == "OR" %]>
+      <option value="AND">Correspond à TOUS les critères qui suivent :</option>
+      <option value="OR" [% ' selected="selected"' IF selected == "OR" %]>
         Correspond à AU MOINS UN des critères qui suivent :</option>
     </select>
     [% IF with_advanced_link %]
diff -ur bugzilla-4.2/template/fr/default/search/form.html.tmpl bugzilla/template/fr/default/search/form.html.tmpl
--- template/fr/default/search/form.html.tmpl	2011-12-10 15:43:46.000000000 +0100
+++ template/fr/default/search/form.html.tmpl	2012-05-31 14:08:15.000000000 +0200
@@ -394,7 +394,7 @@
   <li>
     <label for="chfieldfrom">Entre le&nbsp;:</label>
     <input name="chfieldfrom" id="chfieldfrom" size="10" 
-                  value="[% default.chfieldto.0 || "Maintenant" FILTER html %]"
+                  value="[% default.chfieldto.0 FILTER html %]"
                   onchange="updateCalendarFromField(this)">
            <button type="button" class="calendar_button"
                           id="button_calendar_chfieldfrom"
@@ -402,7 +402,7 @@
            et le 
            <div id="con_calendar_chfieldfrom"></div>
           <input name="chfieldto" size="10" id="chfieldto" 
-          value="[% default.chfieldto.0 FILTER html %]" onchange="updateCalendarFromField(this)">
+          value="[% default.chfieldto.0 || "Maintenant" FILTER html %]" onchange="updateCalendarFromField(this)">
           <button type="button" class="calendar_button"
                          id="button_calendar_chfieldto"
                          onclick="showCalendar('chfieldto')"><span>Calendrier</span></button>
