- language - removed 2 unnecessary keys from admin.lang

- language - moved some keys from common.lang to admin.lang

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

12 files changed, 23 insertions, 33 deletions

diff --git a/admin/template/yoga/admin/cat_modify.tpl b/admin/template/yoga/admin/cat_modify.tpl
index 02880832d..b3b67afd8 100644
--- a/admin/template/yoga/admin/cat_modify.tpl
+++ b/admin/template/yoga/admin/cat_modify.tpl
@@ -33,13 +33,13 @@
     {/if}
     
     <tr>
-      <td><strong>{'name'|@translate}</strong></td>
+      <td><strong>{'Name'|@translate}</strong></td>
       <td>
         <input type="text" name="name" value="{$CAT_NAME}" maxlength="60"/>
       </td>
     </tr>
     <tr>
-      <td><strong>{'description'|@translate}</strong></td>
+      <td><strong>{'Description'|@translate}</strong></td>
       <td>
         <textarea cols="50" rows="5" name="comment" class="description">{$CAT_COMMENT}</textarea>
       </td>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index d4f7423b2..e2f306529 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -224,7 +224,6 @@ $lang['config'] = 'Configuration';
 $lang['confirm'] = 'confirm';
 $lang['Date'] = 'Date';
 $lang['delete category'] = 'delete category';
-$lang['description'] = 'description';
 $lang['dissociate from category'] = 'dissociate from category';
 $lang['dissociate from group'] = 'dissociate from group';
 $lang['edit category permissions'] = 'edit category permissions';
@@ -259,7 +258,6 @@ $lang['manage sub-categories'] = 'manage sub-categories';
 $lang['manage'] = 'Manage';
 $lang['maximum height'] = 'maximum height';
 $lang['maximum width'] = 'maximum width';
-$lang['name'] = 'name';
 $lang['nbm_background_treatment_redirect_second'] = 'Execution time is out, treatment must be continue [Estmated time: %d second].';
 $lang['nbm_background_treatment_redirect_seconds'] = 'Execution time is out, treatment must be continue [Estmated time: %d seconds].';
 $lang['nbm_break_timeout_list_user'] = 'Prepared time for list of users to send mail is limited. Others users are not listed.';
@@ -651,7 +649,7 @@ $lang['Hits'] = 'Hits';
 $lang['GD library is missing'] = 'GD library is missing';
 $lang['conf_extents'] = 'Templates';
 $lang['extend_for_templates'] = 'Extend for templates';
-$lang['Replacement of original templates'] = 
+$lang['Replacement of original templates'] =
  'Replacement of original templates by customized templates from template-extension subfolder';
 $lang['Replacers'] = 'Replacers (customized templates)';
 $lang['Original templates'] = 'Original templates';
@@ -659,4 +657,7 @@ $lang['Optional URL keyword'] = 'Optional URL keyword';
 $lang['Templates recorded.'] = 'Templates configuration has been recorded.';
 $lang['Optimizations completed'] = 'All optimizations have been successfully completed.';
 $lang['Optimizations errors'] = 'Optimizations have been completed with some errors.';
+$lang['delete this comment'] = 'delete this comment';
+$lang['link_info_image'] = 'Modify information';
+$lang['edit category informations'] = 'edit category informations';
 ?>
\ No newline at end of file
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index f8c1297d0..654352bf8 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'An administrator must authorize your comment bef
 $lang['comment_user_exists'] = 'This login is already used by another user';
 $lang['comments'] = 'Comments';
 $lang['comments_add'] = 'Add a comment';
-$lang['comments_del'] = 'delete this comment';
 $lang['comments_title'] = 'Comments from the users of the site';
 $lang['created after %s (%s)'] = 'created after %s (%s)';
 $lang['created before %s (%s)'] = 'created before %s (%s)';
@@ -181,7 +180,6 @@ $lang['delete'] = 'Delete';
 $lang['descending'] = 'descending';
 $lang['download'] = 'download';
 $lang['download_hint'] = 'download this file';
-$lang['edit category informations'] = 'edit category informations';
 $lang['edit'] = 'edit';
 $lang['err_date'] = 'wrong date';
 $lang['excluded'] = 'excluded';
@@ -208,7 +206,6 @@ $lang['invalid_pwd'] = 'Invalid password!';
 $lang['language']='Language';
 $lang['last %d days'] = 'last %d days';
 $lang['last_page'] = 'Last';
-$lang['link_info_image'] = 'Modify information';
 $lang['logout'] = 'Logout';
 $lang['mail_address'] = 'E-mail address';
 $lang['mandatory'] = 'obligatory';
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index accd13027..968bac9f1 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -224,7 +224,6 @@ $lang['config'] = 'Configuración';
 $lang['confirm'] = 'Confirmar';
 $lang['Date'] = 'Fecha';
 $lang['delete category'] = 'Suprimir la categoría';
-$lang['description'] = 'Descripción';
 $lang['dissociate from category'] = 'Disociar la categoría';
 $lang['dissociate from group'] = 'Disociar el grupo';
 $lang['edit category permissions'] = 'Modificar los permisos de la categoría';
@@ -259,7 +258,6 @@ $lang['manage sub-categories'] = 'administrar las subcategorías';
 $lang['manage'] = 'Administrar';
 $lang['maximum height'] = 'Altura máxima';
 $lang['maximum width'] = 'Anchura máxima';
-$lang['name'] = 'nombre';
 $lang['nbm_background_treatment_redirect_second'] = 'Ser sobrepasado el tiempo de ejecución, el tratamiento debe continuar [el Tiempo estimado: %d el segundo].';
 $lang['nbm_background_treatment_redirect_seconds'] = 'Ser sobrepasado el tiempo de ejecución, el tratamiento debe continuar [el Tiempo estimado: %d secundas].';
 $lang['nbm_break_timeout_list_user'] = 'El tiempo de preparación de la lista de los utilizadores para el envío es limitado. Otros utilizadores no son puestos en una lista.';
@@ -657,7 +655,7 @@ $lang['You are running the latest version of Piwigo.'] = 'Usted utiliza la últi
 /* TODO */ $lang['GD library is missing'] = 'GD library is missing';
 /* TODO */ $lang['conf_extents'] = 'Templates';
 /* TODO */ $lang['extend_for_templates'] = 'Extend for templates';
-/* TODO */ $lang['Replacement of original templates'] = 
+/* TODO */ $lang['Replacement of original templates'] =
  'Replacement of original templates by customized templates from template-extension subfolder';
 /* TODO */ $lang['Replacers'] = 'Replacers (customized templates)';
 /* TODO */ $lang['Original templates'] = 'Original templates';
@@ -665,4 +663,7 @@ $lang['You are running the latest version of Piwigo.'] = 'Usted utiliza la últi
 /* TODO */ $lang['Templates recorded.'] = 'Templates configuration has been recorded.';
 /* TODO */ $lang['Optimizations completed'] = 'All optimizations have been successfully completed.';
 /* TODO */ $lang['Optimizations errors'] = 'Optimizations have been completed with some errors.';
+$lang['delete this comment'] = 'Borrar este comentario';
+$lang['link_info_image'] = 'Modificar las informaciones';
+$lang['edit category informations'] = 'editar las informaciones de esta categoría';
 ?>
\ No newline at end of file
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 93c23b2ac..bdf4f74e1 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'El administrador debe activar su comentario para
 $lang['comment_user_exists'] = 'Este nombre de usuario ya existe, pruebe otro';
 $lang['comments'] = 'Comentarios';
 $lang['comments_add'] = 'Agregar comentario';
-$lang['comments_del'] = 'Borrar este comentario';
 $lang['comments_title'] = 'Comentarios de usuarios';
 $lang['created after %s (%s)'] = 'Creado después del %s (%s)';
 $lang['created before %s (%s)'] = 'creado antes del %s (%s)';
@@ -181,7 +180,6 @@ $lang['delete'] = 'Suprimir';
 $lang['descending'] = 'Descendiente';
 $lang['download'] = 'descargar';
 $lang['download_hint'] = 'descargar este fichero';
-$lang['edit category informations'] = 'editar las informaciones de esta categoría';
 $lang['edit'] = 'Editar';
 $lang['err_date'] = 'Fecha errónea';
 $lang['excluded'] = 'Excluidos';
@@ -208,7 +206,6 @@ $lang['invalid_pwd'] = 'Contraseña incorrecta !';
 $lang['language'] = 'Lengua';
 $lang['last %d days'] = '%d últimos días';
 $lang['last_page'] = 'Último';
-$lang['link_info_image'] = 'Modificar las informaciones';
 $lang['logout'] = 'Desconexión';
 $lang['mail_address'] = $lang['Email address'];
 $lang['mandatory'] = 'obligatorio';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 342d15586..3ade9d3e0 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -224,7 +224,6 @@ $lang['config'] = 'Configuration';
 $lang['confirm'] = 'confirmer';
 $lang['Date'] = 'Date';
 $lang['delete category'] = 'supprimer la catégorie';
-$lang['description'] = 'description';
 $lang['dissociate from category'] = 'dissocier de la catégorie';
 $lang['dissociate from group'] = 'dissocier du groupe';
 $lang['edit category permissions'] = 'Modifier les permissions de la catégorie';
@@ -259,7 +258,6 @@ $lang['manage sub-categories'] = 'gérer les sous-catégories';
 $lang['manage'] = 'Gérer';
 $lang['maximum height'] = 'hauteur maximum';
 $lang['maximum width'] = 'largeur maximum';
-$lang['name'] = 'nom';
 $lang['nbm_background_treatment_redirect_second'] = 'Le temps d\'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d second].';
 $lang['nbm_background_treatment_redirect_seconds'] = 'Le temps d\'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d secondes].';
 $lang['nbm_break_timeout_list_user'] = 'Le temps de préparation de la liste des utilisateurs pour l\'envoi est limité. Les autres utilisateurs ne sont pas listés.';
@@ -651,7 +649,7 @@ $lang['Hits'] = 'Utilisations';
 $lang['GD library is missing'] = 'la bibliothèque GD est manquante';
 $lang['conf_extents'] = 'Templates (modèles)';
 $lang['extend_for_templates'] = 'Etendre les templates';
-$lang['Replacement of original templates'] = 
+$lang['Replacement of original templates'] =
  'Remplacement des templates d\'origine par vos templates adaptés du dossier template-extension';
 $lang['Replacers'] = 'Remplaçants (templates modifiés)';
 $lang['Original templates'] = 'Templates d\'origine';
@@ -659,4 +657,7 @@ $lang['Optional URL keyword'] = 'Paramètre facultatif de l\'URL';
 $lang['Templates recorded.'] = 'La configuration des templates a été enregistrée.';
 $lang['Optimizations completed'] = 'Toutes les optimisations ont été réalisées avec succès.';
 $lang['Optimizations errors'] = 'Certaines optimisations se sont terminées avec des erreurs.';
+$lang['delete this comment'] = 'supprimer ce commentaire';
+$lang['link_info_image'] = 'Modifier les informations';
+$lang['edit category informations'] = 'éditer les informations de cette catégorie';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index b98c0ac0d..4bebd5e4e 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Un administrateur doit valider votre commentaire
 $lang['comment_user_exists'] = 'Ce nom d\'utilisateur est déjà pris';
 $lang['comments'] = 'Commentaires';
 $lang['comments_add'] = 'Ajouter un commentaire';
-$lang['comments_del'] = 'Supprimer ce commentaire';
 $lang['comments_title'] = 'Commentaires des utilisateurs';
 $lang['created after %s (%s)'] = 'créée après le %s (%s)';
 $lang['created before %s (%s)'] = 'créée avant le %s (%s)';
@@ -181,7 +180,6 @@ $lang['delete'] = 'Supprimer';
 $lang['descending'] = 'décroissant';
 $lang['download'] = 'télécharger';
 $lang['download_hint'] = 'télécharger ce fichier';
-$lang['edit category informations'] = 'éditer les informations de cette catégorie';
 $lang['edit'] = 'éditer';
 $lang['err_date'] = 'date erronée';
 $lang['excluded'] = 'exclus';
@@ -208,7 +206,6 @@ $lang['invalid_pwd'] = 'Mot de passe invalide !';
 $lang['language'] = 'Langue';
 $lang['last %d days'] = '%d derniers jours';
 $lang['last_page'] = 'Dernière';
-$lang['link_info_image'] = 'Modifier les informations';
 $lang['logout'] = 'Déconnexion';
 $lang['mail_address'] = $lang['Email address'];
 $lang['mandatory'] = 'obligatoire';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index a02dfbf10..75380021d 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -224,7 +224,6 @@ $lang['config'] = 'Configurazione';
 $lang['confirm'] = 'Confermare';

 $lang['Date'] = 'Data';

 $lang['delete category'] = 'cancellare la categoria';

-$lang['description'] = 'descrizione';

 $lang['dissociate from category'] = 'dissociare la categoria';

 $lang['dissociate from group'] = 'dissociare dal gruppo';

 $lang['edit category permissions'] = 'Modificare i permessi della categoria';

@@ -259,7 +258,6 @@ $lang['manage sub-categories'] = 'gestire le sottocategorie';
 $lang['manage'] = 'Gestire';

 $lang['maximum height'] = 'altezza massima';

 $lang['maximum width'] = 'larghezza massima';

-$lang['name'] = 'nome';

 $lang['nbm_background_treatment_redirect_second'] = 'Il tempo di esecuzione è scaduto, il trattamento deve continuare [Tempo stimato: %d secondo].';

 $lang['nbm_background_treatment_redirect_seconds'] = 'Il tempo di esecuzione è scaduto, il trattamento deve continuare [Tempo stimato: %d secondi].';

 $lang['nbm_break_timeout_list_user'] = 'Il tempo di preparazione della lista degli utenti per l\'invio email è limitato. Gli altri utenti non sono elencati';

@@ -651,7 +649,7 @@ $lang['Hits'] = 'Uso';
 $lang['GD library is missing'] = 'la biblioteca GD è manquante';

 $lang['conf_extents'] = 'Templates (modelli)';

 $lang['extend_for_templates'] = 'Estendere i templates';

-$lang['Replacement of original templates'] = 

+$lang['Replacement of original templates'] =

  'Sostitizione dei templates d\'origine con i vostri templates personalizzati dalla sotto directory template-extension';

 $lang['Replacers'] = 'Sostituzione (templates personalizzati)';

 $lang['Original templates'] = 'Templates d\'origine';

@@ -659,4 +657,7 @@ $lang['Optional URL keyword'] = 'Parametro facultativo del\'URL';
 $lang['Templates recorded.'] = 'La configurazione dei templates è stata registrata.';

 $lang['Optimizations completed'] = 'Ottimizzazioni realissate correttamente.';

 $lang['Optimizations errors'] = 'Ottimizzazioni concluse con errori.';

+$lang['delete this comment'] = 'cancellare commenti';

+$lang['link_info_image'] = 'Modifica le informazioni';

+$lang['edit category informations'] = 'Modificare le informazioni della categoria';

 ?>
\ No newline at end of file
diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php
index 61b41ca41..68199ed55 100644
--- a/language/it_IT/common.lang.php
+++ b/language/it_IT/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Un amministratore deve autorizzare il tuo commen
 $lang['comment_user_exists'] = 'Questo nome utente esiste già';

 $lang['comments'] = 'Commenti';

 $lang['comments_add'] = 'Aggiunti un commento';

-$lang['comments_del'] = 'Cancellare commenti';

 $lang['comments_title'] = 'Commenti degli utenti';

 $lang['created after %s (%s)'] = 'creata dopo il %s (%s)';

 $lang['created before %s (%s)'] = 'creata prima del %s (%s)';

@@ -181,7 +180,6 @@ $lang['delete'] = 'Cancellare';
 $lang['descending'] = 'discendente';

 $lang['download'] = 'Scaricare';

 $lang['download_hint'] = 'Scaricare questo file';

-$lang['edit category informations'] = 'Modificare le informazioni della categoria';

 $lang['edit'] = 'modificare';

 $lang['err_date'] = 'data errata';

 $lang['excluded'] = 'Escluso';

@@ -208,7 +206,6 @@ $lang['invalid_pwd'] = 'Password non valida !';
 $lang['language'] = 'Lingua';

 $lang['last %d days'] = 'Ultimi %d giorni';

 $lang['last_page'] = 'Ultima';

-$lang['link_info_image'] = 'Modifica le informazioni';

 $lang['logout'] = 'Logout';

 $lang['mail_address'] = $lang['Email address'];

 $lang['mandatory'] = 'obbligatorio';

diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 3b4fcdd2f..adf7e22e0 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -224,7 +224,6 @@ $lang['config'] = 'Configuratie';
 $lang['confirm'] = 'bevestig';
 $lang['Date'] = 'Datum';
 $lang['delete category'] = 'verwijder categorie';
-$lang['description'] = 'omschrijving';
 $lang['dissociate from category'] = 'verwijder link naar categorie';
 $lang['dissociate from group'] = 'verwijder link naar groep';
 $lang['edit category permissions'] = 'bewerk categorie rechten';
@@ -259,7 +258,6 @@ $lang['manage sub-categories'] = 'beheer sub-categorie';
 $lang['manage'] = 'Beheren';
 $lang['maximum height'] = 'maximale hoogte';
 $lang['maximum width'] = 'maximale breedte';
-$lang['name'] = 'naam';
 $lang['nbm_background_treatment_redirect_second'] = 'Executie tijd is om, treatment moet verder gaan [Verwachte tijd: %d seconden].';
 $lang['nbm_background_treatment_redirect_seconds'] = 'Executie tijd is om, treatment moet verder gaan [Verwachte tijd: %d seconden].';
 $lang['nbm_break_timeout_list_user'] = 'Verwachte tijd voor de gebruikerslijst voor een mailing is gelimiteerd. Andere gebruikers staan niet op de lijst.';
@@ -657,7 +655,7 @@ $lang['You are running the latest version of Piwigo.'] = 'Je hebt de laatste ver
 /* TODO */ $lang['GD library is missing'] = 'GD library is missing';
 /* TODO */ $lang['conf_extents'] = 'Templates';
 /* TODO */ $lang['extend_for_templates'] = 'Extend for templates';
-/* TODO */ $lang['Replacement of original templates'] = 
+/* TODO */ $lang['Replacement of original templates'] =
  'Replacement of original templates by customized templates from template-extension subfolder';
 /* TODO */ $lang['Replacers'] = 'Replacers (customized templates)';
 /* TODO */ $lang['Original templates'] = 'Original templates';
@@ -665,4 +663,7 @@ $lang['You are running the latest version of Piwigo.'] = 'Je hebt de laatste ver
 /* TODO */ $lang['Templates recorded.'] = 'Templates configuration has been recorded.';
 /* TODO */ $lang['Optimizations completed'] = 'All optimizations have been successfully completed.';
 /* TODO */ $lang['Optimizations errors'] = 'Optimizations have been completed with some errors.';
+$lang['delete this comment'] = 'verwijder dit commentaar';
+$lang['link_info_image'] = 'Aanpassen informatie';
+$lang['edit category informations'] = 'bewerk categorie informatie';
 ?>
\ No newline at end of file
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 6d2fba933..36f132852 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Een beheerder moet je commentaar goedkeuren voor
 $lang['comment_user_exists'] = 'Deze gebruikersnaam is al in gebruik';
 $lang['comments'] = 'Commentaar';
 $lang['comments_add'] = 'voeg commentaar toe';
-$lang['comments_del'] = 'verwijder dit commentaar';
 $lang['comments_title'] = 'Commentaar van gebruikers van deze website';
 $lang['created after %s (%s)'] = 'Gemaakt na %s (%s)';
 $lang['created before %s (%s)'] = 'Gemaakt voor %s (%s)';
@@ -181,7 +180,6 @@ $lang['delete'] = 'Verwijderen';
 $lang['descending'] = 'descending';
 $lang['download'] = 'download';
 $lang['download_hint'] = 'download dit bestand';
-$lang['edit category informations'] = 'bewerk categorie informatie';
 $lang['edit'] = 'bewerk(en)';
 $lang['err_date'] = 'verkeerde datum';
 $lang['excluded'] = 'uitsluiten';
@@ -208,7 +206,6 @@ $lang['invalid_pwd'] = 'Verkeerd wachtwoord!';
 $lang['language']='Taal';
 $lang['last %d days'] = 'laaste %d dagen';
 $lang['last_page'] = 'Laatste';
-$lang['link_info_image'] = 'Aanpassen informatie';
 $lang['logout'] = 'Loguit';
 $lang['mail_address'] = 'E-mail adres';
 $lang['mandatory'] = 'verplicht';
diff --git a/template/yoga/comment_list.tpl b/template/yoga/comment_list.tpl
index 320f79717..e891b6d41 100644
--- a/template/yoga/comment_list.tpl
+++ b/template/yoga/comment_list.tpl
@@ -13,7 +13,7 @@
 			<ul class="actions" style="float:right">
 				{if isset($comment.U_DELETE)}
 				<li>
-					<a href="{$comment.U_DELETE}" title="{'comments_del'|@translate}">
+					<a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}">
 						<img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[delete]" />
 					</a>
 				</li>