Index: trunk/template/yoga/about.tpl
===================================================================
--- trunk/template/yoga/about.tpl	(revision 4893)
+++ trunk/template/yoga/about.tpl	(revision 5021)
@@ -4,5 +4,5 @@
       <li>
         <a href="{$U_HOME}" title="{'return to homepage'|@translate}">
-          <img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
+          <img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}">
         </a>
       </li>
Index: trunk/template/yoga/comment_list.tpl
===================================================================
--- trunk/template/yoga/comment_list.tpl	(revision 4893)
+++ trunk/template/yoga/comment_list.tpl	(revision 5021)
@@ -43,5 +43,5 @@
 	<fieldset>
 	  <legend>{'Edit a comment'|@translate}</legend>
-	  <label>{'comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
+	  <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$Comment.CONTENT|@escape}</textarea></label>
 	  <input type="hidden" name="key" value="{$comment.KEY}">
 	  <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
Index: trunk/template/yoga/comments.tpl
===================================================================
--- trunk/template/yoga/comments.tpl	(revision 4893)
+++ trunk/template/yoga/comments.tpl	(revision 5021)
@@ -3,5 +3,5 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'User comments'|@translate}</h2>
Index: trunk/template/yoga/footer.tpl
===================================================================
--- trunk/template/yoga/footer.tpl	(revision 4893)
+++ trunk/template/yoga/footer.tpl	(revision 5021)
@@ -2,5 +2,5 @@
  <a name="EoP"></a> <!-- End of Page -->
  {if isset($debug.TIME) }
- {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
+ {'SQL queries in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) -
  {/if}
 
@@ -10,10 +10,10 @@
   *}
 
-  {'powered_by'|@translate}
+  {'Powered by'|@translate}
   <a href="{$PHPWG_URL}" class="Piwigo">
   <span class="Piwigo">Piwigo</span></a>
   {$VERSION}
   {if isset($CONTACT_MAIL)}
-  - {'send_mail'|@translate}
+  - {'Contact'|@translate}
   <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
   {/if}
Index: trunk/template/yoga/header.tpl
===================================================================
--- trunk/template/yoga/header.tpl	(revision 4893)
+++ trunk/template/yoga/header.tpl	(revision 5021)
@@ -23,11 +23,11 @@
 <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
 
-<link rel="start" title="{'home'|@translate}" href="{$U_HOME}" >
+<link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >
 <link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" >
-{if isset($first.U_IMG)   }<link rel="first" title="{'first_page'|@translate}" href="{$first.U_IMG}" >{/if}
-{if isset($previous.U_IMG)}<link rel="prev" title="{'previous_page'|@translate}" href="{$previous.U_IMG}" >{/if}
-{if isset($next.U_IMG)    }<link rel="next" title="{'next_page'|@translate}" href="{$next.U_IMG}" >{/if}
-{if isset($last.U_IMG)    }<link rel="last" title="{'last_page'|@translate}" href="{$last.U_IMG}" >{/if}
-{if isset($U_UP)          }<link rel="up" title="{'thumbnails'|@translate}" href="{$U_UP}" >{/if}
+{if isset($first.U_IMG)   }<link rel="first" title="{'First'|@translate}" href="{$first.U_IMG}" >{/if}
+{if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|@translate}" href="{$previous.U_IMG}" >{/if}
+{if isset($next.U_IMG)    }<link rel="next" title="{'Next'|@translate}" href="{$next.U_IMG}" >{/if}
+{if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if}
+{if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
 
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/layout.css">
Index: trunk/template/yoga/identification.tpl
===================================================================
--- trunk/template/yoga/identification.tpl	(revision 4893)
+++ trunk/template/yoga/identification.tpl	(revision 5021)
@@ -5,7 +5,7 @@
       <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
       {if isset($U_REGISTER) }
-      <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
+      <li><a href="{$U_REGISTER}" title="{'Register'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
       {/if}
-      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Identification'|@translate}</h2>
@@ -46,5 +46,5 @@
       <li>
         <span class="property">
-          <label for="remember_me">{'remember_me'|@translate}</label>
+          <label for="Auto login">{'Auto login'|@translate}</label>
         </span>
         <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
@@ -58,5 +58,5 @@
   <p>
     {if isset($U_REGISTER) }
-    <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
+    <a href="{$U_REGISTER}" title="{'Register'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
     {/if}
     <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"> {'Forgot your password?'|@translate}</a>
Index: trunk/template/yoga/index.tpl
===================================================================
--- trunk/template/yoga/index.tpl	(revision 4893)
+++ trunk/template/yoga/index.tpl	(revision 5021)
@@ -16,13 +16,13 @@
 
       {if isset($favorite) }
-      <li><a href="{$favorite.U_FAVORITE}" title="{'del_all_favorites_hint'|@translate}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{'del_all_favorites_hint'|@translate}"></a></li>
+      <li><a href="{$favorite.U_FAVORITE}" title="{'delete all images from your favorites'|@translate}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{'delete all images from your favorites'|@translate}"></a></li>
       {/if}
 
       {if isset($U_CADDIE) }
-      <li><a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a></li>
+      <li><a href="{$U_CADDIE}" title="{'caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a></li>
       {/if}
 
       {if isset($U_EDIT) }
-      <li><a href="{$U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
+      <li><a href="{$U_EDIT}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
       {/if}
 
@@ -36,17 +36,17 @@
 
       {if isset($U_MODE_FLAT) }
-      <li><a href="{$U_MODE_FLAT}" title="{'mode_flat_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'mode_flat_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_FLAT}" title="{'display all elements in all sub-categories'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'display all elements in all sub-categories'|@translate}"></a></li>
       {/if}
 
       {if isset($U_MODE_NORMAL) }
-      <li><a href="{$U_MODE_NORMAL}" title="{'mode_normal_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'mode_normal_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_NORMAL}" title="{'return to normal view mode'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'return to normal view mode'|@translate}"></a></li>
       {/if}
 
       {if isset($U_MODE_POSTED) }
-      <li><a href="{$U_MODE_POSTED}" title="{'mode_posted_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'mode_posted_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'display a calendar by posted date'|@translate}"></a></li>
       {/if}
       
       {if isset($U_MODE_CREATED) }
-      <li><a href="{$U_MODE_CREATED}" title="{'mode_created_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'mode_created_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'display a calendar by creation date'|@translate}"></a></li>
       {/if}
       
@@ -57,5 +57,5 @@
 
   {if isset($chronology_views) }
-  <div class="calendarViews">{'calendar_view'|@translate}:
+  <div class="calendarViews">{'View'|@translate}:
     <select onchange="document.location = this.options[this.selectedIndex].value;">
       {foreach from=$chronology_views item=view}
Index: trunk/template/yoga/mainpage_categories.tpl
===================================================================
--- trunk/template/yoga/mainpage_categories.tpl	(revision 4893)
+++ trunk/template/yoga/mainpage_categories.tpl	(revision 5021)
@@ -6,5 +6,5 @@
 			<div class="illustration">
 			<a href="{$cat.URL}">
-				<img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'hint_category'|@translate}">
+				<img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'shows images at the root of this category'|@translate}">
 			</a>
 			</div>
Index: trunk/template/yoga/menubar_categories.tpl
===================================================================
--- trunk/template/yoga/menubar_categories.tpl	(revision 4893)
+++ trunk/template/yoga/menubar_categories.tpl	(revision 5021)
@@ -1,8 +1,8 @@
 <dt>
   {if isset($U_START_FILTER)}
-  <a href="{$U_START_FILTER}" title="{'start_filter_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
+  <a href="{$U_START_FILTER}" title="{'display only recently posted images'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
   {/if}
   {if isset($U_STOP_FILTER)}
-  <a href="{$U_STOP_FILTER}" title="{'stop_filter_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
+  <a href="{$U_STOP_FILTER}" title="{'return to the display of all images'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
   {/if}
 	<a href="{$block->data.U_CATEGORIES}">{'Categories'|@translate}</a>
@@ -32,5 +32,5 @@
 	<ul>
 		<li>
-			<a href="{$block->data.U_UPLOAD}">{'upload_picture'|@translate}</a>
+			<a href="{$block->data.U_UPLOAD}">{'Upload a picture'|@translate}</a>
 		</li>
 	</ul>
Index: trunk/template/yoga/menubar_identification.tpl
===================================================================
--- trunk/template/yoga/menubar_identification.tpl	(revision 4893)
+++ trunk/template/yoga/menubar_identification.tpl	(revision 5021)
@@ -1,27 +1,27 @@
-<dt>{'identification'|@translate}</dt>
+<dt>{'Identification'|@translate}</dt>
 <dd>
 	{if isset($USERNAME)}
-	<p>{'hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
+	<p>{'Hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
 	{/if}
 
 	<ul>
 	{if isset($U_REGISTER)}
-	<li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
+	<li><a href="{$U_REGISTER}" title="{'Register'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
 	{/if}
 
 	{if isset($U_LOGIN)}
-	<li><a href="{$U_LOGIN}" rel="nofollow">{'Connection'|@translate}</a></li>
+	<li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li>
 	{/if}
 
 	{if isset($U_LOGOUT)}
-	<li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
+	<li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>
 	{/if}
 
 	{if isset($U_PROFILE)}
-	<li><a href="{$U_PROFILE}" title="{'hint_customize'|@translate}">{'customize'|@translate}</a></li>
+	<li><a href="{$U_PROFILE}" title="{'Customize'|@translate}">{'Customize'|@translate}</a></li>
 	{/if}
 
 	{if isset($U_ADMIN)}
-	<li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
+	<li><a href="{$U_ADMIN}" title="{'Administration'|@translate}">{'Administration'|@translate}</a></li>
 	{/if}
 	</ul>
@@ -43,5 +43,5 @@
 	{if $AUTHORIZE_REMEMBERING}
 	<div><label for="remember_me">
-	{'remember_me'|@translate}
+	{'Auto login'|@translate}
 	<input type="checkbox" name="remember_me" id="remember_me" value="1">
 	</label></div>
@@ -53,5 +53,5 @@
 		<li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
 		{if isset($U_REGISTER)}
-		<li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
+		<li><a href="{$U_REGISTER}" title="{'Register'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
 		{/if}
 	</ul>
Index: trunk/template/yoga/menubar_menu.tpl
===================================================================
--- trunk/template/yoga/menubar_menu.tpl	(revision 4893)
+++ trunk/template/yoga/menubar_menu.tpl	(revision 5021)
@@ -1,3 +1,3 @@
-<dt>{'title_menu'|@translate}</dt>
+<dt>{'Menu'|@translate}</dt>
 <dd>
   {if isset($block->data.qsearch) and  $block->data.qsearch==true}
Index: trunk/template/yoga/menubar_specials.tpl
===================================================================
--- trunk/template/yoga/menubar_specials.tpl	(revision 4893)
+++ trunk/template/yoga/menubar_specials.tpl	(revision 5021)
@@ -1,3 +1,3 @@
-<dt>{'special_categories'|@translate}</dt>
+<dt>{'Specials'|@translate}</dt>
 <dd>
 	<ul>
Index: trunk/template/yoga/menubar_tags.tpl
===================================================================
--- trunk/template/yoga/menubar_tags.tpl	(revision 4893)
+++ trunk/template/yoga/menubar_tags.tpl	(revision 5021)
@@ -11,5 +11,5 @@
 			</a>
 			{/if}
-			<a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See elements linked to this tag only'|@translate}">{$tag.name}</a>{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}</span>
+			<a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See images linked to this tag only'|@translate}">{$tag.name}</a>{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}</span>
 		{/foreach}
 	</div>
Index: trunk/template/yoga/navigation_bar.tpl
===================================================================
--- trunk/template/yoga/navigation_bar.tpl	(revision 4893)
+++ trunk/template/yoga/navigation_bar.tpl	(revision 5021)
@@ -1,9 +1,9 @@
 <div class="navigationBar">
   {if isset($navbar.URL_FIRST)}
-  <a href="{$navbar.URL_FIRST}" rel="first">{'first_page'|@translate}</a> |
-  <a href="{$navbar.URL_PREV}" rel="prev">{'previous_page'|@translate}</a> |
+  <a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |
+  <a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |
   {else}
-  {'first_page'|@translate} |
-  {'previous_page'|@translate} |
+  {'First'|@translate} |
+  {'Previous'|@translate} |
   {/if}
 
@@ -20,9 +20,9 @@
 
   {if isset($navbar.URL_NEXT)}
-  | <a href="{$navbar.URL_NEXT}" rel="next">{'next_page'|@translate}</a>
-  | <a href="{$navbar.URL_LAST}" rel="last">{'last_page'|@translate}</a>
+  | <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a>
+  | <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a>
   {else}
-  | {'next_page'|@translate}
-  | {'last_page'|@translate}
+  | {'Next'|@translate}
+  | {'Last'|@translate}
   {/if}
 </div>
Index: trunk/template/yoga/nbm.tpl
===================================================================
--- trunk/template/yoga/nbm.tpl	(revision 4893)
+++ trunk/template/yoga/nbm.tpl	(revision 5021)
@@ -3,7 +3,7 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
-    <h2>{'nbm_item_notification'|@translate}</h2>
+    <h2>{'Notification'|@translate}</h2>
   </div>
 
Index: trunk/template/yoga/notification.tpl
===================================================================
--- trunk/template/yoga/notification.tpl	(revision 4893)
+++ trunk/template/yoga/notification.tpl	(revision 5021)
@@ -1,5 +1,5 @@
 {html_head}
 <link rel="alternate" type="application/rss+xml" title="{'Image only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}">
-<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed'|@translate}" href="{$U_FEED}">
+<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (images, comments)'|@translate}" href="{$U_FEED}">
 {/html_head}
 <div id="content" class="content">
@@ -7,5 +7,5 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Notification'|@translate}</h2>
@@ -19,5 +19,5 @@
     </dt>
     <dt>
-      <a href="{$U_FEED}">{'Complete RSS feed'|@translate}</a>
+      <a href="{$U_FEED}">{'Complete RSS feed (images, comments)'|@translate}</a>
     </dt>
   </dl>
Index: trunk/template/yoga/password.tpl
===================================================================
--- trunk/template/yoga/password.tpl	(revision 4893)
+++ trunk/template/yoga/password.tpl	(revision 5021)
@@ -3,5 +3,5 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Password forgotten'|@translate}</h2>
Index: trunk/template/yoga/picture.tpl
===================================================================
--- trunk/template/yoga/picture.tpl	(revision 4893)
+++ trunk/template/yoga/picture.tpl	(revision 5021)
@@ -29,5 +29,5 @@
 <div id="imageHeaderBar">
   <div class="browsePath">
-    <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
+    <a href="{$U_HOME}" rel="Home">{'Home'|@translate}</a>
     {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
     {$LEVEL_SEPARATOR}{$current.TITLE}
@@ -45,9 +45,9 @@
     {/if}
     {if isset($U_SLIDESHOW_STOP) }
-      <a href="{$U_SLIDESHOW_STOP}" title="{'slideshow_stop'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'slideshow_stop'|@translate}"></a>
-    {/if}
-      <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
+      <a href="{$U_SLIDESHOW_STOP}" title="{'stop the slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'stop the slideshow'|@translate}"></a>
+    {/if}
+      <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
     {if isset($current.U_DOWNLOAD) }
-      <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
+      <a href="{$current.U_DOWNLOAD}" title="{'download'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
     {/if}
     {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
@@ -56,8 +56,8 @@
     {/if}
     {if !empty($U_SET_AS_REPRESENTATIVE) }
-      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
+      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
     {/if}
     {if isset($U_ADMIN) }
-      <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
+      <a href="{$U_ADMIN}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     {/if}
     {if isset($U_CADDIE) }{*caddie management BEGIN*}
@@ -78,5 +78,5 @@
 }{/literal}
 </script>
-      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
+      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
     {/if}{*caddie management END*}
   </div>
@@ -93,5 +93,5 @@
 {if isset($U_SLIDESHOW_STOP) }
 <p>
-  [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
+  [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
 </p>
 {/if}
@@ -100,10 +100,10 @@
 
 {if isset($previous) }
-<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
+<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
   <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
 </a>
 {/if}
 {if isset($next) }
-<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
+<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next">
   <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
 </a>
@@ -169,5 +169,5 @@
 			{$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) }
 		{else}
-			{'no_rate'|@translate}
+			{'no rate'|@translate}
 		{/if}
 		</td>
@@ -178,5 +178,5 @@
 	<tr>
 		<td class="label">
-			<span id="updateRate">{if isset($rating.USER_RATE)}{'update_rate'|@translate}{else}{'new_rate'|@translate}{/if}</span>
+			<span id="updateRate">{if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
 		</td>
 		<td class="value">
@@ -265,9 +265,9 @@
 	<form  method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment">
 	<fieldset>
-		<legend>{'comments_add'|@translate}</legend>
+		<legend>{'Add a comment'|@translate}</legend>
 		{if $comment_add.SHOW_AUTHOR}
-		<label>{'upload_author'|@translate}<input type="text" name="author"></label>
+		<label>{'Author'|@translate}<input type="text" name="author"></label>
 		{/if}
-		<label>{'comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
+		<label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$Comment_add.CONTENT}</textarea></label>
 		<input type="hidden" name="key" value="{$comment_add.KEY}">
 		<input class="submit" type="submit" value="{'Submit'|@translate}">
Index: trunk/template/yoga/picture_content.tpl
===================================================================
--- trunk/template/yoga/picture_content.tpl	(revision 4893)
+++ trunk/template/yoga/picture_content.tpl	(revision 5021)
@@ -8,4 +8,4 @@
 {if isset($high) }
 </a>
-  <p>{'picture_high'|@translate}</p>
+  <p>{'Click on the picture to see it in high definition'|@translate}</p>
 {/if}
Index: trunk/template/yoga/picture_nav_buttons.tpl
===================================================================
--- trunk/template/yoga/picture_nav_buttons.tpl	(revision 4893)
+++ trunk/template/yoga/picture_nav_buttons.tpl	(revision 5021)
@@ -2,5 +2,5 @@
   
 {if isset($last)}
-  <a class="navButton" href="{$last.U_IMG}" title="{'last_page'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'last_page'|@translate}"></a>
+  <a class="navButton" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'Last'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
@@ -8,5 +8,5 @@
   
 {if isset($next)}
-  <a class="navButton" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'next_page'|@translate}"></a>
+  <a class="navButton" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'Next'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
@@ -14,17 +14,17 @@
 
 {if isset($slideshow.U_START_PLAY)}
-  <a class="navButton" href="{$slideshow.U_START_PLAY}" title="{'start_play'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'start_play'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'Play of slideshow'|@translate}"></a>
 {/if}
 
 {if isset($slideshow.U_STOP_PLAY)}
-  <a class="navButton" href="{$slideshow.U_STOP_PLAY}" title="{'stop_play'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'stop_play'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'Pause of slideshow'|@translate}"></a>
 {/if}
 
 {if isset($U_UP) and !isset($slideshow)}
-  <a class="navButton" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>
+  <a class="navButton" href="{$U_UP}" title="{'Thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'Thumbnails'|@translate}"></a>
 {/if}
   
 {if isset($previous)}
-  <a class="navButton" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'previous_page'|@translate}"></a>
+  <a class="navButton" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'Previous'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
@@ -32,5 +32,5 @@
   
 {if isset($first)}
-  <a class="navButton" href="{$first.U_IMG}" title="{'first_page'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'first_page'|@translate}"></a>
+  <a class="navButton" href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'First'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
@@ -39,14 +39,14 @@
 
 {if isset($slideshow.U_START_REPEAT)}
-  <a class="navButton" href="{$slideshow.U_START_REPEAT}" title="{'start_repeat'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'start_repeat'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Repeat the slideshow.png" class="button" alt="{'Repeat the slideshow'|@translate}"></a>
 {/if}
 
 {if isset($slideshow.U_STOP_REPEAT)}
-  <a class="navButton" href="{$slideshow.U_STOP_REPEAT}" title="{'stop_repeat'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'stop_repeat'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Not repeat the slideshow.png" class="button" alt="{'Not repeat the slideshow'|@translate}"></a>
 {/if}
 
 {if isset($slideshow)}
   {if isset($slideshow.U_DEC_PERIOD)}
-    <a class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'dec_period'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'dec_period'|@translate}"></a>
+    <a class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Accelerate diaporama speed.png" class="button" alt="{'Accelerate diaporama speed'|@translate}"></a>
   {else}
     <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
@@ -54,5 +54,5 @@
 
   {if isset($slideshow.U_INC_PERIOD)}
-    <a class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'inc_period'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'inc_period'|@translate}"></a>
+    <a class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Reduce diaporama speed.png" class="button" alt="{'Reduce diaporama speed'|@translate}"></a>
   {else}
     <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
Index: trunk/template/yoga/profile.tpl
===================================================================
--- trunk/template/yoga/profile.tpl	(revision 4893)
+++ trunk/template/yoga/profile.tpl	(revision 5021)
@@ -13,5 +13,5 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Profile'|@translate}</h2>
Index: trunk/template/yoga/profile_content.tpl
===================================================================
--- trunk/template/yoga/profile_content.tpl	(revision 4893)
+++ trunk/template/yoga/profile_content.tpl	(revision 5021)
@@ -26,5 +26,5 @@
       <li>
         <span class="property">
-          <label for="use_new_pwd">{'new_password'|@translate}</label>
+          <label for="use_new_pwd">{'New password'|@translate}</label>
         </span>
         <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
@@ -41,10 +41,10 @@
 
   <fieldset>
-    <legend>{'preferences'|@translate}</legend>
+    <legend>{'Preferences'|@translate}</legend>
 
     <ul>
       <li>
         <span class="property">
-          <label for="nb_image_line">{'nb_image_per_row'|@translate}</label>
+          <label for="nb_image_line">{'Number of images per row'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
@@ -52,5 +52,5 @@
       <li>
         <span class="property">
-          <label for="nb_line_page">{'nb_row_per_page'|@translate}</label>
+          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
@@ -58,5 +58,5 @@
       <li>
         <span class="property">
-          <label for="template">{'theme'|@translate}</label>
+          <label for="template">{'Interface theme'|@translate}</label>
         </span>
         {html_options name=template options=$template_options selected=$template_selection}
@@ -64,5 +64,5 @@
       <li>
         <span class="property">
-          <label for="language">{'language'|@translate}</label>
+          <label for="Language">{'Language'|@translate}</label>
         </span>
         {html_options name=language options=$language_options selected=$language_selection}
@@ -70,23 +70,23 @@
       <li>
         <span class="property">
-          <label for="recent_period">{'recent_period'|@translate}</label>
+          <label for="Recent period">{'Recent period'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
       </li>
       <li>
-        <span class="property">{'auto_expand'|@translate}</span>
+        <span class="property">{'Expand all categories'|@translate}</span>
         {html_radios name='expand' options=$radio_options selected=$EXPAND}
       </li>
       <li>
-        <span class="property">{'show_nb_comments'|@translate}</span>
+        <span class="property">{'Show number of comments'|@translate}</span>
         {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
       </li>
       <li>
-        <span class="property">{'show_nb_hits'|@translate}</span>
+        <span class="property">{'Show number of hits'|@translate}</span>
         {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
       </li>
       <li>
         <span class="property">
-          <label for="maxwidth">{'maxwidth'|@translate}</label>
+          <label for="Maximum width of the pictures">{'Maximum width of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
@@ -94,5 +94,5 @@
       <li>
         <span class="property">
-          <label for="maxheight">{'maxheight'|@translate}</label>
+          <label for="Maximum height of the pictures">{'Maximum height of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
@@ -104,5 +104,5 @@
     <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
     <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
-    <input class="submit" type="submit" name="reset_to_default" value="{'Reset_To_Default'|@translate}">
+    <input class="submit" type="submit" name="reset_to_default" value="{'Reset to default values'|@translate}">
   </p>
 
Index: trunk/template/yoga/redirect.tpl
===================================================================
--- trunk/template/yoga/redirect.tpl	(revision 4893)
+++ trunk/template/yoga/redirect.tpl	(revision 5021)
@@ -9,5 +9,5 @@
 <p style="margin: 2em">
 	<a href="{$page_refresh.U_REFRESH}">
-		{'click_to_redirect'|@translate}
+		{'Click here if your browser does not automatically forward you'|@translate}
 	</a>
 </p>
Index: trunk/template/yoga/register.tpl
===================================================================
--- trunk/template/yoga/register.tpl	(revision 4893)
+++ trunk/template/yoga/register.tpl	(revision 5021)
@@ -5,5 +5,5 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Registration'|@translate}</h2>
Index: trunk/template/yoga/search.tpl
===================================================================
--- trunk/template/yoga/search.tpl	(revision 4893)
+++ trunk/template/yoga/search.tpl	(revision 5021)
@@ -23,5 +23,5 @@
     <ul class="categoryActions">
       <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}" rel="Home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Search'|@translate}</h2>
@@ -41,16 +41,16 @@
 <fieldset>
   <legend>{'Filter'|@translate}</legend>
-  <label>{'search_keywords'|@translate}
+  <label>{'Search for words'|@translate}
     <input type="text" style="width: 300px" name="search_allwords" size="30">
   </label>
   <ul>
     <li><label>
-      <input type="radio" name="mode" value="AND" checked="checked">{'search_mode_and'|@translate}
+      <input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms '|@translate}
     </label></li>
     <li><label>
-      <input type="radio" name="mode" value="OR">{'search_mode_or'|@translate}
+      <input type="radio" name="mode" value="OR">{'Search for any terms'|@translate}
     </label></li>
   </ul>
-  <label>{'search_author'|@translate}
+  <label>{'Search for Author'|@translate}
     <input type="text" style="width: 300px" name="search_author" size="30">
   </label>
@@ -67,7 +67,7 @@
 
 <fieldset>
-  <legend>{'search_date'|@translate}</legend>
+  <legend>{'Search by Date'|@translate}</legend>
   <ul>
-    <li><label>{'search_date_type'|@translate}</label></li>
+    <li><label>{'Kind of date'|@translate}</label></li>
     <li><label>
       <input type="radio" name="date_type" value="date_creation" checked="checked">{'Creation date'|@translate}
@@ -78,5 +78,5 @@
   </ul>
   <ul>
-    <li><label>{'search_date_from'|@translate}</label></li>
+    <li><label>{'Date'|@translate}</label></li>
     <li>
       <select id="start_day" name="start_day">
@@ -97,5 +97,5 @@
   </ul>
   <ul>
-    <li><label>{'search_date_to'|@translate}</label></li>
+    <li><label>{'End-Date'|@translate}</label></li>
     <li>
       <select id="end_day" name="end_day">
@@ -118,6 +118,6 @@
 
 <fieldset>
-  <legend>{'search_options'|@translate}</legend>
-  <label>{'search_categories'|@translate}
+  <legend>{'Search Options'|@translate}</legend>
+  <label>{'Search in Categories'|@translate}
     <select class="categoryList" name="cat[]" multiple="multiple" >
       {html_options options=$category_options selected=$category_options_selected}
@@ -125,5 +125,5 @@
   </label>
   <ul>
-    <li><label>{'search_subcats_included'|@translate}</label></li>
+    <li><label>{'Search in subcategories'|@translate}</label></li>
     <li><label>
       <input type="radio" name="subcats-included" value="1" checked="checked">{'Yes'|@translate}
Index: trunk/template/yoga/search_rules.tpl
===================================================================
--- trunk/template/yoga/search_rules.tpl	(revision 4893)
+++ trunk/template/yoga/search_rules.tpl	(revision 5021)
@@ -16,5 +16,5 @@
   {if isset($SEARCH_TAGS_MODE) }
   <li>
-    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'All tags must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
+    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'At least one tag must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
     <ul>
       {foreach from=$search_tags item=v}
Index: trunk/template/yoga/slideshow.tpl
===================================================================
--- trunk/template/yoga/slideshow.tpl	(revision 4893)
+++ trunk/template/yoga/slideshow.tpl	(revision 5021)
@@ -2,5 +2,5 @@
   <div class="browsePath">
     {if isset($U_SLIDESHOW_STOP) }
-    [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
+    [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
     {/if}
   </div>
Index: trunk/template/yoga/tags.tpl
===================================================================
--- trunk/template/yoga/tags.tpl	(revision 4893)
+++ trunk/template/yoga/tags.tpl	(revision 5021)
@@ -4,12 +4,12 @@
 		<ul class="categoryActions">
 		{if $display_mode == 'letters'}
-			<li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"></a></li>
+			<li><a href="{$U_CLOUD}" title="{'cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"></a></li>
 		{/if}
 
 		{if $display_mode == 'cloud'}
-			<li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"></a></li>
+			<li><a href="{$U_LETTERS}" title="{'letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"></a></li>
 		{/if}
 
-			<li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+			<li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
 		</ul>
 		<h2>{'Tags'|@translate}</h2>
Index: trunk/template/yoga/upload.tpl
===================================================================
--- trunk/template/yoga/upload.tpl	(revision 4893)
+++ trunk/template/yoga/upload.tpl	(revision 5021)
@@ -9,7 +9,7 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
-    <h2>{'upload_title'|@translate}</h2>
+    <h2>{'Upload a picture'|@translate}</h2>
   </div>
 
@@ -61,5 +61,5 @@
     <!-- mail address -->
     <tr>
-      <td>{'mail_address'|@translate} <span style="color:red;">*</span></td>
+      <td>{'E-mail address'|@translate} <span style="color:red;">*</span></td>
       <td>
       <input name="mail_address" type="text" value="{$EMAIL}">
@@ -68,5 +68,5 @@
     <!-- name of the picture -->
     <tr>
-      <td>{'upload_name'|@translate}</td>
+      <td>{'Name of the picture'|@translate}</td>
       <td>
       <input name="name" type="text" value="{$NAME_IMG}">
@@ -75,5 +75,5 @@
     <!-- author -->
     <tr>
-      <td>{'upload_author'|@translate}</td>
+      <td>{'Author'|@translate}</td>
       <td>
       <input name="author" type="text" value="{$AUTHOR_IMG}">
@@ -89,5 +89,5 @@
     <!-- comment -->
     <tr>
-      <td>{'comment'|@translate}</td>
+      <td>{'Comment'|@translate}</td>
       <td>
        <textarea name="comment" id="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
@@ -103,12 +103,12 @@
   </form>
   {else}
-  {'upload_successful'|@translate}<br>
+  {'Picture uploaded with success, an administrator will validate it as soon as possible'|@translate}<br>
   <div style="text-align:center;">
-    <a href="{$U_RETURN}">[ {'home'|@translate} ]</a>
+    <a href="{$U_RETURN}">[ {'Home'|@translate} ]</a>
   </div>
   {/if}
   
   {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
-  <div style="text-align:left; margin-left:20px;"><span style="color:red;">*</span> : {'mandatory'|@translate}</div>
+  <div style="text-align:left; margin-left:20px;"><span style="color:red;">*</span> : {'obligatory'|@translate}</div>
   {/if}
 </div> <!-- content -->
