12 files changed, 15 insertions, 41 deletions

diff --git a/admin/user_perm.php b/admin/user_perm.php
index 78409965e..cfe15842c 100644
--- a/admin/user_perm.php
+++ b/admin/user_perm.php
@@ -2,10 +2,10 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -47,8 +47,7 @@ if (isset($_GET['user_id']) and is_numeric($_GET['user_id']))
 }
 else
 {
-  echo l10n('user_id URL parameter is missing');
-  exit();
+  die('user_id URL parameter is missing');
 }
 
 // +-----------------------------------------------------------------------+
diff --git a/admin/waiting.php b/admin/waiting.php
index 36f1b3a01..8a63ac17a 100644
--- a/admin/waiting.php
+++ b/admin/waiting.php
@@ -139,15 +139,6 @@ DELETE
 //----------------------------------------------------- template initialization
 $template->set_filenames(array('waiting'=>'admin/waiting.tpl'));
 $template->assign_vars(array(
-  'L_AUTHOR'=>$lang['author'],
-  'L_THUMBNAIL'=>$lang['thumbnail'],
-  'L_DATE'=>$lang['date'],
-  'L_FILE'=>$lang['file'],
-  'L_CATEGORY'=>$lang['category'],
-  'L_SUBMIT'=>$lang['submit'],
-  'L_RESET'=>$lang['reset'],
-  'L_DELETE'=>$lang['delete'],
-
   'F_ACTION'=>str_replace( '&', '&', $_SERVER['REQUEST_URI'])
   ));
 
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index c60681709..cca9bc958 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -200,7 +200,6 @@ $lang['add tags'] = 'add tags';
 $lang['adviser'] = 'Adviser';
 $lang['associate to category'] = 'associate to category';
 $lang['associate to group'] = 'associate to group';
-$lang['author'] = 'author';
 $lang['authorized'] = 'Authorized';
 $lang['cat_add'] = 'Add a virtual category';
 $lang['cat_comments_title'] = 'Authorize users to add comments on selected categories';
@@ -225,7 +224,6 @@ $lang['conf_general_title'] = 'Main configuration';
 $lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
 $lang['config'] = 'Configuration';
 $lang['confirm'] = 'confirm';
-$lang['creation date'] = 'creation date';
 $lang['date'] = 'date';
 $lang['delete category'] = 'delete category';
 $lang['description'] = 'description';
@@ -259,9 +257,7 @@ $lang['is_high_disabled'] = '';
 $lang['is_high_enabled'] = 'High definition';
 $lang['jump to category'] = 'jump to category';
 $lang['jump to image'] = 'jump to image';
-$lang['jump to'] = 'jump to';
 $lang['leave'] = 'leave';
-$lang['links'] = 'Links';
 $lang['lock'] = 'Lock';
 $lang['locked'] = 'Locked';
 $lang['manage category elements'] = 'manage category elements';
@@ -475,7 +471,6 @@ $lang['update_wrong_dirname_info'] = 'The name of directories and files must be
 $lang['update_wrong_dirname_short'] = 'wrong filename';
 $lang['upload'] = 'Upload';
 $lang['user "%s" added'] = 'user "%s" added';
-$lang['user_id URL parameter is missing'] = 'user_id URL parameter is missing';
 $lang['user_status'] = 'User status';
 $lang['user_status_admin'] = 'Administrator';
 $lang['user_status_generic'] = 'Generic';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 4a11f897b..6f382efdc 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -344,7 +344,6 @@ $lang['Help'] = 'Help';
 $lang['Identification'] = 'Identification';
 $lang['Image only RSS feed'] = 'Image only RSS feed';
 $lang['Keyword'] = 'Keyword';
-$lang['Keywords'] = 'Keywords';
 $lang['Links'] = 'Links';
 $lang['Mail address'] = 'Mail address';
 $lang['N/A'] = 'N/A';
@@ -396,7 +395,6 @@ $lang['add_favorites_hint'] = 'Add this picture to your favorites';
 $lang['admin'] = 'Administration';
 $lang['adviser_mode_enabled'] = 'Adviser mode enabled';
 $lang['all'] = 'all';
-$lang['all_categories'] = 'all categories';
 $lang['ascending'] = 'ascending';
 $lang['author(s) : %s'] = 'author(s) : %s';
 $lang['auto_expand'] = 'Expand all categories';
@@ -518,7 +516,6 @@ $lang['next_page'] = 'Next';
 $lang['no'] = 'No';
 $lang['no_category'] = 'Home';
 $lang['no_rate'] = 'no rate';
-$lang['only_members'] = 'Only members can access this page';
 $lang['password updated'] = 'password updated';
 $lang['periods_error'] = 'Recent period must be a positive integer value';
 $lang['picture'] = 'picture';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 70abaac55..53d835147 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -200,7 +200,6 @@ $lang['add tags'] = 'ajouter les tags';
 $lang['adviser'] = 'Conseiller';
 $lang['associate to category'] = 'associer à la catégorie';
 $lang['associate to group'] = 'associer au groupe';
-$lang['author'] = 'auteur';
 $lang['authorized'] = 'Autorisés';
 $lang['cat_add'] = 'Ajouter une catégorie virtuelle';
 $lang['cat_comments_title'] = 'Autoriser les utilisateurs à ajouter des commentaires dans les catégories sélectionnées';
@@ -225,7 +224,6 @@ $lang['conf_general_title'] = 'Configuration principale';
 $lang['conf_nb_comment_page_error'] = 'Le nombre de commentaires utilisateurs par page doit être compris entre 5 et 50.';
 $lang['config'] = 'Configuration';
 $lang['confirm'] = 'confirmer';
-$lang['creation date'] = 'date de création';
 $lang['date'] = 'date';
 $lang['delete category'] = 'supprimer la catégorie';
 $lang['description'] = 'description';
@@ -259,9 +257,7 @@ $lang['is_high_disabled'] = '';
 $lang['is_high_enabled'] = 'Haute définition';
 $lang['jump to category'] = 'se rendre dans la catégorie';
 $lang['jump to image'] = 'se rendre à l\'image';
-$lang['jump to'] = 's\'y rendre';
 $lang['leave'] = 'laisser';
-$lang['links'] = 'Liens';
 $lang['lock'] = 'Verrouiller';
 $lang['locked'] = 'Verrouillé';
 $lang['manage category elements'] = 'gérer les éléments de la catégorie';
@@ -475,7 +471,6 @@ $lang['update_wrong_dirname_info'] = 'Le nom des répertoires et des fichiers ne
 $lang['update_wrong_dirname_short'] = 'nom de fichier erroné';
 $lang['upload'] = 'Ajout';
 $lang['user "%s" added'] = 'utilisateur "%s" ajouté';
-$lang['user_id URL parameter is missing'] = 'le paramètre d\'URL "user_id" manque';
 $lang['user_status'] = 'Statut de l\'utilisateur';
 $lang['user_status_admin'] = 'Administrateur';
 $lang['user_status_generic'] = 'Générique';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 0ab1dda62..db6561a12 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -344,7 +344,6 @@ $lang['Help'] = 'Aide';
 $lang['Identification'] = 'Identification';
 $lang['Image only RSS feed'] = 'Flux RSS des images';
 $lang['Keyword'] = 'Mot-clef';
-$lang['Keywords'] = 'Mots-clef';
 $lang['Links'] = 'Liens';
 $lang['Mail address'] = $lang['Email address'];
 $lang['N/A'] = 'non disponible';
@@ -396,7 +395,6 @@ $lang['add_favorites_hint'] = 'Ajouter cette image à vos favoris';
 $lang['admin'] = 'Administration';
 $lang['adviser_mode_enabled'] = 'Mode conseiller actif';
 $lang['all'] = 'tout';
-$lang['all_categories'] = 'toutes les catégories';
 $lang['ascending'] = 'croissant';
 $lang['author(s) : %s'] = 'auteur(s) : %s';
 $lang['auto_expand'] = 'Développer toutes les catégories';
@@ -518,7 +516,6 @@ $lang['next_page'] = 'Suivant';
 $lang['no'] = 'Non';
 $lang['no_category'] = 'Accueil';
 $lang['no_rate'] = 'pas de note';
-$lang['only_members'] = 'Seuls les membres enregistrés peuvent accéder à cette page';
 $lang['password updated'] = 'mot de passe mis à jour';
 $lang['periods_error'] = 'La période de nouveauté doit être un entier positif';
 $lang['picture'] = 'image';
@@ -562,7 +559,7 @@ $lang['search_date_to'] = 'Date de fin';
 $lang['search_date_type'] = 'Type de date';
 $lang['search_descending'] = 'Décroissant';
 $lang['search_keywords'] = 'Recherche de mot';
-$lang['search_mode_and'] = 'Rechercher tous les mots';
+$lang['sear ch_mode_and'] = 'Rechercher tous les mots';
 $lang['search_mode_or'] = 'Rechercher un des mots';
 $lang['search_one_clause_at_least'] = 'Requête vide. Aucun critère fourni.';
 $lang['search_options'] = 'Options de recherche';
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index b108ab493..9da560996 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -1,7 +1,7 @@
 <!-- $Id$ -->
 <div id="menubar">
   <dl>
-    <dt>{lang:links}</dt>
+    <dt>{lang:Links}</dt>
     <dd>
       <ul>
         <li><a href="{U_RETURN}">{lang:home}</a></li>
diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index 49716b687..8f063a6d6 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -21,7 +21,7 @@
     <li class="categoryLi"> <!-- 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}" /></a></li> 
+        <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>
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index ef7b64b78..4b81a1be7 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -9,7 +9,7 @@
 <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}" /></a></li>
+  <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 -->
diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index 6b1bab8ca..5a05fb8be 100644
--- a/template/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
@@ -89,7 +89,7 @@
     </tr>
     
     <tr>
-      <td>{lang:author}</td>
+      <td>{lang:Author}</td>
       <td>
         <input type="radio" name="author_action" value="leave" checked="checked" /> {lang:leave}
         <input type="radio" name="author_action" value="unset" /> {lang:unset}
@@ -109,7 +109,7 @@
     </tr>
 
     <tr>
-      <td>{lang:creation date}</td>
+      <td>{lang:Creation date}</td>
       <td>
         <input type="radio" name="date_creation_action" value="leave" checked="checked" /> {lang:leave}
         <input type="radio" name="date_creation_action" value="unset" /> {lang:unset}
diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index 28981589f..ee144bcc3 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
@@ -5,7 +5,7 @@
 
 <ul class="categoryActions">
   <!-- BEGIN jumpto -->
-  <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to}" /></a></li>
+  <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to image}" /></a></li>
   <!-- END jumpto -->
   <li><a href="{U_SYNC}" title="{lang:synchronize metadata}" {TAG_INPUT_ENABLED}><img src="{themeconf:icon_dir}/sync_metadata.png" class="button" alt="{lang:synchronize}" /></a></li>
 </ul>
diff --git a/template/yoga/admin/waiting.tpl b/template/yoga/admin/waiting.tpl
index b48aa314b..d5e631652 100644
--- a/template/yoga/admin/waiting.tpl
+++ b/template/yoga/admin/waiting.tpl
@@ -4,11 +4,11 @@
 <form action="{F_ACTION}" method="post" id="waiting">
   <table style="width:100%;" >
     <tr class="throw">
-      <th style="width:20%;">{L_CATEGORY}</th>
-      <th style="width:20%;">{L_DATE}</th>
-      <th style="width:20%;">{L_FILE}</th>
-      <th style="width:20%;">{L_THUMBNAIL}</th>
-      <th style="width:20%;">{L_AUTHOR}</th>
+      <th style="width:20%;">{lang:category}</th>
+      <th style="width:20%;">{lang:date}</th>
+      <th style="width:20%;">{lang:file}</th>
+      <th style="width:20%;">{lang:thumbnail}</th>
+      <th style="width:20%;">{lang:Author}</th>
       <th style="width:1px;">&nbsp;</th>
     </tr>
     <!-- BEGIN picture -->