From 2aa689c34b7fa0f2f2799b869a50e32d7ea44714 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 2 Sep 2004 16:32:18 +0000
Subject: [PATCH] french OPAC for 2.2

---
 koha-tmpl/opac-tmpl/css/fr/includes/basket.js | 357 ++++++++++++++++++
 .../opac-tmpl/css/fr/includes/marc-editor.css |  44 +++
 .../css/fr/includes/opac-basket-menu.inc      |   6 +-
 .../css/fr/includes/opac-basket-top.inc       |  16 +-
 .../opac-tmpl/css/fr/includes/opac-bottom.inc |   6 +-
 .../opac-tmpl/css/fr/includes/opac-top.inc    |  31 +-
 koha-tmpl/opac-tmpl/css/fr/includes/opac.css  |  95 ++++-
 koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl     |   6 +-
 .../opac-tmpl/css/fr/opac-ISBDdetail.tmpl     |  16 +
 .../opac-tmpl/css/fr/opac-MARCdetail.tmpl     | 251 ++++++++++++
 koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl  |  10 +-
 koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl     |  20 +-
 koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl   |  34 +-
 koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl   |  95 +++--
 koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl     |  43 ++-
 .../opac-tmpl/css/fr/opac-moredetail.tmpl     | 126 +++----
 koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl  |  90 ++---
 koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl   | 178 +++++++--
 .../opac-tmpl/css/fr/opac-searchresults.tmpl  | 230 +++++------
 .../opac-tmpl/css/fr/opac-sendbasket.tmpl     |  42 +--
 .../opac-tmpl/css/fr/opac-sendbasketform.tmpl |  10 +-
 .../opac-tmpl/css/fr/opac-serial-issues.tmpl  |  84 +++++
 koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl  | 160 ++++++++
 .../opac-tmpl/css/fr/opac-suggestions.tmpl    | 150 ++++++++
 koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl     |  91 +++--
 .../opac-tmpl/css/fr/opac-userupdate.tmpl     |  24 +-
 koha-tmpl/opac-tmpl/css/fr/subject.tmpl       |  24 +-
 27 files changed, 1758 insertions(+), 481 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/includes/basket.js
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/includes/marc-editor.css
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl

diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/basket.js b/koha-tmpl/opac-tmpl/css/fr/includes/basket.js
new file mode 100644
index 0000000000..8184dbe9f3
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/basket.js
@@ -0,0 +1,357 @@
+//////////////////////////////////////////////////////////////////////////////
+// BASIC FUNCTIONS FOR COOKIE MANGEMENT //
+//////////////////////////////////////////////////////////////////////////////
+
+var CGIBIN = "/cgi-bin/koha/";
+
+
+var nameCookie = "bib_list";
+var valCookie = readCookie(nameCookie);
+	
+if(valCookie){
+	var arrayRecords = valCookie.split("/");
+	if(arrayRecords.length > 0){
+		var basketcount = " ("+(arrayRecords.length-1)+")";
+	} else {
+		var basketcount = "";
+	}
+} else {
+		var basketcount = "";
+}
+
+function writeCookie(name, val, wd) {
+	if (wd) {
+		parent.opener.document.cookie = name + "=" + val;
+	}
+	else {
+		parent.document.cookie = name + "=" + val;
+	}
+}
+
+function readCookieValue (str, val_beg) {
+	var val_end = str.indexOf(";", val_end);
+	if (val_end == -1)
+		val_end = str.length;
+	return str.substring(val_beg, val_end);
+}
+
+function readCookie(name, wd) {
+	var str_name = name + "=";
+	var str_len = str_name.length;
+	var str_cookie = "";
+	if (wd) {
+		str_cookie = parent.opener.document.cookie;
+	}
+	else {
+		str_cookie = parent.document.cookie;
+	}
+	var coo_len = str_cookie.length;
+	var i = 0;
+
+	while (i < coo_len) {
+		var j = i + str_len;
+		if (str_cookie.substring(i, j) == str_name)
+			return readCookieValue(str_cookie, j);
+		i = str_cookie.indexOf(" ", i) + 1;
+		if (i == 0)
+			break;
+	}
+
+	return null;
+}
+
+function delCookie(name) {
+	var exp = new Date();
+	exp.setTime(exp.getTime()-1);
+	parent.opener.document.cookie = name + "=null; expires=" + exp.toGMTString();
+}
+
+
+///////////////////////////////////////////////////////////////////
+// SPECIFIC FUNCTIONS USING COOKIES //
+///////////////////////////////////////////////////////////////////
+
+function openBasket() {
+	var strCookie = "";
+
+	var nameCookie = "bib_list";
+	var valCookie = readCookie(nameCookie);
+	if (valCookie) {
+		strCookie = nameCookie + "=" + valCookie;
+	}
+
+	if (strCookie) {
+		var iW = 620;
+		var iH = 450;
+
+		var optWin = "dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=yes,height="+iH+",width="+iW;
+		var loc = CGIBIN + "opac-basket.pl?" + strCookie;
+		var basket = open(loc, "basket", optWin);
+	}
+	else {
+		alert(MSG_BASKET_EMPTY);
+	}
+}
+
+
+function addRecord(val, selection) {
+	var nameCookie = "bib_list";
+	var valCookie = readCookie(nameCookie);
+	var write = 0;
+
+	if ( ! valCookie ) { // empty basket
+		valCookie = val + '/';
+		write = 1;
+		updateBasket(1,document);
+	}
+	else {
+		// is this record already in the basket ?
+		var found = false;
+		var arrayRecords = valCookie.split("/");
+		
+		for (var i = 0; i < valCookie.length - 1; i++) {
+			if (val == arrayRecords[i]) {
+				found = true;
+				break;
+			}
+		}
+
+		if ( found ) {
+			if (selection) {
+				return 0;
+			}
+			alert(MSG_RECORD_IN_BASKET);
+		}
+		else {
+			valCookie += val + '/';
+			write = 1;
+			updateBasket(arrayRecords.length,document);
+		}
+	}
+
+	if (write) {
+		writeCookie(nameCookie, valCookie);
+		if (selection) { // when adding a selection of records
+			return 1;
+		}
+		alert(MSG_RECORD_ADDED);
+	}
+}
+
+
+function addMultiple(){
+	var c_value = "";
+	if(document.myform.bibid.length > 0) {
+		for (var i=0; i < document.myform.bibid.length; i++) {
+			if (document.myform.bibid[i].checked) {
+				c_value = c_value + document.myform.bibid[i].value + "/";
+			}
+		}
+		addSelRecords(c_value);
+	}
+}
+
+
+function addSelRecords(valSel) { // function for adding a selection of biblios to the basket
+												// from the results list
+	var arrayRecords = valSel.split("/");
+	var i = 0;
+	var nbAdd = 0;
+	for (i=0;i<arrayRecords.length;i++) {
+		if (arrayRecords[i]) {
+			nbAdd += addRecord(arrayRecords[i], 1);
+		}
+		else {
+			break;
+		}
+	}
+
+	var msg = "";
+	if (nbAdd) {
+		if (i > nbAdd) {
+			msg = nbAdd+" "+MSG_NRECORDS_ADDED+", "+(i-nbAdd)+" "+MSG_NRECORDS_IN_BASKET;
+		}
+		else {
+			msg = nbAdd+" "+MSG_NRECORDS_ADDED;
+		}
+	}
+	else {
+		if (i < 1) {
+			msg = MSG_NO_RECORD_SELECTED;	
+		}
+		else {
+			msg = MSG_NO_RECORD_ADDED+" ("+MSG_NRECORDS_IN_BASKET+") !";
+		}
+	}
+	alert(msg);
+}
+
+
+function selRecord(num, status) {
+	var str = document.myform.records.value
+	if (status){
+		str += num+"/";
+	}
+	else {
+		str = delRecord(num, str);
+	}
+
+	document.myform.records.value = str;
+}
+
+
+function delSelRecords() {
+	var recordsSel = 0;
+	var end = 0;
+	var nameCookie = "bib_list";
+	var valCookie = readCookie(nameCookie, 1);
+
+	if (valCookie) {
+		var str = document.myform.records.value;
+		if (str.length > 0){
+			recordsSel = 1;
+			var str2 = valCookie;
+			while (!end){
+				s = str.indexOf("/");
+				if (s>0){
+					num = str.substring(0, s)
+					str = delRecord(num,str);
+					str2 = delRecord(num,str2);
+				} else {
+					end = 1;
+				}
+			}
+
+			if (str2.length == 0) { // equivalent to emptying the basket
+				var rep = false;
+				rep = confirm(MSG_CONFIRM_DEL_BASKET);
+				if (rep) { 
+					delCookie(nameCookie);
+					document.location = "about:blank";
+					updateBasket(0,top.opener.document);
+					window.close();
+				} else {
+					return;
+				}
+			} else {
+				writeCookie(nameCookie, str2, 1);
+			}
+		}
+	}
+
+	if (recordsSel) {
+		var strCookie = "";
+		var nameCookie = "bib_list";
+		var valCookie = readCookie(nameCookie, 1);
+		strCookie = nameCookie + "=" + valCookie;
+		var arrayRecords = valCookie.split("/");
+		updateBasket(arrayRecords.length-1,top.opener.document);
+		document.location = CGIBIN + "opac-basket.pl?" + strCookie;
+	}
+	else {
+		alert(MSG_NO_RECORD_SELECTED);
+	}
+}
+
+
+function delRecord (n, s) {
+	var re = /\d/;
+	var aux = s;
+	var found = 0;
+	var pos = -1;
+
+	while (!found) {
+		pos = aux.indexOf(n, pos+1);
+		var charAfter = aux.charAt(pos+n.length); // character right after the researched string
+		if (charAfter.match(re)) { // record number inside another one
+			continue;
+		}
+		else { // good record number
+			aux = s.substring(0, pos)+ s.substring(pos+n.length+1, s.length);
+			s = aux;
+			found = 1;
+		}
+	}
+
+	return s;
+}
+
+
+function delBasket() {
+	var nameCookie = "bib_list";
+
+	var rep = false;
+	rep = confirm(MSG_CONFIRM_DEL_BASKET);
+	if (rep) {
+		delCookie(nameCookie);
+		document.location = "about:blank";
+		updateBasket(0,top.opener.document);
+		window.close();
+	}
+}
+
+
+function quit() {
+	if (document.myform.records.value) {
+		var rep = false;
+		rep = confirm(MSG_CONFIRM_DEL_RECORDS);
+		if (rep) {
+			delSelRecords();
+		}
+	}
+	updateBasket(arrayRecords.length-1,top.opener.document);
+	window.close();
+}
+
+function sendBasket() {
+	var nameCookie = "bib_list";
+	var valCookie = readCookie(nameCookie);
+	var strCookie = nameCookie + "=" + valCookie;
+
+	var loc = CGIBIN + "opac-sendbasket.pl?" + strCookie;
+
+	var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=400,top=50,left=100";
+	var win_form = open(loc,"win_form",optWin);
+}
+
+function printBasket() {
+	var loc = document.location + "&print=1";
+	document.location = loc;
+}
+
+function showMore() {
+	var strCookie = "";
+
+	var nameCookie = "bib_list";
+	var valCookie = readCookie(nameCookie);
+	if (valCookie) {
+		strCookie = nameCookie + "=" + valCookie;
+	}
+	var loc = CGIBIN + "opac-basket.pl?" + strCookie + "&verbose=1";
+	document.location = loc;
+}
+
+function showLess() {
+	var strCookie = "";
+
+	var nameCookie = "bib_list";
+	var valCookie = readCookie(nameCookie);
+	if (valCookie) {
+		strCookie = nameCookie + "=" + valCookie;
+	}
+	var loc = CGIBIN + "opac-basket.pl?" + strCookie + "&verbose=0";
+	document.location = loc;
+}
+
+function updateBasket(updated_value,target) {
+    if(typeof document.getElementById != "undefined") {
+        target.getElementById('basket').innerHTML = " ("+updated_value+")";
+    } else if (typeof document.layers != "undefined") {
+        target.layers['basket'].open();
+        target.layers['basket'].write(" ("+updated_value+")");
+        target.layers['basket'].close();
+    } else if(typeof document.all != "undefined" &&  typeof
+document.getElementById == "undefined") {
+        target.all['basket'].innerHTML = " ("+updated_value+")";
+    }
+}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/marc-editor.css b/koha-tmpl/opac-tmpl/css/fr/includes/marc-editor.css
new file mode 100644
index 0000000000..08cde79cc4
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/marc-editor.css
@@ -0,0 +1,44 @@
+div.tabs {
+	width:10px;
+	position:absolute;
+	display:block;
+	margin-left:50px;
+	margin-top:150px;
+}
+
+div.tabs a {
+	display:block;
+	font-size: small;
+	border: thin solid black;
+	margin-right: 2px;
+	padding: 10px 10px;
+	-moz-border-radius: 5px 0px 0px 5px;
+}
+
+div.tab {
+	background-color: #ACE6E6;
+	display: block;
+	visibility:hidden;
+	position:absolute;
+	margin-left:72px;
+	margin-top:150px;
+	margin-right:10%;
+}
+td {
+	border:0px;
+}
+
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
+	font-weight:bold;
+	color:#FF6600;
+	background-color:FFFFFF;
+	background-image:none;
+	border-bottom: thin solid #FF6600;
+	margin-right:30%;
+}
+
+.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
+	float:left;
+	width: 12em;
+	margin-left:30px;
+}
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc
index 7343995705..afba4f9bb2 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc
@@ -1,13 +1,13 @@
 	<!-- MENUS -->
 	<div id="menuline" style="font-size:11pt;margin-top:20px;margin-bottom:20px;">
 		<span class="spacer">&nbsp;</span>
-		<A href='javascript:delBasket()' class="menu">Vider</A>
+		<A href='javascript:delBasket()' class="menu">Vide</A>
 		<span class="basketspacer">&nbsp;</span>
-		<A href='javascript:delSelRecords()' class="menu">Effacer la sélection</A>
+		<A href='javascript:delSelRecords()' class="menu">Supprimer la sélection</A>
 		<span class="basketspacer">&nbsp;</span>
 		<A href='javascript:sendBasket()' class="menu">Envoyer</A>
 		<span class="basketspacer">&nbsp;</span>
 		<A href='javascript:printBasket()' class="menu">Imprimer</A>
 		<span class="basketspacer">&nbsp;</span>
-		<A href='javascript:quit()' class="menu">Quitter</A>
+		<A href='javascript:quit()' class="menu">Fermer</A>
 	</div>
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc
index 4f7e9afd32..142c49ae43 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc
@@ -2,16 +2,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-
-<html>
 <head>
-	<title>Panier de notices OPAC</title>
-	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css">
-	<script src='/js/basket.js'></script>
+	<title>Panier</title>
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" ESCAPE=URL-->/includes/opac.css">
+	<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/basket.js"></script>
 	<SCRIPT language='javascript'>
-		var MSG_NO_RECORD_SELECTED = "Aucune notice sélectionnée";
-		var MSG_NO_RECORD_ADDED = "Aucune notice ajoutée";
-		var MSG_CONFIRM_DEL_BASKET = "Voulez-vous supprimer toutes les notices du panier ?"
-		var MSG_CONFIRM_DEL_RECORDS = "Voulez-vous effacer les notices sélectionnées ?";
+		var MSG_NO_RECORD_SELECTED = "No biblio selected";
+		var MSG_NO_RECORD_ADDED = "No biblio added";
+		var MSG_CONFIRM_DEL_BASKET = "Do you want to empty the basket ?"
+		var MSG_CONFIRM_DEL_RECORDS = "Do you want to remove selected biblios ?";
 	</SCRIPT>
 </head>
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
index c18217f17d..46c9e78c56 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
@@ -1,12 +1,12 @@
 <div id="bottombloc">
 <!-- TMPL_IF NAME="loggedinusername" -->
 	<p>
-		Connecté en tant que <b><!-- TMPL_VAR NAME="loggedinusername" --></b> <a href="/cgi-bin/koha/opac-user.pl">Accueil lecteur</a>
-		|| <a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Déconnecter</a>
+		Connecté en tant que <b><!-- TMPL_VAR NAME="loggedinusername" --></b> <a href="/cgi-bin/koha/opac-user.pl">Accueil Membre</a>
+		|| <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Déconnection</a>
 	</p>
 <!-- TMPL_ELSE -->
 	<p>
-		<a href="/cgi-bin/koha/opac-user.pl">S'identifier</a> à Koha
+		<a href="/cgi-bin/koha/opac-user.pl">Se connecter</a> à  Koha
 	</p>
 <!-- /TMPL_IF -->
 </div>
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
index 22e27a4249..7cb1933294 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
@@ -5,29 +5,30 @@
 <head>
 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
 	<title><!--TMPL_VAR name="LibraryName"--></title>
-	<script src='/js/basket.js'></script>
-	<SCRIPT language='javascript'>
-	var MSG_BASKET_EMPTY = "Il n'y a aucune notice !";
-	var MSG_RECORD_IN_BASKET = "Cette notice est déjà dans la liste";
-	var MSG_RECORD_ADDED = "Notice ajoutée au panier";
-	var MSG_NRECORDS_ADDED = "notice(s) ajoutée(s)";
-	var MSG_NRECORDS_IN_BASKET = "déjà présente(s) dans le panier";
-	var MSG_NO_RECORD_SELECTED = "Aucune notice sélectionnée";
-	var MSG_NO_RECORD_ADDED = "Aucune notice ajoutée";
-	</SCRIPT>
+	<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/basket.js"></script>
+	<script type="text/javascript" language="javascript">
+	var MSG_BASKET_EMPTY = "No biblio !";
+	var MSG_RECORD_IN_BASKET = "This biblio is already in the basket";
+	var MSG_RECORD_ADDED = "Biblio added to the basket";
+	var MSG_NRECORDS_ADDED = " Biblio(s) added";
+	var MSG_NRECORDS_IN_BASKET = "already in the basket";
+	var MSG_NO_RECORD_SELECTED = "No biblio selected";
+	var MSG_NO_RECORD_ADDED = "No biblio added";
+	</script>
 </head>
 <body>
 	<!-- MENUS -->
 	<div id="menuline">
-		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" />
-		<span class="LibraryName"><!--TMPL_VAR name="LibraryName"--></span>
+		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="Logo Koha" style="float: left">
+		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
 		<span class="spacer">&nbsp;</span>
-		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Page d'accueil">Accueil</a>
+		<span class="spacer">&nbsp;</span>
+		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Page d'accueil Koha">Accueil</a>
 		<span class="spacer">&nbsp;</span>
 		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Recherche avancée">Recherche avancée</a>
 		<span class="spacer">&nbsp;</span>
-		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Accueil lecteur" >Lecteurs</a>
+		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Page d'accueil Membre">Membres</a>
 		<span class="spacer">&nbsp;</span>
-		<a class="menu" href="javascript:openBasket()" title="Panier de notices">Panier de notices</a>
+		<a class="menu" href="javascript:openBasket()" title="Panier de Bibliothèque">Panier de Bibliothèque <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
 	</div>
 	<!-- MAIN BODY OF PAGE -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac.css b/koha-tmpl/opac-tmpl/css/fr/includes/opac.css
index a86cf5ed71..562d35fbd3 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac.css
@@ -20,11 +20,25 @@ a.transparent {
 }
 
 a:hover {
-	background-color: #FF6600;
+/* 	background-color: #FF6600; */
+	background-image: url(/opac-tmpl/css/en/images/bar.gif);
+	background-repeat:no-repeat;
 	text-decoration:none;
 	color:#000000;
 }
 
+a.results {
+	background-color : #FFD9BF;
+	padding : 0px 2px 0px 2px;
+	margin : 2px 1px 2px 0px;
+}
+
+a.results:hover {
+	background-color: #FFFFCC;
+	padding : 0px 2px 0px 2px;
+	margin : 2px 1px 2px 0px;
+}
+
 label {
 	float:left;
 	width: 10em;
@@ -33,8 +47,14 @@ label {
 img {
 	border-width:0px;
 	text-align:left;
+	position:absolute;
 }
 
+.relative { /* for images in relative position */
+	border-width:5px;
+	text-align:left;
+	position:relative;
+}
 
 h1 {
 	color:#FFD9BF;
@@ -54,17 +74,31 @@ h1 {
 	font-weight:bold;
 	font-size: 150%;
 	text-align:center;
-	vertical-align:top;
 	padding: 2px;
 	border: 4px inset #FF6600;
 	width:75%;
 }
 
+.SmallLibraryName {
+	color:#FFD9BF;
+	background-color:transparent;
+	font-weight:bold;
+	font-size: 115%;
+	text-align : center;
+	vertical-align:top;
+	padding: 2px;
+	width:100%;
+	margin-left:70px;
+}
+
 h2 {
 	color:#FFD9BF;
-	background-color:#FF6600;
+/* 	background-color:#FF6600; */
+	background-image: url(/opac-tmpl/css/en/images/bar.gif);
+	background-repeat:no-repeat;
 	font-weight:bold;
 	font-size: 125%;
+	margin: 0px 0px 10px 0px;
 }
 
 p {
@@ -106,6 +140,7 @@ th {
 td {
 	font-size:10pt;
 	border-left:1px solid #000000;
+	vertical-align:top;
 }
 
 /* hilighted cell */
@@ -113,6 +148,7 @@ td.hilighted {
 	font-size:10pt;
 	border-left:1px solid #000000;
 	background-color:#ffffcc;
+	vertical-align:top;
 }
 
 /* FORMS */
@@ -129,6 +165,7 @@ td.hilighted {
 	border-radius: 6px;
 	-moz-border-radius: 6px;
 	background-color:#FFD9BF;
+	margin : 3px 3px 3px 0px;
 }
 
 .button:hover {
@@ -143,11 +180,15 @@ td.hilighted {
 	border-radius: 6px;
 	-moz-border-radius: 6px;
 	background-color:#FF6600;
+	background-image: url(/opac-tmpl/css/en/images/bar.gif);
+	background-repeat:no-repeat;
+	margin : 3px 3px 3px 0px;
 }
 
 input {
 	border:0px;
 	border-bottom:1px solid #000000;
+	margin-bottom:2px;
 	background-color:#009999;
 }
 
@@ -157,12 +198,31 @@ input:hover {
 	background-color:#FF6600;
 }
 
+textarea {
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#009999;
+}
+
+textarea:hover {
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#FF6600;
+}
+
 select {
-	background-color: #ACE6E6;
-	text-decoration:none;
-	color:#000000;
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#009999;
 }
 
+select:hover {
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#FF6600;
+}
+
+
 /* span classes */
 /* used to show small 1,2,3, to reach other pages when too much results */
 .smallnumber {
@@ -221,7 +281,7 @@ select {
 }
 
 /* used in members */
-#bloc20 {
+#bloc20, .bloc20 {
 	float:left;
 	width:30%;
 	border:0;
@@ -229,7 +289,7 @@ select {
 	margin-right:20px;
 	margin-bottom:20px;
 }
-#bloc60 {
+#bloc60, .bloc60 {
 	float:left;
 	width:60%;
 	border:0;
@@ -257,16 +317,25 @@ select {
 	border:1px solid #000000;
 	padding-left:10pt;
 	padding-right:10pt;
-	float:left;
+/* 	float:left; */
 	margin-bottom:10px;
 	-moz-border-radius: 6px;
 }
+
 #menuline {
+/*	width:100%;
+	vertical-align:top;*/
+	float:left;
+/*	position:relative;*/
+	display:block;
+}
+
+#bibliomenu {
+	position: relative;
+	float:left;
+	display:block;
+	margin-left:10%;
 	width:100%;
-	height:200%;
-	vertical-align:top;
-	float:none;
-	position:relative;
 }
 
 /* a little spacer. should not be used */
diff --git a/koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl b/koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl
index 4050273894..b3fc71e878 100644
--- a/koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl
@@ -2,11 +2,11 @@
 
 
 <center>
-<table border=1 cellspacing=5 bgcolor=red>
+<table border=1 cellspacing=5 bgcolor="red">
 <tr><td>
-<table border=0 bgcolor=#dddddd>
+<table border=0 bgcolor="#dddddd">
 <tr><th>Une erreur s'est produite</th></tr>
-<tr><td><!-- TMPL_VAR NAME=errormessage --></td></tr>
+<tr><td><!-- TMPL_VAR NAME="errormessage" --></td></tr>
 </table>
 </td></tr>
 </table>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl
new file mode 100644
index 0000000000..bc3d771ed3
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl
@@ -0,0 +1,16 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<div id="bibliomenu">
+	"<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> Normal </a> <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button"> MARC </a> <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>  	 	    	
+	<!-- TMPL_UNLESS NAME="norequests" -->
+		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
+			Requète
+		</a>
+	<!-- /TMPL_UNLESS -->
+</div>
+
+<div id="mainbloc">
+	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
+</div>
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl
new file mode 100644
index 0000000000..b113b30b63
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl
@@ -0,0 +1,251 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<div id="bibliomenu">
+	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> Normal </a> <a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
+	<!-- TMPL_IF NAME="norequests" -->
+	<!-- TMPL_ELSE -->
+		<a href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" --> class="button catalogue">Requète</a>
+	<!-- /TMPL_IF -->
+</div>
+
+	<div class="tabs">
+		<!-- TMPL_IF name="0XX" -->
+			<a href="javascript:active(0)"><div id="link0">0</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="1XX" -->
+			<a href="javascript:active(1)"><div id="link1">1</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="2XX" -->
+			<a href="javascript:active(2)"><div id="link2">2</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="3XX" -->
+			<a href="javascript:active(3)"><div id="link3">3</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="4XX" -->
+			<a href="javascript:active(4)"><div id="link4">4</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="5XX" -->
+			<a href="javascript:active(5)"><div id="link5">5</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="6XX" -->
+			<a href="javascript:active(6)"><div id="link6">6</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="7XX" -->
+			<a href="javascript:active(7)"><div id="link7">7</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="8XX" -->
+			<a href="javascript:active(8)"><div id="link8">8</div></a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="9XX" -->
+			<a href="javascript:active(9)"><div id="link9">9</div></a>
+		<!-- /TMPL_IF -->
+		<a href="javascript:active(10)">I<br/>t<br/>e<br/>m<br/>s</a>
+	</div>
+
+	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+		<!-- TMPL_LOOP name="0XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="1XX" id="1XX" class="tab">
+		<!-- TMPL_LOOP name="1XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="2XX" id="2XX" class="tab">
+		<!-- TMPL_LOOP name="2XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="3XX" id="3XX" class="tab">
+		<!-- TMPL_LOOP name="3XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="4XX" id="4XX" class="tab">
+		<!-- TMPL_LOOP name="4XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="5XX" id="5XX" class="tab">
+		<!-- TMPL_LOOP name="5XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="6XX" id="6XX" class="tab">
+		<!-- TMPL_LOOP name="6XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="7XX" id="7XX" class="tab">
+		<!-- TMPL_LOOP name="7XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="8XX" id="8XX" class="tab">
+		<!-- TMPL_LOOP name="8XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="9XX" id="9XX" class="tab">
+		<!-- TMPL_LOOP name="9XX" -->
+				<p class="MARCtag">
+					<!-- TMPL_VAR name="tag" -->
+				</p>
+			<!-- TMPL_LOOP name="subfield" -->
+				<p>
+					<label class="labelsubfield">
+						<!-- TMPL_VAR name="marc_subfield" -->
+						<!-- TMPL_VAR name="marc_lib" -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div name="10XX" id="10XX" class="tab">
+		<h2 class="catalogue">documents</h2>
+		<table>
+				<tr>
+					<!-- TMPL_LOOP name="item_header_loop" -->
+						<th class="catalogue">
+							<!-- TMPL_VAR name="header_value" -->
+						</th>
+					<!-- /TMPL_LOOP -->
+				</tr>
+				<!-- TMPL_LOOP name="item_loop" -->
+					<tr>
+						<!-- TMPL_VAR name="item_value" -->
+					</tr>
+				<!-- /TMPL_LOOP -->
+		</table>
+	</div>
+<script language="JavaScript" type="text/javascript">
+function active(numlayer)
+{
+	for (i=0; i <= 10 ; i++ ) {
+		ong = i+"XX";
+		link = "link"+i;
+		if (numlayer==i) {
+			document.getElementById(ong).style.visibility="visible";
+		} else {
+			document.getElementById(ong).style.visibility="hidden";
+		}
+	}
+}
+
+function Dopop(link) {
+	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl
index 97e6259794..b0596ba62d 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl
@@ -2,13 +2,13 @@
 
 <div id="mainbloc">
 	<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-	<h2>Compte de <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
+	<h2>Compte <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
 	<!-- /TMPL_LOOP -->
 	<table cellspacing=0>
 		<tr>
-			<th colspan=2>Dettes & paiements</th>
-			<th>Quantité</th>
-			<th>Doit encore</th>
+			<th colspan=2>Amendes et charges</th>
+			<th>Montant</th>
+			<th>Dettes</th>
 		</tr>
 
 		<!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
@@ -31,7 +31,7 @@
 		<!-- /TMPL_LOOP -->
 
 		<tr>
-			<th colspan=2><b>Total dû</th>
+			<th colspan=2><b>Somme due</th>
 			<th align="right"><!-- TMPL_VAR NAME="total" --></th>
 			<th>&nbsp;</th>
 		</tr>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
index 6477b09282..faf179c472 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
@@ -2,35 +2,35 @@
 <div id="mainbloc">
 <!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesnt have permission -->
-<h2>Désolé, je pense que vous n'avez pas les permissions suffisantes.<h2>
+<h2>Désolé, Koha ne pense pas que vous pouvez accéder à cette page<h2>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
-<!-- This is what is displayed if Connecter has timed out -->
-<h2>Déconnecté. Identifiez vous à nouveau.<h2>
+<!-- This is what is displayed if login has timed out -->
+<h2>Désolé, votre session a expiré, merci de vous reconnecter<h2>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="different_ip" -->
 <!-- This is what is displayed if user doesnt have permission -->
-<h2>Vous avez changé d'adresse IP. Identifiez vous à nouveau<h2>
+<h2>Vous accédez déjà à Koha à partir d'une autre adresse IP ! Merci de vous reconnecter<h2>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="invalid_username_or_password" -->
 <!-- This is what is displayed if user doesnt have permission -->
-<h2>Identifiant ou mot de passe erroné. Essayez encore.<h2>
+<h2>Vous avez saisi un nom de membre ou un mot de document invalide, merci de réessayer<h2>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="loginprompt" -->
-<!-- Connecter prompt time-->
+<!-- login prompt time-->
 
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
-	<h1>Identifiant Koha</h1>
-	<p><label>N° de carte</label><input name="userid" /></p>
-	<p><label>Mot de passe :</label><input type="password" name="password" /></p>
+	<h1>Identification</h1>
+	<p><label>Numéro de carte</label><input name="userid" /></p>
+	<p><label>Mot de passe</label><input type="password" name="password" /></p>
 	<!-- TMPL_LOOP NAME="INPUTS" -->
 		<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
 	<!-- /TMPL_LOOP -->
-	<input type="submit" value="Connecter" class="button" />
+	<input type="submit" value="identifiant" class="button">
 </form>
 
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl
index c31f06cb45..1f4ea576fe 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl
@@ -20,29 +20,29 @@
 				<!-- BIBLIO RECORD TABLE -->
 				<tr>
 					<th>
-						<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+						<!-- TMPL_VAR NAME="title" --> (enregistrement <!-- TMPL_VAR NAME="biblionumber" -->)
 					</th>
 				</tr>
 				<tr valign="top">
 					<td>
-						<!-- TMPL_IF name="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="subtitle" --><b>Sous-titre:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="author" --><b>Auteur:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="additional" --><b>Autres auteurs:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="publishercode" --><b>Publié par :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="publicationyear" --><b>en </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="subtitle" --><b>sous-titre:</b><!-- TMPL_VAR NAME="subtitle" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="author" --><b>Auteur :</b> <!-- TMPL_VAR NAME="author" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="additional" --><b>Auteurs supplémentaires:</b><!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publishercode" --><b>publié par :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publicationyear" --><b>dans </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
 						<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
-						<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="subject" --><b>Sujet:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="copyrightdate" --><b>Année :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="unititle" --><b>Titre unifié:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
-						<!-- TMPL_IF name="serial" --><b>Périodique:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
-						<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+						<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="subject" --><b>Sujet:</b> <!-- TMPL_VAR NAME="subject" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="copyrightdate" --><b>Tous droits réservés année:</b><!-- TMPL_VAR NAME="copyrightdate" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="notes" --><b>Remarques:</b> <!-- TMPL_VAR NAME="notes" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="unititle" --><b>Uniform title:</b> <!-- TMPL_VAR NAME="unititle" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="classification" --><b>Cote:</b><!-- TMPL_VAR name="classification" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="url" --><b>URL:</b> <!-- TMPL_VAR NAME="url" --><br><!-- /TMPL_IF -->
 					</td>
 				</tr>
 			</table>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
index 7c7be13d54..0354f513e6 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
@@ -1,58 +1,102 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+
+<div id="bibliomenu">
+	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button"> MARC </a> <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
+	<!-- TMPL_UNLESS NAME="norequests" -->
+		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
+			Requète
+		</a>
+	<!-- /TMPL_UNLESS -->
+	<!-- TMPL_IF name="subscriptionid" -->
+	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Bulletins">
+		Prêts
+	</a>
+	<!-- /TMPL_IF -->
+	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Ajouter au panier</a>
+</div>
+
 <div id="mainbloc">
 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
 
+	<p>
 	<div id="bibliobloc">
 	<table cellspacing="0">
 		<!-- BIBLIO RECORD TABLE -->
 		<tr>
 			<th>
-				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+				<!-- TMPL_VAR NAME="title" --> (enregistrement <!-- TMPL_VAR NAME="biblionumber" -->)
 			</th>
 		</tr>
 		<tr>
 			<td>
 				<!-- TMPL_IF name="subtitle" --><b>Sous-titre:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
-				<!-- TMPL_IF name="author" --><b>Auteur:</b> <a href="/cgi-bin/koha/opac-search.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br />
-				<!-- TMPL_IF name="additional" --><b>Autres auteurs:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="author" --><b>Auteur :</b> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
+				<!-- TMPL_IF name="additional" --><b>Auteurs Supplémentaires:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
 				<!-- TMPL_IF name="publishercode" --><b>Publié par :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
-				<!-- TMPL_IF name="publicationyear" --><b>en </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+				<!-- TMPL_IF name="publicationyear" --><b>dans </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
 				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
 				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
-				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
-				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
-				<!-- TMPL_IF name="sujet" --><b>Sujet:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="sujet" --><br />
+				<!-- TMPL_IF name="isbn" --><b>ISBN :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
+				<!-- TMPL_IF name="seriestitle" --><b>Collection :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
+				<!-- TMPL_IF name="subject" --><b>Sujet :</b><!-- /TMPL_IF --> 
+					<!-- TMPL_LOOP name="subjects" -->
+						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
+					<br />
 				<!-- TMPL_IF name="copyrightdate" --><b>Année :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
-				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
-				<!-- TMPL_IF name="unititle" --><b>Titre unifié:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
-				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
+				<!-- TMPL_IF name="notes" --><b>Remarques:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
+				<!-- TMPL_IF name="unititle" --><b>Titre uniforme : %s</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
+				<!-- TMPL_IF name="dewey" --><b>code Dewey :</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
-				<b>Nombre total d'exemplaires:</b> <!-- TMPL_VAR NAME="count" -->
+				<b>Type de document : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
+				<b>Nombre Total de documents <!-- TMPL_VAR NAME="count" -->
 			</td>
 		</tr>
 	</table>
+	<table>
+	<!-- TMPL_IF name="MARCNOTES" -->
+		<tr>
+			<th><i>Detailed notes:</i></th>
+			<td>
+				<ul>
+					<!-- TMPL_LOOP NAME="MARCNOTES" -->
+						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
+					<!-- /TMPL_LOOP -->
+				</ul>
+			</td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="MARCSUBJCTS" -->
+		<tr>
+			<th>Related links:</th>
+			<td>
+				<ul>
+					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">  <!-- TMPL_VAR NAME="marcsubjct" -->  </a><br>
+					<!-- /TMPL_LOOP -->
+				</ul>
+			</td>
+		</tr>
+	<!-- /TMPL_IF -->
+	</table>
 	</div>
 	<!-- /TMPL_LOOP -->
 
 	<div id="itembloc">
 	<table cellspacing="0">
 		<tr>
-			<th colspan="6">Exemplaire</th>
+			<th colspan="6">Document</th>
 		</tr>
 		<tr>
-			<th>type</th>
-			<th>classe</th>
 			<th>Localisation</th>
-			<th>date retour</th>
-			<th>vu en dernier</th>
+			<th>Date de retour</th>
+			<th>Vu pour la dernière fois</th>
 			<th>code barre</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 			<tr>
-				<td><!-- TMPL_VAR NAME="itemtype" --></td>
-				<td><!-- TMPL_VAR NAME="class" --></td>
-				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="bulk" -->(<!-- TMPL_VAR NAME="bulk" -->)<!-- /TMPL_IF --></td>
+				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
 				<td><!-- TMPL_VAR NAME="datedue" --></td>
 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 				<td><!-- TMPL_VAR NAME="barcode" --></td>
@@ -61,7 +105,7 @@
 		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
 			<tr>
 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
-				<td>Site web</td>
+				<td>Site Web</td>
 				<td>En ligne</td>
 				<td>Disponible</td>
 				<td>&nbsp;</td>
@@ -69,12 +113,11 @@
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-	<p>
-	<!-- TMPL_UNLESS NAME="norequests" -->
-		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Reserver</a>&nbsp;&nbsp;&nbsp;
-	<!-- /TMPL_UNLESS -->
-	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Ajouter au panier</a>
-	</p>
+	<!-- TMPL_IF name="subscriptionid" -->
+		<p>
+			This is a serial subscription. You can see which  <a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">  Issues  </a> we have and don't have
+		</p>
+	<!-- /TMPL_IF -->
 	</div>
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
index 794d9218a1..edfc3152bf 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
@@ -9,39 +9,58 @@
 
 <body>
 <div id="leftbloc">
-	<img src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
+	<img class="relative" src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="Koha" alt="Koha">
 </div>
 
 <div id="homebloc">
-	<h1 class="LibraryName"><!-- TMPL_VAR name="LibraryName" --></h1>
+	<h1 class="LibraryName"><TMPL_VAR name="LibraryName"></h1>
 	<h2>Chercher dans le catalogue</h2>
-	<form action="/cgi-bin/koha/opac-searchresults.pl">
+	<form action="/cgi-bin/koha/opac-search.pl">
 		<p>
+			<input type="hidden" name="op" value="do_search" />
 			<input type="hidden" name="type" value="opac" />
-			<input type="text" size="27" name="keyword" tabindex="1" /> <input type="submit" value="OK" class="button" /><br />
+			<input type="hidden" name="marclist" value="" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" size="27" name="value" tabindex="1" /> <input type="submit" value="OK" class="button" /><br />
 		</p>
 		<p>
-			<a href="/cgi-bin/koha/opac-search.pl">Recherche avancée, plus d'options	</a>
+			<a href="/cgi-bin/koha/opac-search.pl">Recherche Avancée, Plus d'Options	</a>
 		</p>
 	</form>
 
 	<h2>Acquisitions récentes</h2>
 	<form action="/cgi-bin/koha/opac-new.pl">
 		<p>
-		<!-- TMPL_VAR name="CGIitemtype" --> acquis dans les derniers <b><input type="text" name="duration" value="30" size="3" /></b> jours
+		<!-- TMPL_VAR name="CGIitemtype" --> acquis dans les <b><input type="text" name="duration" value="30" size="3" /></b> derniers jours
 		<input type="submit" value="OK" class="button" />
 		</p>
 	</form>
+	<h2>Autres options</h2>
+	<!-- TMPL_IF name="virtualshelves" -->
+		<a href="/cgi-bin/koha/opac-shelves.pl" class="button">Etagères virtuelles</a>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="suggestion" -->
+		<a href="opac-suggestions.pl" class="button">Voir et gérer les suggestions</a>
+	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="loggedinusername" -->
-		<h2>Connecté en tant que <!-- TMPL_VAR NAME="loggedinusername" --></h2>
-		<p><a href="/cgi-bin/koha/opac-user.pl">Accueil lecteur</a> || <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Déconnecter</a></p>
+		<a href="/cgi-bin/koha/opac-user.pl" class="button"> <!-- TMPL_VAR NAME="loggedinusername" --> accueil </a> <a href="/cgi-bin/koha/opac-main.pl?logout.x=1" class="button"> Déconnexion </a>
+		<form action="/cgi-bin/koha/changelanguage.pl" method="post">
+			<select name="language">
+				<TMPL_LOOP NAME="languages">
+					<option value="<TMPL_VAR NAME="language">"><TMPL_VAR NAME="language"></option>
+				</TMPL_LOOP>
+			</select>
+			<input type="submit" value="Change Language" class="button">
+		</form>
+
 	<!-- TMPL_ELSE -->
-	<h2><a href="/cgi-bin/koha/opac-user.pl">S'identifier</a></h2>
+	<h2><a href="/cgi-bin/koha/opac-user.pl">Connectez-vous à Koha</a></h2>
 	<!-- /TMPL_IF -->
 	<p class="copyright">
-		Cette bibliothèque fonctionne avec <a href="http://www.koha.org">Koha</a> SIGB sous licence libre, respectant les standards de l'internet
-		<a href="http://validator.w3.org/check/referer">
-			<img src="http://www.w3.org/Icons/valid-xhtml10" alt="XHTML 1.0 valide" height="16" width="44" />
+		This Library is powered by <a href="http://www.koha.org">Koha</a> free software ILS, and compliant with web standards  <a href="http://validator.w3.org/check/referer">
+			<img src="http://www.w3.org/Icons/valid-xhtml10" alt="XHTML 1.0 valide !" height="16" width="44">
 		</a>
 	</p>
 </div>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
index f55d3e3dd2..e5a9a2dfc7 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
@@ -3,97 +3,83 @@
 
 <br>
 <!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
-<a href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->
-<img src=/images/requests.gif
-width=120 height=42 border=0 align=right border=0></a>
-<FONT SIZE=6><em><a
-href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra><!-- TMPL_VAR NAME="title" -->
-(<!-- TMPL_VAR NAME="author" -->)</a></em></FONT><P>
+<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">
+	<img src="/images/requests.gif" width=120 height=42 border=0 align=right border=0>
+</a>
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a></h1>
 <p>
-<form action=/cgi-bin/koha/modbibitem.pl>
-<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
-<input type=hidden name=biblio value=<!-- TMPL_VAR NAME="biblionumber" -->>
-<!-------------------BIBLIO ITEM------------>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
-<TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"
-><B><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUPE <!-- TMPL_VAR NAME="description" --> </b> </TD>
-</TR>
-<tr VALIGN=TOP  >
-<TD width=210 >
-<INPUT TYPE="image" name="submit"  VALUE="Modifier" height=42  WIDTH=93
-BORDER=0 src="/images/Modifier-mem.gif">
-<INPUT TYPE="image" name="Supprimer"  VALUE="Supprimer" height=42  WIDTH=93
-BORDER=0 src="/images/Supprimer-mem.gif">
+<form action="/cgi-bin/koha/modbibitem.pl">
+<input type=hidden name=bibitem value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+<input type=hidden name=biblio value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<table>
+<tr>
+<td><b><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP - <!-- TMPL_VAR NAME="description" --> </b> </td>
+</tr>
+<tr>
+<td width=210 >
+<input TYPE="image" name="submit"  value="modify" height=42  WIDTH=93
+border=0 src="/images/modify-mem.gif">
+<input TYPE="image" name="delete"  value="delete" height=42  WIDTH=93
+border=0 src="/images/delete-mem.gif">
 <br>
-<FONT SIZE=2  face="arial, helvetica">
-<b>Numéro notice ::</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
-<b>Type d'ouvrage ::</b> <!-- TMPL_VAR NAME="itemtype" --><br>
+<b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
+<b>Item Type:</b> <!-- TMPL_VAR NAME="itemtype" --><br>
 <b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
-<b>Durée prêt:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
-<b>Coût du prêt:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
+<b>Loan Length:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
+<b>Rental Charge:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
 <b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --><br>
 <b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
-<b>Editions:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
-<b>Placer:</b> <!-- TMPL_VAR NAME="place" --><br>
+<b>Publisher:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
+<b>Place:</b> <!-- TMPL_VAR NAME="place" --><br>
 <b>Date:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
 <b>Volume:</b> <!-- TMPL_VAR NAME="volumeddesc" --><br>
 <b>Pages:</b> <!-- TMPL_VAR NAME="pages" --><br>
 <b>Illus:</b> <!-- TMPL_VAR NAME="illus" --><br>
-<b>Taille:</b> <!-- TMPL_VAR NAME="size" --><br>
-<b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
-<b>N° ouvrage:</b> <!-- TMPL_VAR NAME="count" -->
-</font>
-</TD>
+<b>Size:</b> <!-- TMPL_VAR NAME="size" --><br>
+<b>Remarques:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
+<b>No. of Items:</b> <!-- TMPL_VAR NAME="count" -->
+</td>
 </tr>
 </table>
 </form>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
 <img src="/images/holder.gif" width=16 height=300 align=left>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
-<TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>CODE BARRE
-<!-- TMPL_VAR NAME="barcode" --></b></TD>
-</TR>
-<tr VALIGN=TOP>
-<TD width=220>
-<form action=/cgi-bin/koha/moditem.pl method=post>
+<TABLE>
+<tr>
+<td><b>BARCODE <!-- TMPL_VAR NAME="barcode" --></b></td>
+</tr>
+<tr>
+<td>
+<form action="/cgi-bin/koha/moditem.pl" method=post>
 <input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblionumber" -->>
 <input type=hidden name=item value=<!-- TMPL_VAR NAME="itemnumber" -->>
 <input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-<INPUT TYPE="image" name="submit"  VALUE="Modifier" height=42  WIDTH=93
-BORDER=0 src="/images/Modifier-mem.gif">
-<INPUT TYPE="image" name="Supprimer"  VALUE="Supprimer" height=42  WIDTH=93
-BORDER=0 src="/images/Supprimer-mem.gif">
+<input TYPE="image" name="submit"  value="modify" height=42  width=93
+border=0 src="/images/modify-mem.gif">
+<input type="image" name="delete"  value="delete" height=42  width=93
+border=0 src="/images/delete-mem.gif">
 <br>
-<FONT SIZE=2  face="arial, helvetica">
-<b>Annexe propriétaire:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
-<b>Vu:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
-<b>Dernier prêt:</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
-En prêt \? <!-- FIXME - What's this, then? -->
-<b>Dernier emprunteur 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
-<b>Dernier emprunteur 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
-<b>Annexe:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
-<b>Coût de remplacement:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
-<b>Ouvrage perdu:</b> <!-- TMPL_VAR NAME="itemlost" --><br>
-<b>Payé pour ::</b> <!-- TMPL_VAR NAME="paidfor" --><br>
-<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
-<b>Renouvellements:</b> <!-- TMPL_VAR NAME="renewals" --><br>
-<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">
-Accession</a>
-Date:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
-<b>Annul\?: <!-- TMPL_VAR NAME="wthdrawn" --><br>
+<b>Home Branch:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+<b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+<b>Last borrowed:</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
+on issue bit <!-- FIXME - What's this, then? -->
+<b>Last Borrower 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+<b>Last Borrower 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+<b>Current Branch:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+<b>Replacement Price:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+<b>Item lost:</b> <!-- TMPL_VAR NAME="itemlost" --><br>
+<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+<b>Remarques:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
+<b>Renewals:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes"> Accession</a> Date:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
+<b>Cancelled: <!-- TMPL_VAR NAME="wthdrawn" --><br>
 <b><a
-href=/cgi-bin/koha/bookcount.pl?&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&itm=<!-- TMPL_VAR NAME="itemnumber" -->>Total
-Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
-<b>Groupe numéro:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
-<b>Notice biblio ::</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
-
-
+href=/cgi-bin/koha/bookcount.pl?&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&itm=<!-- TMPL_VAR NAME="itemnumber" -->>Total Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
+<b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
+<b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
 
-</font>
-</TD>
+</td>
 </tr>
 </table>
 </form>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
index d0325a5200..955a91c13d 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
@@ -1,85 +1,91 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <div id="mainbloc">
-<h2>Page de réservation pour <u><!-- TMPL_VAR NAME="title" --></u> (<!-- TMPL_VAR NAME="author" -->, N°<!-- TMPL_VAR name="biblionumber" -->)</h2>
+<h2>Page des réservations pour <i><!-- TMPL_VAR NAME="title" --></i> (<!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" -->,<!-- /TMPL_IF --> N°<!-- TMPL_VAR name="biblionumber" -->)</h2>
 <!-- TMPL_IF NAME="message" -->
-	<h2>Impossible de réserver parce que </h2>
+	<h2>Impossible d'établir la réservation parce que </h2>
 	<ul>
-		<!-- TMPL_IF NAME="too_much_oweing" --><li>Vous devez <!-- TMPL_VAR NAME="too_much_oweing" --></li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="too_many_reserves" --><li>you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves.</li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="already_reserved" --><li>Vous avez déjà placé une réservation sur cet exemplaire</li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="no_items_selected" --><li>Vous devez sélectionner au moins 1 type</li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="no_branch_selected" --><li>Vous devez sélectionner une annexe ou retirer l'ouvrage</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="too_much_oweing" --><li>vous devez <!-- TMPL_VAR NAME="too_much_oweing" --></li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="too_many_reserves" --><li>vous ne pouvez faire plus de <!-- TMPL_VAR NAME="too_many_reserves" --> réservations</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="already_reserved" --><li>Vous avez déjà une réservation en cours pour ce document</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="no_items_selected" --><li>Vous devez sélectionner au moins un type de document !</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="no_branch_selected" --><li>vous devez saisie un site de retrait !</li><!-- /TMPL_IF -->
 	</ul>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="select_item_types" -->
 	<!-- The first time round you select which bibitems you want -->
-	<p> Il y a <b><!-- TMPL_VAR NAME="reservecount" --></b> Réservations déjà faites sur cet ouvrage </p>
-	<p>Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous.</p>
+	<p> Il y a déjà <b><!-- TMPL_VAR NAME="reservecount" --></b> réservations pour ce document </p>
+	<p>Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you.</p>
 
-	<FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
-		<input type="hidden" name="item_types_selected" value="1">
-		<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->">
-		<TABLE cellspacing=0>
+	<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
+		<input type="hidden" name="item_types_selected" value="1" />
+		<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
+		<table cellspacing="0">
 			<tr>
-				<th>Reserver</th>
-				<th>Type d'ouvrage :</th>
-				<th>Copies</th>
+				<th>Requète</th>
+				<th>Type de documents</th>
+				<th>Exemplaires</th>
 			</tr>
 			<!-- TMPL_LOOP NAME="TYPES" -->
 				<tr>
 					<!-- TMPL_UNLESS NAME="notforloan" -->
-						<td><input type="checkbox" name="itemtype" value="<!-- TMPL_VAR NAME='itemtype' -->" checked></td>
+						<td><input type="checkbox" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->" checked="checked" /></td>
 					<!-- TMPL_ELSE -->
-						<td>Non réservable</td>
+						<td>Ne peut être Réservé</td>
 					<!-- /TMPL_UNLESS -->
 					<td><!-- TMPL_VAR NAME="description" --></td>
 					<td><!-- TMPL_VAR NAME="copies" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		<p>Sélectionnez l'annexe ou vous prendrez l'ouvrage: <!-- TMPL_VAR NAME="CGIbranch" --></p>
-		<p>Réserver à cette date ::
-			<select name=required-day><option value=0>Jour<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
-			<select name=required-month><option value=0>Mois<option value=1 >Jan<option value=2 >Fev<option value=3 >Mars<option value=4 >Avril<option value=5 >Mai<option value=6 >Juin<option value=7 >Juill<option value=8 >Aout<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
-			<select name=required-year><option value=0>Année<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+		<p>Merci de sélectionner le site où vous souhaitez récupérer le *** <!-- TMPL_VAR NAME="CGIbranch" --></p>
+		<p>Réserver à cette date :
+			<select name="required-day">
+<option value="0">Jour</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option><option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option><option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option><option value="22">22</option><option value="23">23</option><option value="24">24</option><option value="25">25</option><option value="26">26</option><option value="27">27</option><option value="28">28</option><option value="29">29</option><option value="30">30</option><option value="31">31</option></select>
+			<select name="required-month">
+<option value="0">Mois</option><option value="1">Janv</option><option value="2">Fév</option><option value="3">Mar</option><option value="4">Avr</option><option value="5">Mai</option><option value="6">Juin</option><option value="7">Juil</option><option value="8">Aoû</option><option value="9">Sept</option><option value="10">Oct</option><option value="11">Nov</option><option value="12">Déc</option></select>
+			<select name="required-year">
+<option value="0">Année</option>
+<option value="2002">2002</option><option value="2003">2003</option><option value="2004">2004</option><option value="2005">2005</option><option value="2006">2006</option></select>
 		</p>
-		<p>Annuler réservation à cette date:
-			<select name=expires-day><option value=0>Jour<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
-			<select name=expires-month><option value=0>Mois<option value=1 >Jan<option value=2 >Fev<option value=3 >Mars<option value=4 >Avril<option value=5 >Mai<option value=6 >Juin<option value=7 >Juill<option value=8 >Aout<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
-			<select name=expires-year><option value=0>Année<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+		<p>Annuler la réservation le :
+			<select name="expires-day">
+<option value="0">Jour</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option><option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option><option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option><option value="22">22</option><option value="23">23</option><option value="24">24</option><option value="25">25</option><option value="26">26</option><option value="27">27</option><option value="28">28</option><option value="29">29</option><option value="30">30</option><option value="31">31</option></select>
+			<select name="expires-month">
+<option value="0">Mois</option><option value="1">Janv</option><option value="2">Fév</option><option value="3">Mar</option><option value="4">Avr</option><option value="5">Mai</option><option value="6">Juin</option><option value="7">Juil</option><option value="8">Aoû</option><option value="9">Sept</option><option value="10">Oct</option><option value="11">Nov</option><option value="12">Déc</option></select>
+			<select name="expires-year">
+<option value="0">Année</option><option value="2002">2002</option><option value="2003">2003</option><option value="2004">2004</option><option value="2005">2005</option><option value="2006">2006</option></select>
 		</p>
-		<INPUT class="button" type="submit" value="OK">
-	</FORM>
+		<input class="button" type="submit" value="Soumettre">
+	</form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="item_types_selected" -->
 <!-- if the bibitems have already been selected -->
-	<p>Confirmez que vous souhaitez réserver un ouvrage ::<p>
+	<p>Merci de confirmer que vous souhaitez demander un document de ces types</p>
 
-	<FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
-		<input type="hidden" name="place_reserve" value="1">
-		<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME='biblionumber' -->">
-		<input type="hidden" name="required_date" value="<!-- TMPL_VAR NAME='required_date' -->">
-		<input type="hidden" name="expires_date" value="<!-- TMPL_VAR NAME='expires_date' -->">
+	<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
+		<input type="hidden" name="place_reserve" value="1" />
+		<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+		<input type="hidden" name="required_date" value="<!-- TMPL_VAR NAME="required_date" -->" />
+		<input type="hidden" name="expires_date" value="<!-- TMPL_VAR NAME="expires_date" -->" />
 		<ul>
 			<!-- TMPL_LOOP NAME="TYPES" -->
-					<input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME='itemtype' -->"></td>
-					<li><!-- TMPL_VAR NAME="description" --></li>
+			<li><input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->" /><!-- TMPL_VAR NAME="description" --></li>
 			<!-- /TMPL_LOOP -->
 		</ul>
-		Qui sera retiré à
+		Qui doit être récupéré à
 		<ul>
 			<li>
 				<!-- TMPL_VAR NAME="branchname" -->
 			</li>
 		</ul>
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME='branch' -->">
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
 		<!-- TMPL_IF NAME="fee" -->
-			<p>Il y aura des frais de réservation de <b>$<!-- TMPL_VAR NAME="fee" --></b></p>
+			<p><b><!-- TMPL_VAR NAME="fee" --></b> pour la réservation'>Notez qu'il y aura un coût de <b></b> pour la réservation</p>
 		<!-- /TMPL_IF -->
-		<INPUT class="button" type="submit" value="Réserver">
-	</FORM>
+		<input class="button" type="submit" value="Faire une Réservation">
+	</form>
 <!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
index 8a9425b9b9..b751fcbfbd 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
@@ -1,35 +1,151 @@
-<!-- TMPL_INCLUDE name="opac-top.inc" -->
-
+    <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <div id="mainbloc">
-	<h1>Recherche avancée</h1>
-	<form action="/cgi-bin/koha/opac-searchresults.pl" method="get">
-	<ul>
-		<li><label>mot-clef</label><input type="text"  size="25"   name="keyword" /></li>
-	</ul>
-	<p><b>OU :</b></p>
-	<ul>
-		<li><label>sujet</label><input type="text"  size="25"   name="sujet" /></li>
-	</ul>
-	<p><b>OU un ou plus de : :</b></p>
-	<ul>
-		<li><label>Titre</label><input type="text"  size="25"   name="title" /></li>
-		<li><label>Auteur</label><input type="text"  size="25"   name="author" /></li>
-		<li><label>Illustrateur</label><input type="text"  size="25"   name="illustrator" /></li>
-		<li><label>Type d'exemplaire</label>
-			<select size="1"  name="class">
-				<option value="">Tout</option>
-				<!-- TMPL_VAR name="classlist" -->
+
+<h1 class="catalogue">Recherche dans le Catalogue</h1>
+
+<form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
+	
+	<div id="bloc20">
+		<h2 class="catalogue">Chercher sur</h2>
+		<p>
+			<input type="hidden" name="op" value="do_search" />
+			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+			<label class="label20">Mot Clé</label>
+			<input type="hidden" name="marclist" value="" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">Titre</label>
+			<input type="hidden" name="marclist" value="biblio.title" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">Auteur</label> <input type="hidden" name="marclist" value="biblio.author" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">Sujet</label>
+			<input type="hidden" name="marclist" value="bibliosubject.subject" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />  
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">Type de documents</label>
+			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="=" />
+			<!-- TMPL_VAR name="CGIitemtype" -->
+		</p>
+		<p>
+				<label class="label20">Site</label>
+				<input type="hidden" name="marclist" value="items.holdingbranch" />
+				<input type="hidden" name="and_or" value="and" />
+				<input type="hidden" name="excluding" value="" />
+				<input type="hidden" name="operator" value="=" />  
+				<!-- TMPL_VAR name="CGIbranch" -->
+		</p>
+		<p>
+			<input type="submit" value="Commencer la recherche" class="button catalogue">
+		</p>
+	</div>
+	<div id="bloc20">
+		<h2>Autres options</h2>
+		<p>
+				<label class="label20">Item barcode</label>
+				<input type="hidden" name="marclist" value="items.barcode" />
+				<input type="hidden" name="and_or" value="and" />
+				<input type="hidden" name="excluding" value="" />
+				<input type="hidden" name="operator" value="contains" />
+				<input type="text" name="value" onchange="sql_update()" /> 
+		</p>
+		<p>
+			<label class="label20">Call Number</label>
+			<input type="hidden" name="marclist" value="items.itemcallnumber" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">ISBN</label>
+			<input type="hidden" name="marclist" value="biblioitems.isbn" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="=" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">Editeur</label>
+			<input type="hidden" name="marclist" value="biblioitems.publishercode" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>Réponses par page
+			<select name="resultsperpage" size="1">
+				<option value="20">20</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+			</select>
+		</p>
+		<p>Commandé par
+			<select name="orderby" size="1">
+				<option value="biblio.title">Titre</option>
+				<option value="biblio.author">Auteur</option>
+				<option value="biblioitems.dewey">code Dewey</option>
+				<option value="biblioitems.publicationyear">Année de Publication</option>
+				<option value="biblioitems.publishercode">Editeur</option>
 			</select>
-		</li>
-		<li><label>Code barre</label><input type="text"  size="25"   name="itemnumber" /></li>
-	</ul>
-		<p>qui utilise <input type="radio" name="ttype" value="normal" />Normal ou <input type="radio" name="ttype" value="exact" />Recherche exacte</p>
+		</p>
+		<p>&nbsp;</p>
+		<p>&nbsp;</p>
+	</div>
+</form>
+
+<script type="text/javascript">
+function sql_update() {
+document.f.sql.value="";
+	for (i=0 ; i<document.f.marclist.length ; i++) {
+		if (document.f.value[i].value.length>0) {
+			document.f.sql.value = document.f.sql.value+
+										document.f.and_or[i].value + ' (' +
+										document.f.excluding[i].value + ' ' +
+										document.f.marclist[i].value + ' ' +
+										document.f.operator[i].value + ' ' +
+										'\''+document.f.value[i].value + '\') ';
+		}
+	}
+}
+
+function AddStatement() {
+
+	document.forms[0].op.value="AddStatement";
+	document.f.submit();
+}
+
+function PopupSuggestion() {
+    var strQuery="";
+	for (i=0 ; i<document.f.marclist.length ; i++) {
+		if (document.f.value[i].value.length>0) {
+		    strQuery += " "+document.f.value[i].value;
+		}
+	}
+	newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
+}
 
-	<p>
-		<input type="submit" value="Lancer recherche" class="button" />
-		<input type="reset"  value="Effacer" class="button" />
-	</p>
-	<p>Notez que le mot clef est prioritaire</p>
-	</form>
+</script>
 </div>
-<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
index e47911eda4..0f289fe010 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
@@ -1,150 +1,128 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <div id="mainbloc">
 <!-- TMPL_IF NAME="searchdesc" -->
-    <p class="center">Recherche effectuée sur <b><!-- TMPL_VAR NAME="searchdesc" --></b></p>
+    <p class="center">Recherche sur <b><!-- TMPL_VAR NAME="searchdesc" --></b>. <!-- TMPL_VAR NAME="total" --> réponses trouvées</p>
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF name="searchnew" -->
-		<p><!-- TMPL_VAR name=itemtype --> acquis dans les derniers <i><!-- TMPL_VAR name="duration" --></i> jours</p>
+		<p class="center"><!-- TMPL_VAR name=itemtype --> acquis dans les <i><!-- TMPL_VAR name="duration" --></i> derniers jours. <!-- TMPL_VAR NAME="total" --> réponses</p>
 	<!-- TMPL_ELSE -->
-		<p>Vous n'avez pas spécifié de critère</p>
+		<p class="center">Vous n'avez précisé aucun critère de recherche</p>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
-<p class="center"><!-- TMPL_VAR NAME="numrecords" --> Réponses trouvées</p>
-<p class="center">
-    <!-- Row de numbers corresponding to search result pages -->
-    <!-- TMPL_IF NAME="displayprev" -->
-	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME='prevstartfrom' --><!-- TMPL_LOOP NAME='FORMINPUTS' -->&amp;<!-- TMPL_VAR NAME='field' -->=<!-- TMPL_VAR NAME='value' ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
-    <!-- TMPL_ELSE -->
-	&nbsp;
-    <!-- /TMPL_IF -->
-    <!-- TMPL_LOOP NAME="numbers" -->
-	<!-- TMPL_IF NAME="highlight" -->
-		<span class="smallnumberactive"><!--TMPL_VAR name="number" --></span>&nbsp;
-	<!-- TMPL_ELSE -->
-		<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->" class="smallnumber">
-			<!--TMPL_VAR name="number" -->
-		</a>&nbsp;
-	<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    <!-- TMPL_IF NAME="displaynext" -->
-	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
-    <!-- TMPL_ELSE -->
-	&nbsp;
-    <!-- /TMPL_IF -->
-</p>
-<p>&nbsp;</p>
-<!-- Search Résultats Table -->
-<!-- TMPL_IF NAME="numrecords" -->
-	<!-- If we have a sujet table -->
-		<!-- TMPL_IF NAME="subjectsearch" -->
-		<table border="0" cellspacing="0" cellpadding="2">
-			<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
-				<th>Sujet</th>
-			</tr>
-			<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
-				<tr>
-					<td><a href="/cgi-bin/koha/opac-searchresults.pl?&subjectitems=<!-- TMPL_VAR NAME=sujet ESCAPE=URL -->"><!-- TMPL_VAR NAME=sujet --></a></td>
-				</tr>
+<!-- <p class="center"><!-- TMPL_VAR NAME="total" --> results found</p> -->
+	<div id="resultnumber">
+		<p class="center">
+			<!-- TMPL_IF NAME=displayprev -->
+				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><<Prédécent</a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
+					<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
-			<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
-				<td colspan="4">
-					&nbsp;
+			<!-- TMPL_IF NAME=displaynext -->
+				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Suivant >></a>
+				<!-- /TMPL_IF -->
+		</p>
+		<p class="center">
+			<!-- TMPL_IF name=total -->
+			&nbsp;<b>Réponses <!-- TMPL_VAR name="from" --> à <!-- TMPL_VAR name="to" --> sur <!-- TMPL_VAR name="total" --></b>
+			<!-- TMPL_ELSE -->
+			Pas de résultats
+			<!-- /TMPL_IF -->
+		</p>
+	</div>
+<!-- Search Results Table -->
+<!-- TMPL_IF NAME="total" -->
+<form action="opac-searchresults.pl" method="get" name="myform">
+<input type="submit" class="button" value="Ajouter les éléments cochés au panier" onclick="addMultiple(); return false;"> <input type="reset" value="Effacer Tout" class="button">
+	<table>
+		<tr>
+			<th colspan="2">Sommaire</th>
+			<th>Nombre de documents</th>
+			<th>Localisation</th>
+			<th>&nbsp;</th>
+		</tr>
+		<!-- Actual Search Results -->
+		<!-- TMPL_LOOP NAME="results" -->
+			<tr>
+			<td<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->"></td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<p>
+						<p><b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
+						<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+					</p>
+				</td>
+				<td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR name="totitem" -->
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_LOOP name="CN" -->
+						<!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF -->
+					<!-- /TMPL_LOOP -->
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_UNLESS NAME="norequests" -->
+						<a class="transparent" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Requète</a>
+					<!-- TMPL_ELSE -->
+						Non Réservable
+					<!-- /TMPL_UNLESS -->
 				</td>
 			</tr>
-		</table>
+		<!-- /TMPL_LOOP -->
+		<tr>
+			<th align="left">
+				<!-- TMPL_IF NAME="displayprev" -->
+					<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><<<Précédent</a>
+				<!-- TMPL_ELSE -->
+					&nbsp;
+				<!-- /TMPL_IF -->
+			</th>
+			<th colspan="1">&nbsp;</th>
+			<th colspan="2" align="right">
+				<!-- TMPL_IF NAME="displaynext" -->
+					<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Suivant >>></a>
+				<!-- TMPL_ELSE -->
+					&nbsp;
+				<!-- /TMPL_IF -->
+			</th>
+		</tr>
+	</table>
+</form>
+	<p class="center">
+		Réponses <i><!-- TMPL_VAR NAME="from" --></i> à <i><!-- TMPL_VAR NAME="to" --></i> sur <i><!-- TMPL_VAR NAME="total" --></i> réponses.
+	</p>
 
-<!-- Else we have a list de items -->
-<!-- TMPL_ELSE -->
-	<table cellspacing="0">
-	<tr>
-		<th>Titre</th>
-		<th>Auteur</th>
-		<th>&copy;</th>
-		<th>Nombre d'ouvrages</th>
-		<th>Localisation</th>
-		<th>&nbsp;</th>
-	</tr>
-<!-- Actual Search Résultats -->
-<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-	<tr>
-		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
-			<a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->"><!-- TMPL_VAR NAME="title" --></a>
-		</td>
-		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
-			<a class="transparent" href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->"><!-- TMPL_VAR NAME="author" --></a>
-		</td>
-		<td align="center"<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
-			<!-- TMPL_VAR NAME="copyrightdate" -->
-		</td>
-		<td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
-			<!-- TMPL_VAR NAME="itemcount" -->
-		</td>
-		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
-			<!-- TMPL_VAR NAME="location" -->
-		</td>
-		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
-			<!-- TMPL_UNLESS NAME="norequests" -->
-				<a class="transparent" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Reserver</a>
-			<!-- TMPL_ELSE -->
-				Non réservable
-			<!-- /TMPL_UNLESS -->
-		</td>
-	</tr>
-<!-- /TMPL_LOOP -->
-	<tr>
-		<th align="left">
+	<div id="resultnumber">
+<p class="center"><!-- TMPL_VAR NAME="total" --> réponses trouvées</p>
+	<div id="resultnumber">
+		<p class="center">
 			<!-- TMPL_IF NAME="displayprev" -->
-				<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME=FORMINPUTS -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;&lt; Previous</a>
-			<!-- TMPL_ELSE -->
-				&nbsp;
+				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><<Prédécent</a>
 			<!-- /TMPL_IF -->
-		</th>
-		<th colspan="3">&nbsp;</th>
-		<th colspan="2" align="right">
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
+					<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
 			<!-- TMPL_IF NAME="displaynext" -->
-				<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME=FORMINPUTS -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">Next &gt;&gt;&gt;</a>
-			<!-- TMPL_ELSE -->
-				&nbsp;
-			<!-- /TMPL_IF -->
-		</th>
-	</tr>
-</table>
-<!-- /TMPL_IF -->
-
-<p class="center">
-	Résultats <i><!-- TMPL_VAR NAME="startfrom" --></i> à <i><!-- TMPL_VAR NAME="endat" --></i> de <i><!-- TMPL_VAR NAME="numrecords" --></i> réponses
-</p>
-
-<p class="center">
-    <!-- Row de numbers corresponding to search result pages -->
-    <!-- TMPL_IF NAME="displayprev" -->
-	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME='prevstartfrom' --><!-- TMPL_LOOP NAME='FORMINPUTS' -->&amp;<!-- TMPL_VAR NAME='field' -->=<!-- TMPL_VAR NAME='value' ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
-    <!-- TMPL_ELSE -->
-	&nbsp;
-    <!-- /TMPL_IF -->
-    <!-- TMPL_LOOP NAME="numbers" -->
-	<!-- TMPL_IF NAME="highlight" -->
-		<span class="smallnumberactive"><!--TMPL_VAR name="number" --></span>&nbsp;
-	<!-- TMPL_ELSE -->
-		<a class="smallnumber" href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">
-			<!--TMPL_VAR name="number" -->
-		</a>&nbsp;
-	<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    <!-- TMPL_IF NAME="displaynext" -->
-	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
-    <!-- TMPL_ELSE -->
-	&nbsp;
-    <!-- /TMPL_IF -->
-</p>
+				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Suivant >></a>
+				<!-- /TMPL_IF -->
+		</p>
+	</div>
 
 <!-- TMPL_ELSE -->
-<p class="center">	Désolé, aucun résultat ! </p>
+	<p class="center">	Désolé, il n'y a aucun résultat </p>
 <!-- /TMPL_IF -->
 
 <p class="center">
-	Essayez une autre <a href="/cgi-bin/koha/opac-search.pl">chercher</a>
+	Essayer une <a href="/cgi-bin/koha/opac-search.pl">autre recherche</a>
 </p>
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl
index 250e572fae..31797879c9 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl
@@ -1,34 +1,34 @@
 §SUBJECT§
-Votre panier de notices
+Your biblio basket
 §END_SUBJECT§
 
 §HEADER§
-	Bonjour,
-Voici les notices que vous avez mémorisées...
+Hi,
+Here is your biblio basket...
 §END_HEADER§
 
 §FILENAME§
-panier.txt
+basket.txt
 §END_FILENAME§
 
 §MESSAGE§
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
-<!-- TMPL_IF name="isbn" -->ISBN :		<!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="subtitle" -->Sous-titre :		<!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="author" -->Auteur	 :	<!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="additional" -->Autres auteurs :		<!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="publishercode" -->Publié par :		<!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> en <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
-<!-- TMPL_IF name="collection" -->Collection :		<!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="subject" -->Sujet :		<!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="copyrightdate" -->Année :		<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="notes" -->Notes :		<!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="unititle" -->Titre unifié :		<!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="serial" -->Périodique :		<!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="dewey" -->Dewey :		<!-- TMPL_VAR name="dewey" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="classification" -->Classification :		<!-- TMPL_VAR name="classification" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="lccn" -->LCCN :		<!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="url" -->URL :		<!-- TMPL_VAR NAME="url" --><!-- /TMPL_IF -->
+---------------------------------------------
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" -->(enregistrement <!-- TMPL_VAR NAME="biblionumber" -->)<!-- TMPL_IF name="isbn" -->
+ISBN : <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF --><!-- TMPL_IF name="subtitle" -->
+Sous-titre: <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="author" -->
+Auteur: <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="additional" -->
+Auteurs supplémentaires: <!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
+Publié par : <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> dans <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
+Collection : <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="subject" -->
+Sujet : <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><!-- TMPL_IF name="copyrightdate" -->
+Date copyright : <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="notes" -->
+Remarques : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><!-- TMPL_IF name="unititle" -->
+Titre uniforme : <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --><!-- TMPL_IF name="serial" -->
+Bulletin : <!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><!-- TMPL_IF name="dewey" -->
+Dewey: <!-- TMPL_VAR name="dewey" --><!-- /TMPL_IF --><!-- TMPL_IF name="classification" -->
+Cote : <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><!-- TMPL_IF name="lccn" -->
+LCCN : <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><!-- TMPL_IF name="url" -->
+URL : <!-- TMPL_VAR NAME="url" --><!-- /TMPL_IF -->
 ---------------------------------------------
 <!-- /TMPL_LOOP -->
 §END_MESSAGE§
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl
index 773e655b65..fb27c1e979 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl
@@ -1,21 +1,21 @@
 <!-- TMPL_INCLUDE NAME="opac-basket-top.inc" -->
 
 <div id="mainbloc" style="padding-bottom:20px;margin-top:10px;margin-bottom:10px;">
-<h1>Envoi du panier</h1>
+<h1>Envoyer le panier</h1>
 <!-- TMPL_IF NAME="email_add" -->
 	<!-- TMPL_IF NAME="SENT" -->
-	<p>Le panier a été envoyé à l'adresse : <!-- TMPL_VAR NAME="email_add" --></p>
+	<p>Le panier a été envoyé à : <!-- TMPL_VAR NAME="email_add" --></p>
 	<!-- TMPL_ELSE -->
-	<p>Problème lors de l'envoi du panier...</p>
+	<p>Problème lors de l'envoi du panier</p>
 	<!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
 	<TABLE style="border:0;">
-		<TR><TD style="border:0;"><b>Adresse électronique</b></TD>
+		<TR><TD style="border:0;"><b>adresse e-mail</b></TD>
 		<TD style="border:0;"><input name="email_add" size="25" /></TD></TR>
 		<TR><TD colspan="2" style="border:0;">&nbsp;</TD>
 		<TR><TD style="border:0;"></TD>
-		<TD style="border:0;text-align:right;"><input type="submit" value="Envoyer" class="button" /></TD></TR>
+		<TD style="border:0;text-align:right;"><input type="submit" value="Envoyer" class="button"></TD></TR>
 	</TABLE>
 	<input type='hidden' name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
 </form>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl
new file mode 100644
index 0000000000..315ee7a5b3
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl
@@ -0,0 +1,84 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!--------------------------MAIN BODY OF PAGE-------------------------->
+<div id="mainbloc">
+<h1 class="catalogue">Bulletins</h1>
+<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Retour à la bibliothèque</a>
+<form method="post" name="f">
+<div id="bloc25">
+	<h2 class="catalogue">Information de souscription pour <!-- TMPL_VAR name="bibliotitle" --></h2>
+		<p>Débutant le <b><!-- TMPL_VAR name="startdate" --></b> et un numéro chaque<b>
+		<!--TMPL_IF name="periodicity1" -->
+				jour
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity2" -->
+				semaine
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity3" -->
+				2 semaines
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity4" -->
+				3 semaines
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity5" -->
+				mois
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity6" -->
+				2 months
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity7" -->
+				3 months
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity8" -->
+				trimestre
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity9" -->
+				2 trimestres
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity10" -->
+				année
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity11" -->
+				2 ans
+		<!-- /TMPL_IF -->
+		</b>
+		Le
+		<b>
+		<!--TMPL_IF name="arrival1" -->
+			Lundi
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival2" -->
+				Mardi
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival3" -->
+				Mercredi
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival4" -->
+				Jeudi
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival5" -->
+				Vendredi
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival6" -->
+				Samedi
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival7" -->
+				Dimanche
+		<!-- /TMPL_IF -->
+		</b>
+		pour <b>
+			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> prêts<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> mois<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> mois<!-- /TMPL_IF -->
+			</b>
+		depuis <b><!-- TMPl_VAR name="startdate" --></b>
+		</p>
+		<p><!-- TMPL_VAR name="notes" --></p>
+	<h2 class="catalogue">Bulletins</h2>
+	<p>
+		<!-- TMPL_VAR name="opacnote" -->
+	</p>
+</div>
+
+</div>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl
new file mode 100644
index 0000000000..cff6777cef
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl
@@ -0,0 +1,160 @@
+<!-- TMPL_INCLUDE Name="opac-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF Name="viewshelf" -->
+<form>
+    <table>
+    		<tr>
+			<th colspan=4>
+				Contenu de <!-- TMPL_VAR Name="shelfname" -->
+			</th>
+		</tr>
+		<!-- TMPL_LOOP Name="itemsloop" -->
+			<tr>
+				<!-- TMPL_IF name="color" -->
+					<td class="hilighted"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
+					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
+					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
+					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
+				<!-- TMPL_ELSE -->
+					<td><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
+					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
+					<td><!-- TMPL_VAR Name="title" --></td>
+					<td><!-- TMPL_VAR Name="author" --></td>
+				<!-- /TMPL_IF -->
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<br>
+	<a href="opac-shelves.pl" class="button">Liste de l'étagère virtuelle</a>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<!-- TMPL_IF name="manageshelf" -->
+		<input type=submit value="Supprimer les documents sélectionnés" class="button">
+	<!-- /TMPL_IF -->
+</form>
+<!-- TMPL_IF name="manageshelf" -->
+<form>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<table>
+		<tr>
+			<td>
+				Ajouter un livre par saisie du code barre dans <!-- TMPL_VAR name="shelfname" -->
+			</td>
+			<td>
+				<input name="addbarcode">
+				<input type=hidden name=modifyshelfcontents value=1>
+				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+				<input type="submit" value="Enregistrer" class="button">
+			</td>
+		</tr>
+	</table>
+</form>
+<!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_IF Name="shelves" -->
+		<!-- TMPL_IF Name="status1" -->
+			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP Name="paramsloop" -->
+			<!-- TMPL_IF Name="status" -->
+				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
+			<!-- /TMPL_IF -->
+		<!-- /TMPL_LOOP -->
+		<center>
+		<h1>Rayons</h1>
+		<table border=0 cellpadding=7>
+			<tr>
+				<td align=center valign="bottom">
+					<form>
+						<p>
+							<a href="opac-shelves.pl" class="button">Liste de l'étagère virtuelle</a>
+						</p>
+					</form>
+				</td>
+				<td align=center valign="bottom">
+					<form method=post>
+					<input type="hidden" name="shelves" value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th>Sélectionner les étagères virtuelles à supprimer
+							</th>
+						</tr>
+						<!-- TMPL_LOOP Name="shelvesloop" -->
+						<!-- TMPL_IF name="canmanage" -->
+						<tr>
+							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
+								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
+								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> livres)
+							</td>
+						</tr>
+						<!-- /TMPL_IF -->
+						<!-- /TMPL_LOOP -->
+					</table>
+					<p>
+						<input type=submit value="Supprimer étagères" class="button"></form>
+					</p>
+				</td>
+				<td align=center valign=bottom>
+					<form method=post>
+					<input type=hidden name=shelves value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th>
+								<font color=white>Créer une étagère</font>
+							</th>
+						</tr>
+						<tr>
+							<td>
+								<p>Nom : <input type="text" name="addshelf" size="25"></p>
+								<p>Propriétaire <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
+								<p>Catégorie <select name="category">
+									<option value="1">Privé</option>
+									<option value="2">Public</option>
+									<option value="3">Libre</option>
+									</select>
+								</p>
+								<p> <li>Une Ãéagère virtuelle privée est gérée par vous seul, et ne peut être vue que de vous.</li>
+									<li> public peut être vu par tous, mais géré uniquement par vous</li>
+									<li> libre peut être géré par n'importe quel utilisateur</li>
+								</p>
+							</td>
+						</tr>
+					</table>
+								<p><input type=submit value="Créer une étagère" class="button"></p>
+					</form>
+				</td>
+			</tr>
+		</table>
+
+	<!-- TMPL_ELSE -->
+		<center>
+		<table border=0 cellpadding=4 cellspacing=0>
+			<tr>
+				<th>
+				Liste de l'étagère virtuelle
+				</th>
+			</tr>
+			<!-- TMPL_LOOP Name="shelvesloop" -->
+			<tr>
+				<!-- TMPL_IF name="color" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
+					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
+						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> livres)
+					</a>
+				</td>
+			</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<P>
+			<a href="opac-shelves.pl?shelves=1" class="button">Créer ou Supprimer une (des) étagère(s)</a>
+		</p>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE Name="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl
new file mode 100644
index 0000000000..51c56cc98e
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl
@@ -0,0 +1,150 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF name="op_add" -->
+	<h1>Saisir une nouvelle suggestion</h1>
+	<p>Fill this form to suggest the library a new acquisition. You will be mailed when the library treats you suggestion</p>
+	<p>No fields are mandatory. Fill whatever you know. The "Note" field can be used for whatever you want</p>
+	<form>
+		<input type="hidden" name="op" value="add_confirm">
+		<p><label>Titre</label><input type="text" name="title" size=60 maxlentgh=80></p>
+		<p><label>Auteur</label><input type="text" name="author" size=60 maxlength=80></p>
+		<p><label>Date copyright</label><input type="text" name="copyrightdate" size="5" maxlength="4"></p>
+		<p><label>Editeur</label><input type="text" name="publishercode" size="60" maxlength="80"></p>
+		<p><label>Volume</label><input type="text" name="volumedesc" size="60" maxlength="80"></p>
+		<p><label>année de Publication</label><input type="text" name="publicationyear" size="5" maxlength="4"></p>
+		<p><label>Lieu de Publication</label><input type="text" name="place" size="60" maxlength="80"></p>
+		<p><label>ISBN/ISSN</label><input type="text" name="isbn" size="14" maxlength="10"></p>
+		<p><label>Remarque</label><textarea name="note" rows="10" cols="60"></textarea></p>
+		<p><label>&nbsp;</label><input type="submit" value="Envoyer la suggestion à l'équipe de la bibliothèque" class="button"></p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="op_else" -->
+	<h1>Suggestions</h1>
+	<table>
+		<tr>
+			<th>&nbsp;</th>
+			<th>Titre</th>
+			<th>Auteur</th>
+			<th>©</th>
+			<th>Editeur</th>
+			<th>Etat</th>
+			<th>Suggéré par</th>
+			<th>Géré par</th>
+			<th>Remarque</th>
+		</tr>
+		<tr>
+			<form>
+				<th>
+					Filter sur
+				</th>
+				<th>
+					<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">
+				</th>
+				<th>
+					<input type="text" name="author" value="<!-- TMPL_VAR name="author" -->">
+				</th>
+				<th>
+					&nbsp;
+				</th>
+				<th>
+					<input type="text" name="publishercode" value="<!-- TMPL_VAR name="publishercode"-->">
+				</th>
+				<th>
+					<select name="status">
+						<option value="">Tout</option>
+						<!-- TMPL_IF name="ASKED" -->
+							<option value="ASKED" selected>Demandé</option>
+						<!-- TMPL_ELSE -->
+							<option value="ASKED">Demandé</option>
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF name="ORDERED" -->
+							<option value="ORDERED" selected>Commandé</option>
+						<!-- TMPL_ELSE -->
+							<option value="ORDERED">Commandé</option>
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF name="REJECTED" -->
+							<option value="REJECTED" selected>Rejeté</option>
+						<!-- TMPL_ELSE -->
+							<option value="REJECTED">Rejeté</option>
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF name="AVAILABLE" -->
+							<option value="AVAILABLE" selected>Disponible</option>
+						<!-- TMPL_ELSE -->
+							<option value="AVAILABLE">Disponible</option>
+						<!-- /TMPL_IF -->
+					</select>
+				</th>
+				<th>
+					<select name="suggestedbyme">
+						<option value="1" <!-- TMPL_IF name="suggestedbyme" -->selected<!-- /TMPL_IF -->>Me</option>
+						<option value="0" <!-- TMPL_UNLESS name="suggestedbyme" -->selected<!-- /TMPL_UNLESS -->>Quelqu'un</option>
+					</select>
+				</th>
+				<th>
+					&nbsp;
+				</th>
+				<th>
+					<input type="submit" class="button" value="Etablir un filtre">
+				</th>
+			</form>
+		</tr>
+		<form>
+			<input type="hidden" name="op" value="delete_confirm">
+		<!-- TMPL_LOOP NAME="suggestions_loop" -->
+			<tr>
+				<td>
+					<input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionnumber" -->">
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="title" -->
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="author" -->
+				</td>
+				<td align="center"<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="copyrightdate" -->
+				</td>
+				<td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR name="publishercode" -->
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_IF name="ASKED" -->Demandé<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="ORDERED" -->Commandé par la bibliothèque<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="REJECTED" -->Suggestion rejetée : ne sera pas acheté<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="AVAILABLE" -->Disponible dans la bibliothèque<!-- /TMPL_IF -->
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR name="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
+				</td>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR name="note" -->
+				</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		<tr>
+			<td>
+				<input type="submit" class="button" value="Supprimer">
+			</td>
+			<td> &nbsp; </td>
+			<td> &nbsp; </td>
+			<td> &nbsp; </td>
+			<td> &nbsp; </td>
+			<td> &nbsp; </td>
+			<td> &nbsp; </td>
+			<td> &nbsp; </td>
+			<td> &nbsp; </td>
+		</tr>
+		</form>
+	</table>
+	<form>
+		<input type="hidden" name="op" value="add">
+		<input type="submit" class="button" value="Saisir une nouvelle suggestion">
+	<br />
+	<p>Note : if you ask suggestion done by anybody, the result will contain only new suggestions. Suggestions treated by a librarian will not be shown.</p>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
index ba972de3ae..8d91bd5dc9 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
@@ -1,97 +1,96 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac-user.css">
 <div id="mainbloc">
 <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-	<div id="bloc20">
-		<h2>Nos informations sont-elles correctes \?</h2>
-		<p>Carte lecteur: <!-- TMPL_VAR NAME="cardnumber" --> </p>
+	<div class="bloc20">
+		<h2>Are our records correct?</h2>
+		<p>Carte de lecteur </p>
 		<p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="title" -->) </p>
-		<p><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></p
-		<p><!-- TMPL_VAR NAME="phone" --> (hm)</p>
-		<p><!-- TMPL_VAR NAME="faxnumber" --> (wk)</p>
+		<p><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></p>
+		<p><!-- TMPL_VAR NAME="phone" --> (maison)</p>
+		<p><!-- TMPL_VAR NAME="faxnumber" --> (travail)</p>
 		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
-		<p>Quelque chose de changé : <a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Mettre à jour</a></p>
+		<p>Something new: <a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Update Record</a></p>
 	</div>
 	<!-- TMPL_IF NAME="amountoverfive" -->
-	<div id="bloc20">
+	<div class="bloc20">
 		<h2>Vous avez des dettes de <!-- TMPL_VAR NAME="amountoutstanding" --></b>
-		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir compte</a>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir le compte</a>
 	</div>
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="amountoverzero" -->
-	<div id="bloc20">
+	<div class="bloc20">
 		<h2>Vous avez des dettes de <!-- TMPL_VAR NAME="amountoutstanding" --></h2>
-		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir compte</a>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir le compte</a>
 	</div>
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME"amountlessthanzero" -->
-	<div id="bloc20">
+	<div class="bloc20">
 		<p>Vous avez un crédit de <!-- TMPL_VAR NAME="amountoutstanding" --></p>
-		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir compte</a>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir le compte</a>
 	</div>
 	<!-- /TMPL_IF -->
 
 <!-- /TMPL_LOOP -->
 
 <!-- TMPL_IF NAME="waiting_count" -->
-<div id="bloc60">
-	<h2>Vous avez des réservations en attente:</h2>
+<div class="bloc60">
+	<h2>Des document réservés vous attendent :</h2>
 	<ul>
 		<!-- TMPL_LOOP NAME="WAITING" -->
-			<li><!-- TMPL_VAR NAME="btitle" -->, pick up at: <b><!-- TMPL_VAR NAME="branch" --></b></li>
+			<li><!-- TMPL_VAR NAME="btitle" -->, récupéré à  <b><!-- TMPL_VAR NAME="branch" --></b></li>
 		<!-- /TMPL_LOOP -->
 	</ul>
 </div>
 <!-- /TMPL_IF -->
 
-<div id="bloc60">
+<div class="bloc60">
 	<!-- TMPL_IF NAME="issues_count" -->
-		Vous avez <b><!-- TMPL_VAR NAME="issues_count" --></b> ouvrages en cours de prêt<br>
-		<table cellspacing=0 >
+		Vous avez <b><!-- TMPL_VAR NAME="issues_count" --></b> document en cours de prêt<br />
+		<table cellspacing="0">
 			<tr>
 				<th>Titre</th>
 				<th>Auteur</th>
-				<th>Date retour</th>
-				<th>Type d'ouvrage</th>
-				<th>Charges</th>
-				<th>Prêt</th>
-			</TR>
+				<th>Date de retour</th>
+				<th>Type de document</th>
+				<th>Dettes</th>
+				<th>Prêts en cours</th>
+			</tr>
 			<!-- TMPL_LOOP NAME="ISSUES" -->
-				<TR>
-					<TD><!-- TMPL_VAR NAME="title" --></TD>
-					<TD><!-- TMPL_VAR NAME="author" --></TD>
-					<TD><!-- TMPL_VAR NAME="date_due" --></TD>
-					<TD><!-- TMPL_VAR NAME="itemtype" --></TD>
-					<TD><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
-					<TD><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
-				</TR>
+				<tr>
+					<td><!-- TMPL_VAR NAME="title" --></td>
+					<td><!-- TMPL_VAR NAME="author" --></td>
+					<td><!-- TMPL_VAR NAME="date_due" --></td>
+					<td><!-- TMPL_VAR NAME="itemtype" --></td>
+					<td><!-- TMPL_IF NAME="charges" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
+					<td><!-- TMPL_IF NAME="status" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
+				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
 	<!-- TMPL_ELSE -->
-		<h2>Vous n'avez pas d'ouvrage en prêt</h2>
+		<h2>Vous n'avez pas de document en prêt</h2>
 	<!-- /TMPL_IF -->
 </div>
 
 <!-- TMPL_IF NAME="reserves_count" -->
-<div id="bloc60">
-	<h2>Vous avez <b><!-- TMPL_VAR NAME="reserves_count" --></b> ouvrages réservés</h2>
-	<table cellspacing=0 align="center">
-		<Tr>
+<div class="bloc60">
+	<h2>Vous avez <b><!-- TMPL_VAR NAME="reserves_count" --></b> document actuellement réservés</h2>
+	<table cellspacing="0" align="center">
+		<tr>
 			<th>Titre</th>
 			<th>Auteur</th>
-			<th>Date réservation</th>
-		</TR>
+			<th>Date de réservation</th>
+		</tr>
 		<!-- TMPL_LOOP NAME="RESERVES" -->
-			<TR VALIGN=TOP>
-			<TD><!-- TMPL_VAR NAME="btitle" --></TD>
-			<TD><!-- TMPL_VAR NAME="author" --></TD>
-			<TD><!-- TMPL_VAR NAME="reservedate" --></TD>
-			</TR>
+			<tr valign="top">
+			<td><!-- TMPL_VAR NAME="btitle" --></td>
+			<td><!-- TMPL_VAR NAME="author" --></td>
+			<td><!-- TMPL_VAR NAME="reservedate" --></td>
+			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-	<br/>
+	<br />
 </div>
 <!-- /TMPL_IF -->
 </div>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
index 4bd9eda064..e3cae51304 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
@@ -1,21 +1,21 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
 <div id="mainbloc">
-<h2>Modification informations lecteur</h2>
-<p><i> Changer le nécessaire<br />
-Vos changement n'apparaitront que lorsque la bibliothèque les aura validé</i></p>
+<h2>Member information change</h2>
+<p><i>Please change what's needed. An email will be sent to the library.<br />
+Vos modifications n'apparaîtront pas avant la validation de la bibliothèque</i></p>
 
 <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
-	<p>Nom: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='surname' -->"  NAME="surname"></p>
-	<p>Titre: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='title' -->"  NAME="title"></p>
-	<p>Prénom: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='firstname' -->"  NAME="firstname"></p>
-	<p>Adresse postale: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='streetaddress' -->"  NAME="streetaddress"></p>
-	<p>Ville: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='city' -->"  NAME="city"></p>
-	<p>Téléphone maison: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='phone' -->"  NAME="phone"></p>
-	<p>Tel bureau: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='faxnumber' -->"  NAME="faxnumber"></p>
-	<p>Mail: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='emailaddress' -->"  NAME="emailaddress"></p>
-	<p><input type="submit" value="OK" class="button" /></p>
+	<p>Nom : <input type="text"  size="25" value="<!-- TMPL_VAR NAME='surname' -->"  NAME="surname" /></p>
+	<p>Titre: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='title' -->"  NAME="title" /></p>
+	<p>First name: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='firstname' -->"  NAME="firstname" /></p>
+	<p>Adresse postale</p>
+	<p>Ville: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='city' -->"  NAME="city" /></p>
+	<p>Téléphone domicile: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='phone' -->"  NAME="phone" /></p>
+	<p>N° de téléphone/fax bureau</p>
+	<p>E-mail: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='emailaddress' -->"  NAME="emailaddress" /></p>
+	<p><input type="submit" value="Soumettre" class="button"></p>
 </form>
 </div>
 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/subject.tmpl b/koha-tmpl/opac-tmpl/css/fr/subject.tmpl
index aeab408292..71f0ad0416 100644
--- a/koha-tmpl/opac-tmpl/css/fr/subject.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/subject.tmpl
@@ -3,38 +3,38 @@
 <center>
 
 <table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor=#99cccc background=<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif>
+<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
 <th>Sujet</th></tr>
 <!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
   <tr>
-  <td><a href=./dosearch.pl?&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=URL -->><!-- TMPL_VAR NAME=sujet --></a></td>
+  <td><a href="./dosearch.pl?&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=URL -->"><!-- TMPL_VAR NAME=subject --></a></td>
   </tr>
 <!-- /TMPL_LOOP -->
-<tr bgcolor=#99cccc background=<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif><td colspan=4>
+<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif"><td colspan=4>
 &nbsp;</td></tr>
 </table>
 <br>
-Résultats <!-- TMPL_VAR NAME="startfrom" --> à <!-- TMPL_VAR NAME="endat" --> de <!-- TMPL_VAR NAME="numrecords" --> réponses
+Résultats <!-- TMPL_VAR NAME="startfrom" --> à <!-- TMPL_VAR NAME="endat" --> sur <!-- TMPL_VAR NAME="numrecords" --> réponses
 <br>
     <!-- TMPL_IF NAME="displayprev" -->
-	<a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif border=0></a>
+		<a href="./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border=0>
+		</a>
     <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+		<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
     <!-- /TMPL_IF -->
     <!-- TMPL_LOOP NAME="numbers" -->
 	<!-- TMPL_IF NAME="highlight" -->
-	    <img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif> 
+	    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif"> 
 	<!-- TMPL_ELSE -->
-	    <a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0></a> 
+	    <a href="./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a> 
 	<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
     <!-- TMPL_IF NAME="displaynext" -->
-	<a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif border=0></a>
+	<a href="./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border=0></a>
     <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border=0>
     <!-- /TMPL_IF -->
-
-
 <hr>
 
 
-- 
2.39.5