- migrate many templates to smarty

git-svn-id: http://piwigo.org/svn/trunk@2223 68402e56-0260-453c-a942-63ccdbb3a9ee

19 files changed, 457 insertions, 509 deletions

diff --git a/template/yoga/about.tpl b/template/yoga/about.tpl
index c4299972c..398f266f8 100644
--- a/template/yoga/about.tpl
+++ b/template/yoga/about.tpl
@@ -1,19 +1,19 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="content">
   <div class="titrePage">
     <ul class="categoryActions">
       <li>
-        <a href="{U_HOME}" title="{lang:return to homepage}">
-          <img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/>
+        <a href="{$U_HOME}" title="{'return to homepage'|@translate}">
+          <img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/>
         </a>
       </li>
     </ul>
-    <h2>{lang:About}</h2>
+    <h2>{'About'|@translate}</h2>
   </div>
   <ul>
-  {ABOUT_MESSAGE}
-  <!-- BEGIN theme -->
-  <li>{theme.ABOUT}</li>
-  <!-- END theme -->
+  {$ABOUT_MESSAGE}
+  {if isset($THEME_ABOUT) }
+  <li>{$THEME_ABOUT}</li>
+  {/if}
   </ul>
 </div>
diff --git a/template/yoga/admin/advanced_feature.tpl b/template/yoga/admin/advanced_feature.tpl
index df3cdb0e9..128428ba1 100644
--- a/template/yoga/admin/advanced_feature.tpl
+++ b/template/yoga/admin/advanced_feature.tpl
@@ -1,16 +1,13 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:Advanced_features}</h2>
+  <h2>{'Advanced_features'|@translate}</h2>
 </div>
 
 <ul>
-  <!-- BEGIN advanced_features -->
-    <!-- BEGIN advanced_feature -->
-      <li><a href="{advanced_features.advanced_feature.URL}" {TAG_INPUT_ENABLED}>{advanced_features.advanced_feature.CAPTION}</a></li>
-    <!-- END advanced_feature -->
-  <!-- END advanced_features -->
+  {foreach from=$advanced_features item=feature}
+    <li><a href="{$feature.URL}" {$TAG_INPUT_ENABLED}>{$feature.CAPTION}</a></li>
+  {/foreach}
 </ul>
diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index f80766eee..c7a83f8d7 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -1,71 +1,65 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
-<h2>{lang:title_categories}</h2>
+{* $Id$ *}
+<h2>{'title_categories'|@translate}</h2>
 
-<h3>{CATEGORIES_NAV}</h3>
+<h3>{$CATEGORIES_NAV}</h3>
 
-<form id="addVirtual" action="{F_ACTION}" method="post">
+<form id="addVirtual" action="{$F_ACTION}" method="post">
   <p>
-    {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
-    <input class="submit" type="submit" value="{L_SUBMIT}" name="submitAdd" {TAG_INPUT_ENABLED} />
-    <!-- BEGIN eop_link -->
-    <a href="#EoP" class="button"><img src="{themeconf:icon_dir}/page_end.png" class="button" alt="{lang:page_end}" /></a>
-    <!-- END eop_link --> 
+    {'cat_add'|@translate} : <input type="text" name="virtual_name" />
+    <input class="submit" type="submit" value="{'submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} />
+    {if count($categories)>9 }
+    <a href="#EoP" class="button"><img src="{$themeconf.icon_dir}/page_end.png" class="button" alt="{'page_end'|@translate}" /></a>
+    {/if}
   </p>
 </form>
 
-<!-- BEGIN categories -->
-<form id="categoryOrdering" action="{F_ACTION}" method="post">
+{if count($categories) }
+<form id="categoryOrdering" action="{$F_ACTION}" method="post">
   <p>
-    <input class="submit" name="submitOrder" type="submit" value="{lang:Save order}" {TAG_INPUT_ENABLED} />
-    <input class="submit" name="submitOrderAlphaNum" type="submit" value="{lang:Order alphanumerically}" {TAG_INPUT_ENABLED} />
+    <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} />
+    <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} />
   </p>
   <ul class="categoryUl">
 
-    <!-- BEGIN category -->
-    <li class="categoryLi
-          <!-- BEGIN virtual -->
-          {categories.category.virtual.CLASS}
-          <!-- END virtual -->
-    "> <!-- category {category.ID} -->
-
+    {foreach from=$categories item=category}
+    <li class="categoryLi{if $category.IS_VIRTUAL} virtual_cat{/if}">
+      <!-- category {$category.ID} -->
       <ul class="categoryActions">
-        <li><a href="{categories.category.U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to category}" /></a></li>
-        <li><a href="{categories.category.U_EDIT}" title="{lang:edit category informations}"><img src="{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
-        <!-- BEGIN elements -->
-        <li><a href="{categories.category.elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
-        <!-- END elements -->
-        <li><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li> 
-        <!-- BEGIN permissions -->
-        <li><a href="{categories.category.permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
-        <!-- END permissions -->
-        <!-- BEGIN delete -->
-        <li><a href="{categories.category.delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
-        <!-- END delete -->
+        <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
+        <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li>
+        {if isset($category.U_MANAGE_ELEMENTS) }
+        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
+        {/if}
+        <li><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li>
+        {if isset($category.U_MANAGE_PERMISSIONS) }
+        <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li>
+        {/if}
+        {if isset($category.U_DELETE) }
+        <li><a href="{$category.U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li>
+        {/if}
       </ul>
 
       <p>
-      <strong><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}">{categories.category.NAME}</a></strong>
-      <!-- BEGIN virtual -->
-      <img src="{themeconf:icon_dir}/virt_category.png" class="button" alt="{lang:virtual_category}" />
-      <!-- END virtual -->
+      <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}">{$category.NAME}</a></strong>
+      {if $category.IS_VIRTUAL}
+      <img src="{$themeconf.icon_dir}/virt_category.png" class="button" alt="{'virtual_category'|@translate}" />
+      {/if}
       </p>
 
       <p>
         <label>
-          {lang:Position} :
-          <input type="text" size="4" name="catOrd[{categories.category.ID}]" maxlength="4" value="{categories.category.RANK}" />
+          {'Position'|@translate} :
+          <input type="text" size="4" name="catOrd[{$category.ID}]" maxlength="4" value="{$category.RANK}" />
         </label>
       </p>
 
     </li>
-    <!-- END category -->
+    {/foreach}
   </ul>
   <p>
-    <input class="submit" name="submitOrder" type="submit" value="{lang:Save order}" {TAG_INPUT_ENABLED} />
-    <input class="submit" name="submitOrderAlphaNum" type="submit" value="{lang:Order alphanumerically}" {TAG_INPUT_ENABLED} />
+    <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} />
+    <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} />
   </p>
 
 </form>
-<!-- END categories -->
-
+{/if}
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index 04bce8aa9..dc9c98dc3 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -1,248 +1,229 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:title_edit_cat}</h2>
+  <h2>{'title_edit_cat'|@translate}</h2>
 </div>
 
-<h3>{CATEGORIES_NAV}</h3>
+<h3>{$CATEGORIES_NAV}</h3>
 
 <ul class="categoryActions">
-  <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to category}" /></a></li>
-  <!-- BEGIN elements -->
-  <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
-  <!-- END elements -->
-  <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li>
-  <!-- BEGIN permissions -->
-  <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
-  <!-- END permissions -->
-  <!-- BEGIN delete -->
-  <li><a href="{delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
-  <!-- END delete -->
+  <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
+  {if isset($U_MANAGE_ELEMENTS) }
+  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
+  {/if}
+  <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li>
+  {if isset($U_MANAGE_PERMISSIONS) }
+  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li>
+  {/if}
+  {if isset($U_DELETE) }
+  <li><a href="{$U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li>
+  {/if}
 </ul>
 
-<form action="{F_ACTION}" method="POST" id="catModify">
+<form action="{$F_ACTION}" method="POST" id="catModify">
 
 <fieldset>
-  <legend>{lang:Informations}</legend>
+  <legend>{'Informations'|@translate}</legend>
   <table>
-    <!-- BEGIN server -->
-    <tr>
-      <td><strong>{L_REMOTE_SITE}</strong></td>
-      <td>{server.SITE_URL}</td>
-    </tr>
-    <!-- END server -->
-    <!-- BEGIN storage -->
+
+    {if isset($CAT_FULL_DIR) }
     <tr>
-      <td><strong>{L_STORAGE}</strong></td>
-      <td class="row1">{storage.CATEGORY_DIR}</td>
+      <td><strong>{'storage'|@translate}</strong></td>
+      <td class="row1">{$CAT_FULL_DIR}</td>
     </tr>
-    <!-- END storage -->
+    {/if}
+    
     <tr>
-      <td><strong>{L_EDIT_NAME}</strong></td>
+      <td><strong>{'name'|@translate}</strong></td>
       <td>
-        <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/>
+        <input type="text" name="name" value="{$CAT_NAME}" maxlength="60"/>
       </td>
     </tr>
     <tr>
-      <td><strong>{L_EDIT_COMMENT}</strong></td>
+      <td><strong>{'description'|@translate}</strong></td>
       <td>
-        <textarea cols="50" rows="5" name="comment" class="description">{CAT_COMMENT}</textarea>
+        <textarea cols="50" rows="5" name="comment" class="description">{$CAT_COMMENT}</textarea>
       </td>
     </tr>
   </table>
 </fieldset>
 
-<!-- BEGIN move -->
+{if isset($move_cat_options) }
 <fieldset id="move">
-  <legend>{lang:Move}</legend>
-  {lang:Parent category}
+  <legend>{'Move'|@translate}</legend>
+  {'Parent category'|@translate}
   <select class="categoryDropDown" name="parent">
-    <!-- BEGIN parent_option -->
-    <option class="{move.parent_option.CLASS}" {move.parent_option.SELECTED} value="{move.parent_option.VALUE}">{move.parent_option.OPTION}</option>
-    <!-- END parent_option -->
+    <option value="0">------------</option>
+    {html_options options=$move_cat_options selected=$move_cat_options_selected }
   </select>
 </fieldset>
-<!-- END move -->
+{/if}
 
 <fieldset id="options">
-  <legend>{lang:Options}</legend>
+  <legend>{'Options'|@translate}</legend>
   <table>
     <tr>
-      <td><strong>{L_EDIT_STATUS}</strong>
+      <td><strong>{'conf_access'|@translate}</strong>
       <td>
-    <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
-    <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
+        {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
       </td>
     </tr>
     <tr>
-      <td><strong>{L_EDIT_LOCK}</strong>
+      <td><strong>{'lock'|@translate}</strong>
       <td>
-    <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
-    <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
+        {html_radios name='visible' values=$false_true output=$no_yes|translate selected=$CAT_VISIBLE}
       </td>
     </tr>
     <tr>
-      <td><strong>{L_EDIT_COMMENTABLE}</strong>
+      <td><strong>{'comments'|@translate}</strong>
       <td>
-          <input type="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}
-          <input type="radio"  name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
+        {html_radios name='commentable' values=$false_true output=$no_yes|translate selected=$CAT_COMMENTABLE}
       </td>
     </tr>
-    <!-- BEGIN upload -->
+    {if isset($SHOW_UPLOADABLE) }
     <tr>
-      <td><strong>{L_EDIT_UPLOADABLE}</strong>
+      <td><strong>{'editcat_uploadable'|@translate}</strong>
       <td>
-          <input type="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}
-          <input type="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
+        {html_radios name='uploadable' values=$false_true output=$no_yes|translate selected=$CAT_UPLOADABLE}
       </td>
     </tr>
-    <!-- END upload -->
+    {/if}
   </table>
 </fieldset>
 
 <fieldset id="image_order">
-  <legend>{lang:Sort order}</legend>
-  <input type="checkbox" name="image_order_default" id="image_order_default" {IMG_ORDER_DEFAULT} />
-  <label for="image_order_default">{lang:Use default sort order}</label>
+  <legend>{'Sort order'|@translate}</legend>
+  <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT} />
+  <label for="image_order_default">{'Use default sort order'|@translate}</label>
   <br/>
   <input type="checkbox" name="image_order_subcats" id="image_order_subcats" />
-  <label for="image_order_subcats">{lang:Apply to subcategories}</label>
+  <label for="image_order_subcats">{'Apply to subcategories'|@translate}</label>
   <br/>
-  <!-- BEGIN image_order -->
-    <select name="order_field_{image_order.NUMBER}">
-    <!-- BEGIN field -->
-      <option value="{image_order.field.VALUE}" {image_order.field.SELECTED}>{image_order.field.OPTION}</option>
-    <!-- END field -->
+  
+  {foreach from=$image_orders item=order}
+    <select name="order_field_{$order.ID}">
+      {html_options options=$image_order_field_options selected=$order.FIELD }}
     </select>
-    <select name="order_direction_{image_order.NUMBER}">
-    <!-- BEGIN order -->
-      <option value="{image_order.order.VALUE}" {image_order.order.SELECTED}>{image_order.order.OPTION}</option>
-    <!-- END order -->
+    <select name="order_direction_{$order.ID}">
+      {html_options options=$image_order_direction_options selected=$order.DIRECTION }}
     </select><br/>
-  <!-- END image_order -->
+  {/foreach}
+  
 </fieldset>
 
 <p style="text-align:center;">
-  <input class="submit" type="submit" value="{L_SUBMIT}" name="submit" {TAG_INPUT_ENABLED}/>
-  <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
+  <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/>
+  <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
 </p>
 
-<!-- BEGIN representant -->
+{if isset($representant) }
 <fieldset id="representant">
-  <legend>{lang:Representant}</legend>
+  <legend>{'Representant'|@translate}</legend>
   <table>
     <tr>
       <td align="center">
-        <!-- BEGIN picture -->
-        <a href="{representant.picture.URL}"><img src="{representant.picture.SRC}" alt="" class="miniature" /></a>
-        <!-- END picture -->
-
-        <!-- BEGIN random -->
-        <img src="{themeconf:icon_dir}/category_representant_random.png" class="button" alt="{lang:Random picture}" class="miniature" />
-        <!-- END random -->
+        {if isset($representant.picture) }
+        <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" class="miniature" /></a>
+        {else}
+        <img src="{$themeconf.icon_dir}/category_representant_random.png" class="button" alt="{'Random picture'|@translate}" class="miniature" />
+        {/if}
       </td>
       <td>
-        <!-- BEGIN set_random -->
-        <p><input class="submit" type="submit" name="set_random_representant" value="{L_SET_RANDOM_REPRESENTANT}" {TAG_INPUT_ENABLED}/></p>
-        <!-- END set_random -->
+        {if $representant.ALLOW_SET_RANDOM }
+        <p><input class="submit" type="submit" name="set_random_representant" value="{'cat_representant'|@translate}" {$TAG_INPUT_ENABLED}/></p>
+        {/if}
 
-        <!-- BEGIN delete_representant -->
-        <p><input class="submit" type="submit" name="delete_representant" value="{lang:Delete Representant}" /></p>
-        <!-- END delete_representant -->
+        {if isset($representant.ALLOW_DELETE) }
+        <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}" /></p>
+        {/if}
       </td>
     </tr>
   </table>
 </fieldset>
-<!-- END representant -->
+{/if}
 
 </form>
 
-<form action="{F_ACTION}" method="POST" id="links">
+<form action="{$F_ACTION}" method="POST" id="links">
 
 <fieldset id="linkAllNew">
-  <legend>{lang:Link all category elements to a new category}</legend>
+  <legend>{'Link all category elements to a new category'|@translate}</legend>
 
   <table>
     <tr>
-      <td>{lang:Virtual category name}</td>
+      <td>{'Virtual category name'|@translate}</td>
       <td><input type="text" name="virtual_name"></td>
     </tr>
 
     <tr>
-      <td>{lang:Parent category}</td>
+      <td>{'Parent category'|@translate}</td>
       <td>
         <select class="categoryDropDown" name="parent">
-          <!-- BEGIN category_option_parent -->
-          <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
-          <!-- END category_option_parent -->
+          <option value="0">------------</option>
+          {html_options options=$create_new_parent_options }
         </select>
       </td>
     </tr>
   </table>
 
   <p>
-    <input class="submit" type="submit" value="{lang:Submit}" name="submitAdd" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}/>
+    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
   </p>
 
 </fieldset>
 
 <fieldset id="linkAllExist">
-  <legend>{lang:Link all category elements to some existing categories}</legend>
+  <legend>{'Link all category elements to some existing categories'|@translate}</legend>
 
   <table>
     <tr>
-      <td>{lang:Categories}</td>
+      <td>{'Categories'|@translate}</td>
       <td>
         <select class="categoryList" name="destinations[]" multiple="multiple" size="5">
-          <!-- BEGIN category_option_destination -->
-          <option {category_option_destination.SELECTED} value="{category_option_destination.VALUE}">{category_option_destination.OPTION}</option>
-          <!-- END category_option_destination -->
+          {html_options options=$category_destination_options }
         </select>
       </td>
     </tr>
   </table>
 
   <p>
-    <input class="submit" type="submit" value="{lang:Submit}" name="submitDestinations" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations" {$TAG_INPUT_ENABLED}/>
+    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
   </p>
 
 </fieldset>
 
-<!-- BEGIN group_mail -->
+{if isset($group_mail_options)}
 <fieldset id="emailCatInfo">
-  <legend>{lang:Send an information email to group members}</legend>
+  <legend>{'Send an information email to group members'|@translate}</legend>
 
   <table>
     <tr>
-      <td><strong>{lang:Group}</strong></td>
+      <td><strong>{'Group'|@translate}</strong></td>
       <td>
         <select name="group">
-          <!-- BEGIN group_option -->
-          <option value="{group_mail.group_option.VALUE}">{group_mail.group_option.OPTION}</option>
-          <!-- END group_option -->
+          {html_options options=$group_mail_options}
         </select>
       </td>
     </tr>
     <tr>
-      <td><strong>{lang:mail_content}</strong></td>
+      <td><strong>{'mail_content'|@translate}</strong></td>
       <td>
-        <textarea cols="50" rows="5" name="mail_content" class="description">{MAIL_CONTENT}</textarea>
+        <textarea cols="50" rows="5" name="mail_content" class="description">{$MAIL_CONTENT}</textarea>
       </td>
     </tr>
 
   </table>
 
   <p>
-    <input class="submit" type="submit" value="{lang:Submit}" name="submitEmail" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail" {$TAG_INPUT_ENABLED}/>
+    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
   </p>
 
 </fieldset>
-<!-- END group_mail -->
+{/if}
 
 </form>
diff --git a/template/yoga/admin/cat_move.tpl b/template/yoga/admin/cat_move.tpl
index e35731bb1..318a025ab 100644
--- a/template/yoga/admin/cat_move.tpl
+++ b/template/yoga/admin/cat_move.tpl
@@ -1,41 +1,38 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
+
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:Move categories}</h2>
+  <h2>{'Move categories'|@translate}</h2>
 </div>
 
-<form method="post" action="{F_ACTION}" class="filter" id="catMove">
+<form method="post" action="{$F_ACTION}" class="filter" id="catMove">
   <fieldset>
-    <legend>{lang:Virtual categories movement}</legend>
+    <legend>{'Virtual categories movement'|@translate}</legend>
 
     <label>
-      {lang:Virtual categories to move}
+      {'Virtual categories to move'|@translate}
 
       <select class="categoryList" name="selection[]" multiple="multiple">
-        <!-- BEGIN category_option_selection -->
-        <option {category_option_selection.SELECTED} value="{category_option_selection.VALUE}">{category_option_selection.OPTION}</option>
-        <!-- END category_option_selection -->
+        {html_options options=$category_to_move_options}
       </select>
     </label>
 
     <label>
-      {lang:New parent category}
+      {'New parent category'|@translate}
 
       <select class="categoryDropDown" name="parent">
-        <!-- BEGIN category_option_parent -->
-        <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
-        <!-- END category_option_parent -->
+        <option value="0">------------</option>
+        {html_options options=$category_parent_options}
       </select>
     </label>
 
   </fieldset>
 
   <p>
-    <input class="submit" type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}>
-    <input class="submit" type="reset" name="reset" value="{lang:Reset}">
+    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
   </p>
 
 </form>
diff --git a/template/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
index 8551ff3e3..356e66223 100644
--- a/template/yoga/admin/cat_options.tpl
+++ b/template/yoga/admin/cat_options.tpl
@@ -1,19 +1,16 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:cat_options_title} {TABSHEET_TITLE}</h2>
-  {TABSHEET}
+  <h2>{'cat_options_title'|@translate} {$TABSHEET_TITLE}</h2>
+  {include file='admin/tabsheet.tpl'}
 </div>
 
-<form method="post" action="{F_ACTION}" id="cat_options">
+<form method="post" action="{$F_ACTION}" id="cat_options">
   <fieldset>
-    <legend>{L_SECTION}</legend>
-    {DOUBLE_SELECT}
+    <legend>{$L_SECTION}</legend>
+    {$DOUBLE_SELECT}
   </fieldset>
 </form>
 
-<p class="information">{L_CAT_OPTIONS_INFO}</p>
-
diff --git a/template/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl
index 05c300e23..857448112 100644
--- a/template/yoga/admin/cat_perm.tpl
+++ b/template/yoga/admin/cat_perm.tpl
@@ -1,66 +1,68 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:Manage permissions for a category}</h2>
+  <h2>{'Manage permissions for a category'|@translate}</h2>
 </div>
 
-<h3>{CATEGORIES_NAV}</h3>
+<h3>{$CATEGORIES_NAV}</h3>
 
-<form action="{F_ACTION}" method="post" id="categoryPermissions">
+<form action="{$F_ACTION}" method="post" id="categoryPermissions">
 
-  <h4>{lang:Groups}</h4>
+  <h4>{'Groups'|@translate}</h4>
 
   <fieldset>
-    <legend>{lang:Permission granted}</legend>
+    <legend>{'Permission granted'|@translate}</legend>
     <ul>
-      <!-- BEGIN group_granted -->
-      <li><label><input type="checkbox" name="deny_groups[]" value="{group_granted.ID}" /> {group_granted.NAME}</label></li>
-      <!-- END group_granted -->
+      {foreach from=$group_granted_ids item=id}
+      <li><label><input type="checkbox" name="deny_groups[]" value="{$id}" /> {$all_groups[$id]}</label></li>
+      {/foreach}
     </ul>
-    <input class="submit" type="submit" name="deny_groups_submit" value="{lang:Deny selected groups}" {TAG_INPUT_ENABLED}/>
+    <input class="submit" type="submit" name="deny_groups_submit" value="{'Deny selected groups'|@translate}" {$TAG_INPUT_ENABLED}/>
   </fieldset>
 
   <fieldset>
-    <legend>{lang:Permission denied}</legend>
+    <legend>{'Permission denied'|@translate}</legend>
     <ul>
-      <!-- BEGIN group_denied -->
-      <li><label><input type="checkbox" name="grant_groups[]" value="{group_denied.ID}"> {group_denied.NAME}</label></li>
-      <!-- END group_denied -->
+      {foreach from=$group_denied_ids item=id}
+      <li><label><input type="checkbox" name="grant_groups[]" value="{$id}"> {$all_groups[$id]}</label></li>
+      {/foreach}
     </ul>
-    <input class="submit" type="submit" name="grant_groups_submit" value="{lang:Grant selected groups}" {TAG_INPUT_ENABLED}/>
+    <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}" {$TAG_INPUT_ENABLED}/>
   </fieldset>
 
-  <h4>{lang:Users}</h4>
-  
+  <h4>{'Users'|@translate}</h4>
+
   <fieldset>
-    <legend>{lang:Permission granted}</legend>
+    <legend>{'Permission granted'|@translate}</legend>
     <ul>
-      <!-- BEGIN user_granted -->
-      <li><label><input type="checkbox" name="deny_users[]" value="{user_granted.ID}" /> {user_granted.NAME}</label></li>
-      <!-- END user_granted -->
+      {foreach from=$user_granted_direct_ids item=id}
+      <li><label><input type="checkbox" name="deny_users[]" value="{$id}" /> {$all_users[$id]}</label></li>
+      {/foreach}
     </ul>
-    <input class="submit" type="submit" name="deny_users_submit" value="{lang:Deny selected users}" {TAG_INPUT_ENABLED}/>
+    <input class="submit" type="submit" name="deny_users_submit" value="{'Deny selected users'|@translate}" {$TAG_INPUT_ENABLED}/>
   </fieldset>
 
   <fieldset>
-    <legend>{lang:Permission granted thanks to a group}</legend>
+    <legend>{'Permission granted thanks to a group'|@translate}</legend>
+    {if isset($user_granted_indirects) }
     <ul>
-      <!-- BEGIN user_granted_indirect -->
-      <li>{user_granted_indirect.NAME} ({user_granted_indirect.GROUP})</li>
-      <!-- END user_granted_indirect -->
+      {foreach from=$user_granted_indirects item=user_group}
+      <li>{$user_group.USER} ({$user_group.GROUP})</li>
+      {/foreach}
     </ul>
+    {/if}
   </fieldset>
 
   <fieldset>
-    <legend>{lang:Permission denied}</legend>
+    <legend>{'Permission denied'|@translate}</legend>
     <ul>
-      <!-- BEGIN user_denied -->
-      <li><label><input type="checkbox" name="grant_users[]" value="{user_denied.ID}"> {user_denied.NAME}</label></li>
-      <!-- END user_denied -->
+      {foreach from=$user_denied_ids item=id}
+      <li><label><input type="checkbox" name="grant_users[]" value="{$id}"> {$all_users[$id]}</label></li>
+      {/foreach}
     </ul>
-    <input class="submit" type="submit" name="grant_users_submit" value="{lang:Grant selected users}" {TAG_INPUT_ENABLED}/>
+    <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}" {$TAG_INPUT_ENABLED}/>
   </fieldset>
 
 </form>
diff --git a/template/yoga/admin/permalinks.tpl b/template/yoga/admin/permalinks.tpl
index 220aa3572..2013666eb 100644
--- a/template/yoga/admin/permalinks.tpl
+++ b/template/yoga/admin/permalinks.tpl
@@ -1,72 +1,70 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:Permalinks}</h2>
+  <h2>{'Permalinks'|@translate}</h2>
 </div>
 
-<form method="post" action="{F_ACTION}">
-<fieldset><legend>{lang:Add/delete a permalink}</legend>
-  <label>{lang:Category}:
+<form method="post" action="{$F_ACTION}">
+<fieldset><legend>{'Add/delete a permalink'|@translate}</legend>
+  <label>{'Category'|@translate}:
     <select name="cat_id">
       <option value="0">------</option>
-<!-- BEGIN categories -->
-      <option value="{categories.VALUE}" {categories.SELECTED}>{categories.OPTION}</option>
-<!-- END categories -->
+      {html_options options=$categories selected=$categories_selected}
     </select>
   </label>
 
-  <label>{lang:Permalink}:
+  <label>{'Permalink'|@translate}:
     <input name="permalink" />
   </label>
 
-  <label>{lang:Save to permalink history}:
+  <label>{'Save to permalink history'|@translate}:
     <input type="checkbox" name="save" checked="checked" />
   </label>
 
   <p>
-    <input type="submit" class="submit" name="set_permalink" value="{lang:submit}" {TAG_INPUT_ENABLED}/>
+    <input type="submit" class="submit" name="set_permalink" value="{'submit'|@translate}" {$TAG_INPUT_ENABLED}/>
   </p>
   </fieldset>
 </form>
 
-<h3>{lang:Permalinks}</h3>
+<h3>{'Permalinks'|@translate}</h3>
 <table class="table2">
   <tr class="throw">
-    <td>Id {SORT_ID}</td>
-    <td>{lang:Category} {SORT_NAME}</td>
-    <td>{lang:Permalink} {SORT_PERMALINK}</td>
+    <td>Id {$SORT_ID}</td>
+    <td>{'Category'|@translate} {$SORT_NAME}</td>
+    <td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
   </tr>
-<!-- BEGIN permalink -->
+{foreach from=$permalinks item=permalink}
   <tr>
-    <td>{permalink.id}</td>
-    <td>{permalink.name}</td>
-    <td>{permalink.permalink}</td>
+    <td>{$permalink.id}</td>
+    <td>{$permalink.name}</td>
+    <td>{$permalink.permalink}</td>
   </tr>
-<!-- END permalink -->
+{/foreach}
 </table>
 
-<h3>{lang:Permalink history} <a name="old_permalinks"></a></h3>
+<h3>{'Permalink history'|@translate} <a name="old_permalinks"></a></h3>
 <table class="table2">
   <tr class="throw">
-    <td>Id {SORT_OLD_CAT_ID}</td>
-    <td>{lang:Category}</td>
-    <td>{lang:Permalink} {SORT_OLD_PERMALINK}</td>
-    <td>Deleted on {SORT_OLD_DATE_DELETED}</td>
-    <td>Last hit {SORT_OLD_LAST_HIT}</td>
-    <td>Hit {SORT_OLD_HIT}</td>
+    <td>Id {$SORT_OLD_CAT_ID}</td>
+    <td>{'Category'|@translate}</td>
+    <td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
+    <td>Deleted on {$SORT_OLD_DATE_DELETED}</td>
+    <td>Last hit {$SORT_OLD_LAST_HIT}</td>
+    <td>Hit {$SORT_OLD_HIT}</td>
     <td></td>
   </tr>
-<!-- BEGIN deleted_permalink -->
+{foreach from=$deleted_permalinks item=permalink}
   <tr>
-    <td>{deleted_permalink.cat_id}</td>
-    <td>{deleted_permalink.name}</td>
-    <td>{deleted_permalink.permalink}</td>
-    <td>{deleted_permalink.date_deleted}</td>
-    <td>{deleted_permalink.last_hit}</td>
-    <td>{deleted_permalink.hit}</td>
-    <td><a href="{deleted_permalink.U_DELETE}" {TAG_INPUT_ENABLED}><img src="{pwg_root}{themeconf:icon_dir}/delete.png" alt="Delete"></a></td>
+    <td>{$permalink.cat_id}</td>
+    <td>{$permalink.name}</td>
+    <td>{$permalink.permalink}</td>
+    <td>{$permalink.date_deleted}</td>
+    <td>{$permalink.last_hit}</td>
+    <td>{$permalink.hit}</td>
+    <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" alt="Delete"></a></td>
   </tr>
-<!-- END deleted_permalink -->
+{/foreach}
 </table>
diff --git a/template/yoga/admin/rating.tpl b/template/yoga/admin/rating.tpl
index d10bf57db..aa91892dc 100755
--- a/template/yoga/admin/rating.tpl
+++ b/template/yoga/admin/rating.tpl
@@ -1,68 +1,64 @@
-<!-- DEV TAG: not smarty migrated -->
-<h2>{lang:Rating} [{NB_ELEMENTS} {lang:elements}]</h2>
+{* $Id$ *}
+<h2>{'Rating'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]</h2>
 
-<form action="{F_ACTION}" method="GET" id="update" class="filter">
+<form action="{$F_ACTION}" method="GET" id="update" class="filter">
   <fieldset>
-    <legend>{lang:Filter}</legend>
+    <legend>{'Filter'|@translate}</legend>
 
     <label>
-      {lang:Sort by}
+      {'Sort by'|@translate}
       <select name="order_by">
-        <!-- BEGIN order_by -->
-        <option value="{order_by.VALUE}" {order_by.SELECTED}>{order_by.CONTENT}</option>
-        <!-- END order_by -->
+        {html_options options=$order_by_options selected=$order_by_options_selected}
       </select>
     </label>
 
     <label>
-      {lang:Users}
+      {'Users'|@translate}
       <select name="users">
-        <!-- BEGIN user_option -->
-        <option value="{user_option.VALUE}" {user_option.SELECTED}>{user_option.CONTENT}</option>
-        <!-- END user_option -->
+        {html_options options=$user_options selected=$user_options_selected}
       </select>
     </label>
 
     <label>
-      {lang:Number of items}
-      <input type="text" name="display" size="2" value="{DISPLAY}">
+      {'Number of items'|@translate}
+      <input type="text" name="display" size="2" value="{$DISPLAY}">
     </label>
 
-    <input class="submit" type="submit" name="submit_filter" value="{lang:Submit}" />
+    <input class="submit" type="submit" name="submit_filter" value="{'Submit'|@translate}" />
     <input type="hidden" name="page" value="rating" />
   </fieldset>
 </form>
 
-<div class="navigationBar">{NAVBAR}</div>
+<div class="navigationBar">{$NAVBAR}</div>
 <table width="99%">
 <tr class="throw">
-  <td>{lang:File}</td>
-  <td>{lang:Number of rates}</td>
-  <td>{lang:Average rate}</td>
-  <td>{lang:Controversy}</td>
-  <td>{lang:Sum of rates}</td>
-  <td>{lang:Rate}</td>
-  <td>{lang:Username}</td>
-  <td>{lang:Rate date}</td>
+  <td>{'File'|@translate}</td>
+  <td>{'Number of rates'|@translate}</td>
+  <td>{'Average rate'|@translate}</td>
+  <td>{'Controversy'|@translate}</td>
+  <td>{'Sum of rates'|@translate}</td>
+  <td>{'Rate'|@translate}</td>
+  <td>{'Username'|@translate}</td>
+  <td>{'Rate date'|@translate}</td>
   <td></td>
 </tr>
-<!-- BEGIN image -->
+{foreach from=$images item=image}
 <tr valign="bottom">
-  <td rowspan="{image.NB_RATES_PLUS1}"><a href="{image.U_URL}"><img src="{image.U_THUMB}" alt="{image.FILE}" title="{image.FILE}"></a></td>
-  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.NB_RATES}/{image.NB_RATES_TOTAL}</strong></td>
-  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.AVG_RATE}</strong></td>
-  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.STD_RATE}</strong></td>
-  <td rowspan="{image.NB_RATES_PLUS1}" style="border-right: 1px solid;" ><strong>{image.SUM_RATE}</strong></td>
+  <td rowspan="{$image.NB_RATES_TOTAL+1}"><a href="{$image.U_URL}"><img src="{$image.U_THUMB}" alt="{$image.FILE}" title="{$image.FILE}"></a></td>
+  <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td>
+  <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td>
+  <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.STD_RATE}</strong></td>
+  <td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td>
 </tr>
-<!-- BEGIN rate -->
+{foreach from=$image.rates item=rate}
 <tr>
-    <td>{image.rate.RATE}</td>
-    <td><b>{image.rate.USER}</b></td>
-    <td><span class="date">{image.rate.DATE}</span></td>
-    <td><a href="{image.rate.U_DELETE}" {TAG_INPUT_ENABLED}><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/></a></td>
+    <td>{$rate.RATE}</td>
+    <td><b>{$rate.USER}</b></td>
+    <td><span class="date">{$rate.DATE}</span></td>
+    <td><a href="{$rate.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"/></a></td>
 </tr>
-<!-- END rate -->
-<!-- END image -->
+{/foreach} {*rates*}
+{/foreach} {*images*}
 </table>
 
-<div class="navigationBar">{NAVBAR}</div>
+<div class="navigationBar">{$NAVBAR}</div>
diff --git a/template/yoga/admin/tabsheet.tpl b/template/yoga/admin/tabsheet.tpl
index 6daafb506..930771916 100644
--- a/template/yoga/admin/tabsheet.tpl
+++ b/template/yoga/admin/tabsheet.tpl
@@ -1,7 +1,8 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
+{if isset($tabsheet) and count($tabsheet)}
 <ul class="tabsheet">
-<!-- BEGIN tab -->
-  <li class="{tab.CLASSNAME}"><a href="{tab.URL}">{tab.CAPTION}</a></li>
-<!-- END tab -->
+{foreach from=$tabsheet item=tab}
+  <li class="{if isset($tab.selected) and $tab.selected}selected_tab{else}normal_tab{/if}"><a href="{$tab.url}">{$tab.caption}</a></li>
+{/foreach}
 </ul>
+{/if}
\ No newline at end of file
diff --git a/template/yoga/comments.tpl b/template/yoga/comments.tpl
index 94f4f82f4..e2f8777c2 100644
--- a/template/yoga/comments.tpl
+++ b/template/yoga/comments.tpl
@@ -1,38 +1,34 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:User comments}</h2>
+    <h2>{'User comments'|@translate}</h2>
   </div>
 
-<form class="filter" action="{F_ACTION}" method="get">
+<form class="filter" action="{$F_ACTION}" method="get">
 
   <fieldset>
-    <legend>{lang:Filter}</legend>
+    <legend>{'Filter'|@translate}</legend>
 
-    <label>{lang:Keyword}<input type="text" name="keyword" value="{F_KEYWORD}" /></label>
+    <label>{'Keyword'|@translate}<input type="text" name="keyword" value="{$F_KEYWORD}" /></label>
 
-    <label>{lang:Author}<input type="text" name="author" value="{F_AUTHOR}" /></label>
+    <label>{'Author'|@translate}<input type="text" name="author" value="{$F_AUTHOR}" /></label>
 
     <label>
-      {lang:Category}
+      {'Category'|@translate}
       <select name="cat">
-        <!-- BEGIN category -->
-        <option {category.SELECTED} value="{category.VALUE}">{category.OPTION}</option>
-        <!-- END category -->
+        <option value="0">------------</option>
+        {html_options options=$categories selected=$categories_selected}
       </select>
     </label>
 
     <label>
-      {lang:Since}
+      {'Since'|@translate}
       <select name="since">
-        <!-- BEGIN since_option -->
-        <option {since_option.SELECTED} value="{since_option.VALUE}">{since_option.CONTENT}</option>
-        <!-- END since_option -->
+        {html_options options=$since_options selected=$since_options_selected}
       </select>
     </label>
 
@@ -40,66 +36,64 @@
 
   <fieldset>
 
-    <legend>{lang:Display}</legend>
+    <legend>{'Display'|@translate}</legend>
 
     <label>
-      {lang:Sort by}
+      {'Sort by'|@translate}
       <select name="sort_by">
-        <!-- BEGIN sort_by_option -->
-        <option value="{sort_by_option.VALUE}" {sort_by_option.SELECTED} >{sort_by_option.CONTENT}</option>
-        <!-- END sort_by_option -->
+        {html_options options=$sort_by_options selected=$sort_by_options_selected}
       </select>
     </label>
 
     <label>
-      {lang:Sort order}
+      {'Sort order'|@translate}
       <select name="sort_order">
-        <!-- BEGIN sort_order_option -->
-        <option value="{sort_order_option.VALUE}" {sort_order_option.SELECTED} >{sort_order_option.CONTENT}</option>
-        <!-- END sort_order_option -->
+        {html_options options=$sort_order_options selected=$sort_order_options_selected}
       </select>
     </label>
 
     <label>
-      {lang:Number of items}
+      {'Number of items'|@translate}
       <select name="items_number">
-        <!-- BEGIN items_number_option -->
-        <option value="{items_number_option.VALUE}" {items_number_option.SELECTED} >{items_number_option.CONTENT}</option>
-        <!-- END items_option -->
+        {html_options options=$item_number_options selected=$item_number_options_selected}
       </select>
     </label>
 
   </fieldset>
 
-  <p><input class="submit" type="submit" value="{lang:Filter and display}"></p>
+  <p><input class="submit" type="submit" value="{'Filter and display'|@translate}"></p>
 
 </form>
 
-<div class="navigationBar">{NAVBAR}</div>
+<div class="navigationBar">{$NAVBAR}</div>
 
+{if isset($comments)}
 <div id="comments">
 
-  <!-- BEGIN comment -->
+  {foreach from=$comments item=comment}
   <div class="comment">
-    <a class="illustration" href="{comment.U_PICTURE}"><img src="{comment.TN_SRC}" alt="{comment.ALT}" /></a>
-    <p class="commentHeader"><span class="author">{comment.AUTHOR}</span> - <span class="date">{comment.DATE}</span>
-    <!-- BEGIN action_delete -->
-    <a href="{comment.action_delete.U_DELETE}" title="{lang:comments_del}">
-      <img src="{pwg_root}{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/>
+    <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}" alt="{$comment.ALT}" /></a>
+    <p class="commentHeader"><span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span>
+
+    {if isset($comment.U_DELETE)}
+    <a href="{$comment.U_DELETE}" title="{'comments_del'|@translate}">
+      <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"/>
     </a>
-    <!-- END action_delete -->
-    <!-- BEGIN action_validate -->
-    <a href="{comment.action_validate.U_VALIDATE}" title="validate this comment">
-      <img src="{pwg_root}{themeconf:icon_dir}/validate_s.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[validate]"/>
+    {/if}
+
+    {if isset($comment.U_VALIDATE)}
+    <a href="{$comment.U_VALIDATE}" title="validate this comment">
+      <img src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[validate]"/>
     </a>
-    <!-- END action_validate -->
+    {/if}
+
     </p>
-    <blockquote>{comment.CONTENT}</blockquote>
+    <blockquote>{$comment.CONTENT}</blockquote>
     <hr class="separation">
   </div>
-
-  <!-- END comment -->
-
+  
+  {/foreach}
 </div>
+{/if}
 
 </div> <!-- content -->
diff --git a/template/yoga/identification.tpl b/template/yoga/identification.tpl
index 3c23e6f9e..5cb4555e8 100644
--- a/template/yoga/identification.tpl
+++ b/template/yoga/identification.tpl
@@ -1,61 +1,60 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
-<!-- BEGIN register -->
-      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
-<!-- END register -->
-      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$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="{$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="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:Identification}</h2>
+    <h2>{'Identification'|@translate}</h2>
   </div>
 
-  <!-- BEGIN errors -->
+  {if isset($errors) }
   <div class="errors">
     <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
+      {foreach from=$errors item=error}
+      <li>{$error}</li>
+      {/foreach}
     </ul>
   </div>
-  <!-- END errors -->
+  {/if}
 
-<form action="{F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
+<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
   <fieldset>
-    <legend>{lang:Connection settings}</legend>
+    <legend>{'Connection settings'|@translate}</legend>
 
-    <input type="hidden" name="redirect" value="{U_REDIRECT}">
+    <input type="hidden" name="redirect" value="{$U_REDIRECT}">
 
     <ul>
       <li>
         <span class="property">
-          <label for="username">{lang:Username}</label>
+          <label for="username">{'Username'|@translate}</label>
         </span>
-        <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" value="{USERNAME}" />
+        <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" />
       </li>
 
       <li>
         <span class="property">
-          <label for="password">{lang:Password}</label>
+          <label for="password">{'Password'|@translate}</label>
         </span>
         <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25" />
       </li>
 
-      <!-- BEGIN remember_me -->
+      {if $authorize_remembering }
       <li>
         <span class="property">
-          <label for="remember_me">{lang:remember_me}</label>
+          <label for="remember_me">{'remember_me'|@translate}</label>
         </span>
         <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
       </li>
-      <!-- END remember_me -->
+      {/if}
     </ul>
   </fieldset>
 
-  <p><input class="submit" tabindex="4" type="submit" name="login" value="{lang:submit}"></p>
+  <p><input class="submit" tabindex="4" type="submit" name="login" value="{'submit'|@translate}"></p>
 </form>
 
 <script type="text/javascript"><!--
@@ -63,10 +62,10 @@ document.login_form.username.focus();
 //--></script>
 
   <p>
-<!-- BEGIN register -->
-    <a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{themeconf:icon_dir}/register.png" class="button" alt=""> {lang:Register}</a>
-<!-- END register -->
-    <a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt=""> {lang:Forgot your password?}</a>
+    {if isset($U_REGISTER) }
+    <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$themeconf.icon_dir}/register.png" class="button" alt=""> {'Register'|@translate}</a>
+    {/if}
+    <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$themeconf.icon_dir}/lost_password.png" class="button" alt=""> {'Forgot your password?'|@translate}</a>
   </p>
 
 </div> <!-- content -->
diff --git a/template/yoga/notification.tpl b/template/yoga/notification.tpl
index 5a7df4006..bb98b27f5 100644
--- a/template/yoga/notification.tpl
+++ b/template/yoga/notification.tpl
@@ -1,15 +1,15 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:Notification}</h2>
+    <h2>{'Notification'|@translate}</h2>
   </div>
 
-  <p>{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}</p>
+  <p>{'The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'|@translate}</p>
 
-  <p><a href="{U_FEED_IMAGE_ONLY}">{lang:Image only RSS feed}</a></p>
-  <p><a href="{U_FEED}">{lang:Complete RSS feed}</a></p>
+  <p><a href="{$U_FEED_IMAGE_ONLY}">{'Image only RSS feed'|@translate}</a></p>
+  <p><a href="{$U_FEED}">{'Complete RSS feed'|@translate}</a></p>
 </div>
diff --git a/template/yoga/password.tpl b/template/yoga/password.tpl
index a2fe78857..efb384299 100644
--- a/template/yoga/password.tpl
+++ b/template/yoga/password.tpl
@@ -1,55 +1,54 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <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>
     </ul>
-    <h2>{lang:Password forgotten}</h2>
+    <h2>{'Password forgotten'|@translate}</h2>
   </div>
 
-  <!-- BEGIN errors -->
+  {if count($errors)}
   <div class="errors">
     <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
+      {foreach from=$errors item=error}
+      <li>{$error}</li>
+      {/foreach}
     </ul>
   </div>
-  <!-- END errors -->
+  {/if}
 
-  <!-- BEGIN infos -->
+  {if count($infos)}
   <div class="infos">
     <ul>
-      <!-- BEGIN info -->
-      <li>{infos.info.INFO}</li>
-      <!-- END info -->
+      {foreach from=$infos item=info}
+      <li>{$info}</li>
+      {/foreach}
     </ul>
   </div>
-  <!-- END infos -->
+  {/if}
 
-<form action="{F_ACTION}" method="post" class="properties">
+<form action="{$F_ACTION}" method="post" class="properties">
   <fieldset>
-    <legend>{lang:Retrieve password}</legend>
+    <legend>{'Retrieve password'|@translate}</legend>
 
     <ul>
       <li>
         <span class="property">
-          <label for="mail_address">{lang:Email address}</label>
+          <label for="mail_address">{'Email address'|@translate}</label>
         </span>
         <input class="login" type="text" name="mail_address" id="mail_address" size="40" maxlength="40" >
       </li>
       <li>
         <span class="property">
-          <label for="no_mail_address">{lang:No email address}</label>
+          <label for="no_mail_address">{'No email address'|@translate}</label>
         </span>
         <input type="checkbox" id="no_mail_address" name="no_mail_address" value="1">
       </li>
     </ul>
   </fieldset>
 
-  <p><input class="submit" type="submit" name="submit" value="{lang:Send new password}"></p>
+  <p><input class="submit" type="submit" name="submit" value="{'Send new password'|@translate}"></p>
 </form>
 
 </div> <!-- content -->
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 34efe877d..ebfba0998 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -57,8 +57,6 @@
     <!-- END caddie -->
   </div>
   {NAV_BUTTONS}
-  </div>
-
 </div> <!-- imageToolBar -->
 
 <div id="theImage">
diff --git a/template/yoga/popuphelp.tpl b/template/yoga/popuphelp.tpl
index a31a0df90..3b7eb1932 100644
--- a/template/yoga/popuphelp.tpl
+++ b/template/yoga/popuphelp.tpl
@@ -1,6 +1,6 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="content">
-{HELP_CONTENT}
+{$HELP_CONTENT}
 </div> <!-- content -->
 
-<p id="pageBottomActions"><a href="#" onclick="window.close();" title="{lang:Close this window}"><img src="{themeconf:icon_dir}/exit.png" class="button" alt="close"></a></p>
+<p id="pageBottomActions"><a href="#" onclick="window.close();" title="{'Close this window'|@translate}"><img src="{$themeconf.icon_dir}/exit.png" class="button" alt="close"></a></p>
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index 328efb805..1b03c34c3 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -1,134 +1,130 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}" rel="nofollow"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-      <li><a href="{U_HOME}" title="{lang:return to homepage}" rel="home"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:Search}</h2>
+    <h2>{'Search'|@translate}</h2>
   </div>
 
-<form class="filter" method="post" name="search" action="{S_SEARCH_ACTION}">
-<!-- BEGIN errors -->
+{if isset($errors) }
 <div class="errors">
   <ul>
-    <!-- BEGIN error -->
-    <li>{errors.error.ERROR}</li>
-    <!-- END error -->
+    {foreach from=$errors item=error}
+    <li>{$error}</li>
+    {/foreach}
   </ul>
 </div>
-<!-- END errors -->
+{/if}
+
+<form class="filter" method="post" name="search" action="{$F_SEARCH_ACTION}">
 <fieldset>
-  <legend>{lang:Filter}</legend>
-  <label>{lang:search_keywords}
+  <legend>{'Filter'|@translate}</legend>
+  <label>{'search_keywords'|@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" />{lang:search_mode_and}
+      <input type="radio" name="mode" value="AND" checked="checked" />{'search_mode_and'|@translate}
     </label></li>
     <li><label>
-      <input type="radio" name="mode" value="OR" />{lang:search_mode_or}
+      <input type="radio" name="mode" value="OR" />{'search_mode_or'|@translate}
     </label></li>
   </ul>
-  <label>{lang:search_author}
+  <label>{'search_author'|@translate}
     <input type="text" style="width: 300px" name="search_author" size="30"  />
   </label>
 </fieldset>
 
-<!-- BEGIN tags -->
+{if isset($TAG_SELECTION)}
 <fieldset>
-  <legend>{lang:Search tags}</legend>
-  {TAG_SELECTION}
-  <label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {lang:All tags}</span></label>
-  <label><span><input type="radio" name="tag_mode" value="OR" /> {lang:Any tag}</span></label>
+  <legend>{'Search tags'|@translate}</legend>
+  {$TAG_SELECTION}
+  <label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {'All tags'|@translate}</span></label>
+  <label><span><input type="radio" name="tag_mode" value="OR" /> {'Any tag'|@translate}</span></label>
 </fieldset>
-<!-- END tags -->
+{/if}
 
 <fieldset>
-  <legend>{lang:search_date}</legend>
+  <legend>{'search_date'|@translate}</legend>
   <ul>
-    <li><label>{lang:search_date_type}</label></li>
+    <li><label>{'search_date_type'|@translate}</label></li>
     <li><label>
-      <input type="radio" name="date_type" value="date_creation" checked="checked" />{lang:Creation date}
+      <input type="radio" name="date_type" value="date_creation" checked="checked" />{'Creation date'|@translate}
     </label></li>
     <li><label>
-      <input type="radio" name="date_type" value="date_available" />{lang:Post date}
+      <input type="radio" name="date_type" value="date_available" />{'Post date'|@translate}
     </label></li>
   </ul>
   <ul>
-    <li><label>{lang:search_date_from}</label></li>
+    <li><label>{'search_date_from'|@translate}</label></li>
     <li>
       <select name="start_day">
-        <!-- BEGIN start_day -->
-        <option {start_day.SELECTED} value="{start_day.VALUE}">{start_day.OPTION}</option>
-        <!-- END start_day -->
+          <option value="0">--</option>
+        {section name=day start=1 loop=31}
+          <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$START_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+        {/section}
       </select>
       <select name="start_month">
-        <!-- BEGIN start_month -->
-        <option {start_month.SELECTED} value="{start_month.VALUE}">{start_month.OPTION}</option>
-        <!-- END start_month -->
+        {html_options options=$month_list selected=$START_MONTH_SELECTED}
       </select>
       <input name="start_year" type="text" size="4" maxlength="4" >
     </li>
     <li>
-      <a href="#" onClick="document.search.start_day.value={TODAY_DAY};document.search.start_month.value={TODAY_MONTH};document.search.start_year.value={TODAY_YEAR};return false;">{lang:today}</a>
+      <a href="#" onClick="document.search.start_day.value={$smarty.now|date_format:"%d"};document.search.start_month.value={$smarty.now|date_format:"%m"};document.search.start_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
     </li>
   </ul>
   <ul>
-    <li><label>{lang:search_date_to}</label></li>
+    <li><label>{'search_date_to'|@translate}</label></li>
     <li>
       <select name="end_day">
-        <!-- BEGIN end_day -->
-        <option {end_day.SELECTED} value="{end_day.VALUE}">{end_day.OPTION}</option>
-        <!-- END end_day -->
+          <option value="0">--</option>
+        {section name=day start=1 loop=31}
+          <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$END_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+        {/section}
       </select>
       <select name="end_month">
-        <!-- BEGIN end_month -->
-        <option {end_month.SELECTED} value="{end_month.VALUE}">{end_month.OPTION}</option>
-        <!-- END end_month -->
+        {html_options options=$month_list selected=$END_MONTH_SELECTED}
       </select>
       <input name="end_year" type="text" size="4" maxlength="4" >
     </li>
     <li>
-      <a href="#" onClick="document.search.end_day.value={TODAY_DAY};document.search.end_month.value={TODAY_MONTH};document.search.end_year.value={TODAY_YEAR};return false;">{lang:today}</a>
+      <a href="#" onClick="document.search.end_day.value={$smarty.now|date_format:"%d"};document.search.end_month.value={$smarty.now|date_format:"%m"};document.search.end_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
     </li>
   </ul>
 </fieldset>
 
 <fieldset>
-  <legend>{lang:search_options}</legend>
-  <label>{lang:search_categories}
+  <legend>{'search_options'|@translate}</legend>
+  <label>{'search_categories'|@translate}
     <select class="categoryList" name="cat[]" multiple="multiple" >
-      <!-- BEGIN category_option -->
-      <option value="{category_option.VALUE}">{category_option.OPTION}</option>
-      <!-- END category_option -->
+      {html_options options=$category_options selected=$category_options_selected}
     </select>
   </label>
   <ul>
-    <li><label>{lang:search_subcats_included}</label></li>
+    <li><label>{'search_subcats_included'|@translate}</label></li>
     <li><label>
-      <input type="radio" name="subcats-included" value="1" checked="checked" />{lang:yes}
+      <input type="radio" name="subcats-included" value="1" checked="checked" />{'yes'|@translate}
     </label></li>
     <li><label>
-      <input type="radio" name="subcats-included" value="0" />{lang:no}
+      <input type="radio" name="subcats-included" value="0" />{'no'|@translate}
     </label></li>
   </ul>
   <ul>
-    <li><label>{lang:search_sort}</label></li>
+    <li><label>{'search_sort'|@translate}</label></li>
     <li><label>
-      <input type="radio" name="sd" value="AND" />{lang:search_ascending}
+      <input type="radio" name="sd" value="AND" />{'search_ascending'|@translate}
     </label></li>
     <li><label>
-      <input type="radio" name="sd" value="d" checked="checked" />{lang:search_descending}
+      <input type="radio" name="sd" value="d" checked="checked" />{'search_descending'|@translate}
     </label></li>
   </ul>
 </fieldset>
 <p>
-  <input class="submit" type="submit" name="submit" value="{lang:submit}" />
-  <input class="submit" type="reset" value="{lang:reset}" />
+  <input class="submit" type="submit" name="submit" value="{'submit'|@translate}" />
+  <input class="submit" type="reset" value="{'reset'|@translate}" />
 </p>
 </form>
 
diff --git a/template/yoga/search_rules.tpl b/template/yoga/search_rules.tpl
index b015c42b6..5cf2241e6 100644
--- a/template/yoga/search_rules.tpl
+++ b/template/yoga/search_rules.tpl
@@ -1,57 +1,56 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="content">
-<h2>{lang:Search rules}</h2>
+<h2>{'Search rules'|@translate}</h2>
 
-<p>{INTRODUCTION}</p>
+{if isset($INTRODUCTION) }
+<p>{$INTRODUCTION}</p>
+{/if}
 
 <ul>
 
-  <!-- BEGIN words -->
-  <li>{words.CONTENT}</li>
-  <!-- END words -->
+  {if isset($search_words) }
+  {foreach from=$search_words item=v}
+  <li>{$v}</li>
+  {/foreach}
+  {/if}
 
-  <!-- BEGIN tags -->
+  {if isset($SEARCH_TAGS_MODE) }
   <li>
-    <p>{tags.LIST_INTRO}</p>
-
+    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'All tags must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
     <ul>
-      <!-- BEGIN tag -->
-      <li>{tags.tag.NAME}</li>
-      <!-- END tag -->
+      {foreach from=$search_tags item=v}
+      <li>{$v}</li>
+      {/foreach}
     </ul>
   </li>
-  <!-- END tags -->
+  {/if}
   
-  <!-- BEGIN author -->
-  <li>{author.CONTENT}</li>
-  <!-- END author -->
-
-  <!-- BEGIN date_creation -->
-  <li>{date_creation.CONTENT}</li>
-  <!-- END date_creation -->
+  {if isset($DATE_CREATION) }
+  <li>{$DATE_CREATION}</li>
+  {/if}
 
-  <!-- BEGIN date_available -->
-  <li>{date_available.CONTENT}</li>
-  <!-- END date_available -->
+  {if isset($DATE_AVAILABLE) }
+  <li>{$DATE_AVAILABLE}</li>
+  {/if}
 
-  <!-- BEGIN categories -->
+  {if isset($search_categories) }
   <li>
-    <p>{categories.LIST_INTRO}</p>
+    <p>{'Categories'|@translate}</p>
 
     <ul>
-      <!-- BEGIN category -->
-      <li>{categories.category.NAME}</li>
-      <!-- END category -->
+      {foreach from=$search_categories item=v}
+      <li>{$v}</li>
+      {/foreach}
     </ul>
   </li>
-  <!-- END categories -->
+  {/if}
   
 </ul>
 
 </div> <!-- content -->
 
 <p id="pageBottomActions">
-  <a href="#" onclick="window.close();" title="{lang:Close this window}">
-    <img src="{themeconf:icon_dir}/exit.png" class="button" alt="close">
+  <a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
+    <img src="{$themeconf.icon_dir}/exit.png" class="button" alt="close">
   </a>
 </p>
diff --git a/template/yoga/tags.tpl b/template/yoga/tags.tpl
index 023c5965b..2548065ce 100644
--- a/template/yoga/tags.tpl
+++ b/template/yoga/tags.tpl
@@ -1,19 +1,19 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:Tags}</h2>
+    <h2>{'Tags'|@translate}</h2>
   </div>
 
+  {if isset($tags)}
   <ul id="fullTagCloud">
-    <!-- BEGIN tag -->
-    <li><a href="{tag.URL}" class="{tag.CLASS}" title="{tag.TITLE}">{tag.NAME}</a></li>
-    <!-- END tag -->
-    <li>&nbsp;</li> <!-- FIXME W3C HTML Conformity said: No empty UL -->
+    {foreach from=$tags item=tag}
+    <li><a href="{$tag.URL}" class="{$tag.CLASS}" title="{$tag.TITLE}">{$tag.NAME}</a></li>
+    {/foreach}
   </ul>
+  {/if}
 
 </div> <!-- content -->