Feature 1533: more explicit options on display configuration tab

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

3 files changed, 21 insertions, 17 deletions

diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 82b80f8c3..3ec558dbc 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -208,42 +208,42 @@
   <ul>
     <li>
       <label>
-        <span class="property">{'display only recently posted images'|@translate|@ucfirst}</span>
+        <span class="property">{'display only recently posted images'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
         <input type="checkbox" name="menubar_filter_icon" {if ($display.menubar_filter_icon)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'Sort order'|@translate}</span>
+        <span class="property">{'Sort order'|@translate|@string_format:$pwg->l10n('Activate field "%s"')}</span>
         <input type="checkbox" name="index_sort_order_input" {if ($display.index_sort_order_input)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'display all elements in all sub-categories'|@translate|@ucfirst}</span>
+        <span class="property">{'display all elements in all sub-categories'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
         <input type="checkbox" name="index_flat_icon" {if ($display.index_flat_icon)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'display a calendar by posted date'|@translate|@ucfirst}</span>
+        <span class="property">{'display a calendar by posted date'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
         <input type="checkbox" name="index_posted_date_icon" {if ($display.index_posted_date_icon)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'display a calendar by creation date'|@translate|@ucfirst}</span>
+        <span class="property">{'display a calendar by creation date'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
         <input type="checkbox" name="index_created_date_icon" {if ($display.index_created_date_icon)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'slideshow'|@translate|@ucfirst}</span>
+        <span class="property">{'slideshow'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
         <input type="checkbox" name="index_slideshow_icon" {if ($display.index_slideshow_icon)}checked="checked"{/if}>
       </label>
     </li>
@@ -255,35 +255,35 @@
   <ul>
     <li>
       <label>
-        <span class="property">{'Show file metadata'|@translate}</span>
-        <input type="checkbox" name="picture_metadata_icon" {if ($display.picture_metadata_icon)}checked="checked"{/if}>
+        <span class="property">{'slideshow'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
+        <input type="checkbox" name="picture_slideshow_icon" {if ($display.picture_slideshow_icon)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'slideshow'|@translate}</span>
-        <input type="checkbox" name="picture_slideshow_icon" {if ($display.picture_slideshow_icon)}checked="checked"{/if}>
+        <span class="property">{'Show file metadata'|@translate|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
+        <input type="checkbox" name="picture_metadata_icon" {if ($display.picture_metadata_icon)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'add this image to your favorites'|@translate|@ucfirst}</span>
+        <span class="property">{'add this image to your favorites'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
         <input type="checkbox" name="picture_favorite_icon" {if ($display.picture_favorite_icon)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'Navigation Bar'|@translate|@ucfirst}</span>
+        <span class="property">{'Activate Navigation Bar'|@translate}</span>
         <input type="checkbox" name="picture_navigation_icons" {if ($display.picture_navigation_icons)}checked="checked"{/if}>
       </label>
     </li>
 
     <li>
       <label>
-        <span class="property">{'Navigation Thumbnails'|@translate|@ucfirst}</span>
+        <span class="property">{'Activate Navigation Thumbnails'|@translate}</span>
         <input type="checkbox" name="picture_navigation_thumb" {if ($display.picture_navigation_thumb)}checked="checked"{/if}>
       </label>
     </li>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index fa9e6bd5f..9d205980e 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -747,6 +747,8 @@ $lang['pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader
 $lang['Guest Settings'] = 'Guest Settings';
 $lang['Main Page'] = 'Main Page';
 $lang['Photo Page'] = 'Photo Page';
-$lang['Navigation Bar'] = 'Navigation Bar';
-$lang['Navigation Thumbnails'] = 'Navigation Thumbnails';
+$lang['Activate Navigation Bar'] = 'Activate Navigation Bar';
+$lang['Activate Navigation Thumbnails'] = 'Activate Navigation Thumbnails';
+$lang['Activate icon "%s"'] = 'Activate icon "%s"';
+$lang['Activate field "%s"'] = 'Activate field "%s"';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 0b41018de..fcf871174 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -680,6 +680,8 @@ $lang['unknown'] = 'inconnu';
 $lang['Guest Settings'] = 'Paramètres invité';
 $lang['Main Page'] = 'Page Principale';
 $lang['Photo Page'] = 'Page de la Photo';
-$lang['Navigation Bar'] = 'Barre de navigation';
-$lang['Navigation Thumbnails'] = 'Miniatures de navigation';
+$lang['Activate Navigation Bar'] = 'Activer la barre de navigation';
+$lang['Activate Navigation Thumbnails'] = 'Activer les miniatures de navigation';
+$lang['Activate icon "%s"'] = 'Activer l\'icone "%s"';
+$lang['Activate field "%s"'] = 'Activer le champ "%s"';
 ?>
\ No newline at end of file