6 files changed, 3 insertions, 21 deletions

diff --git a/admin/include/functions_waiting.inc.php b/admin/include/functions_waiting.inc.php
index 7a00486b5..0675a0e3a 100644
--- a/admin/include/functions_waiting.inc.php
+++ b/admin/include/functions_waiting.inc.php
@@ -34,7 +34,7 @@ function waiting_tabsheet()
   $tabsheet = new tabsheet();
   // TabSheet initialization
   $tabsheet->add('comments', l10n('comments'), $link_start.'comments');
-  $tabsheet->add('upload', l10n('upload_pictures'), $link_start.'upload');
+  $tabsheet->add('upload', l10n('Pictures'), $link_start.'upload');
   // TabSheet selection
   $tabsheet->select($page['page']);
   // Assign tabsheet to template
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 884efdba6..2658ced41 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -53,7 +53,6 @@ $lang['%d waiting pictures rejected'] = '%d waiting pictures rejected';
 $lang['%d waiting pictures validated'] = '%d waiting pictures validated';
 $lang['A new version of PhpWebGallery is available.'] = 'A new version of PhpWebGallery is available.';
 $lang['Actions'] = 'Actions';
-$lang['Action: '] = 'Action: ';
 $lang['Activate'] = 'Activate';
 $lang['Add/delete a permalink'] = 'Add/delete a permalink';
 $lang['Add a tag'] = 'Add a tag';
@@ -254,7 +253,6 @@ $lang['group'] = 'group';
 $lang['group_add_error1'] = 'The name of a group must not contain " or \' or be empty.';
 $lang['group_add_error2'] = 'This name is already used by another group.';
 $lang['groups'] = 'Groups';
-$lang['history'] = 'History';
 $lang['instructions'] = 'Instructions';
 $lang['is_high_disabled'] = '';
 $lang['is_high_enabled'] = 'High definition';
@@ -346,7 +344,6 @@ $lang['nbm_info_send_recent_post_dates'] = 'Available only with HTML format';
 $lang['no_write_access'] = 'no write access';
 $lang['path'] = 'path';
 $lang['permissions'] = 'Permissions';
-$lang['permuser_info'] = 'Only private categories are listed. Private/Public category status can be set in screen "Categories > Public / Private"';
 $lang['private'] = 'private';
 $lang['properties'] = 'Properties';
 $lang['public'] = 'public';
@@ -463,7 +460,6 @@ $lang['update_used_metadata'] = 'Used metadata';
 $lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
 $lang['update_wrong_dirname_short'] = 'wrong filename';
 $lang['upload'] = 'Upload';
-$lang['upload_pictures'] = 'Pictures';
 $lang['user "%s" added'] = 'user "%s" added';
 $lang['user_status'] = 'User status';
 $lang['user_status_admin'] = 'Administrator';
@@ -510,7 +506,6 @@ $lang['Add this access definition'] = 'Add this access definition';
 $lang['Web Services availability duration in days'] = 'Web Services availability duration in days';
 $lang['Web Services under control'] = 'PhpWebGallery Web Services are fully operationals and all requests are under control.';
 $lang['special_admin_menu'] = 'Specials';
-$lang['pictures_menu'] = 'Pictures';
 $lang['Duplicates'] = 'Files with same name in more than one physical category';
 $lang['DEMO'] = 'DEMO';
 $lang['HOME'] = 'HOME';
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 1ec944ece..450ef74ab 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -253,7 +253,6 @@ $lang['group'] = 'grupo';
 $lang['group_add_error1'] = 'El nombre del grupo no debe contener "or \' y no debe estar vacío.';
 $lang['group_add_error2'] = 'Este nombre es ya utilizado por otro grupo.';
 $lang['groups'] = 'Grupos';
-$lang['history'] = 'Reseña histórica';
 $lang['instructions'] = 'Instrucciones';
 $lang['is_high_disabled'] = '';
 $lang['is_high_enabled'] = 'Alta definición';
@@ -345,7 +344,6 @@ $lang['nbm_info_send_recent_post_dates'] = 'Disponible únicamente con tamaño H
 $lang['no_write_access'] = 'ningún acceso en escritura';
 $lang['path'] = 'camino';
 $lang['permissions'] = 'Permisos';
-$lang['permuser_info'] = 'Las únicas categorías particulares son puestas en una lista.';
 $lang['private'] = 'intimidad';
 $lang['properties'] = 'Propiedades';
 $lang['public'] = 'público';
@@ -463,7 +461,6 @@ $lang['update_used_metadata'] = 'Méta-datos empleadas';
 $lang['update_wrong_dirname_info'] = 'El nombre de los repertorios y de los ficheros debe estar constituido sólo por letras, por cifras, de "-", "_" y "."';
 $lang['update_wrong_dirname_short'] = 'nombre de fichero erróneo';
 $lang['upload'] = 'Añadido';
-$lang['upload_pictures'] = 'Imágenes';
 $lang['user "%s" added'] = 'utilizador "%s" añadido';
 $lang['user_status'] = 'Estatuto del utilizador';
 $lang['user_status_admin'] = 'Administrador';
@@ -510,7 +507,6 @@ $lang['Add this access definition']= 'Añadir esta definición de acceso';
 $lang['Web Services availability duration in days'] = 'Duración de abertura de los Servicios Web en días';
 $lang['Web Services under control'] = 'Los Servicios Web de PhpWebGallery totalmente son operativos y todas las demandas son controladas.';
 $lang['special_admin_menu'] = 'Clases de matemáticas superiores';
-$lang['pictures_menu'] = 'Imágenes';
 $lang['note_check_exif'] = '%s debe ser puesto a "false" en su fichero config_local.inc.php porque el extejo no es sostenido.';
 $lang['note_check_more_info'] = 'Vaya sobre %s or %s para más informaciones.';
 $lang['note_check_more_info_forum'] = 'el foro';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 36ee740dc..40367136b 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -53,7 +53,6 @@ $lang['%d waiting pictures rejected'] = '%d images en attente rejetées';
 $lang['%d waiting pictures validated'] = '%d images en attente validées';
 $lang['A new version of PhpWebGallery is available.'] = 'Une nouvelle version de PhpWebGallery est disponible.';
 $lang['Actions'] = 'Actions';
-$lang['Action: '] = 'Action: ';
 $lang['Activate'] = 'Activer';
 $lang['Add/delete a permalink'] = 'Ajouter/effacer un lien permanent';
 $lang['Add a tag'] = 'Ajouter un tag';
@@ -254,7 +253,6 @@ $lang['group'] = 'groupe';
 $lang['group_add_error1'] = 'Le nom du groupe ne doit pas contenir " or \' et ne doit pas être vide.';
 $lang['group_add_error2'] = 'Ce nom est déjà utilisé par un autre groupe.';
 $lang['groups'] = 'Groupes';
-$lang['history'] = 'Historique';
 $lang['instructions'] = 'Instructions';
 $lang['is_high_disabled'] = '';
 $lang['is_high_enabled'] = 'Haute définition';
@@ -346,7 +344,6 @@ $lang['nbm_info_send_recent_post_dates'] = 'Disponible uniquement avec le format
 $lang['no_write_access'] = 'pas d\'accès en écriture';
 $lang['path'] = 'chemin';
 $lang['permissions'] = 'Permissions';
-$lang['permuser_info'] = 'Seules les catégories privées sont listées.';
 $lang['private'] = 'privé';
 $lang['properties'] = 'Propriétés';
 $lang['public'] = 'public';
@@ -463,7 +460,6 @@ $lang['update_used_metadata'] = 'Méta-données employées';
 $lang['update_wrong_dirname_info'] = 'Le nom des répertoires et des fichiers ne doit être constitué que de lettres, de chiffres, de "-", "_" et "."';
 $lang['update_wrong_dirname_short'] = 'nom de fichier erroné';
 $lang['upload'] = 'Ajout';
-$lang['upload_pictures'] = 'Images';
 $lang['user "%s" added'] = 'utilisateur "%s" ajouté';
 $lang['user_status'] = 'Statut de l\'utilisateur';
 $lang['user_status_admin'] = 'Administrateur';
@@ -510,7 +506,6 @@ $lang['Add this access definition']= 'Ajouter cette définition d\'accès';
 $lang['Web Services availability duration in days'] = 'Durée d\'ouverture des Services Web en jours';
 $lang['Web Services under control'] = 'Les Services Web de PhpWebGallery sont totalement operationnels et toutes les requêtes sont contrôlées.';
 $lang['special_admin_menu'] = 'Spéciales';
-$lang['pictures_menu'] = 'Images';
 $lang['Duplicates'] = 'Fichiers portant le même nom dans plusieurs catégories physiques';
 $lang['DEMO'] = 'DÉMO';
 $lang['HOME'] = 'ACCUEIL PWG';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index bfb1598fe..4bc4b8bac 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -254,7 +254,6 @@ $lang['group'] = 'groep';
 $lang['group_add_error1'] = 'De naam van de groep mag geen spatie bevatten of leeg zijn.';
 $lang['group_add_error2'] = 'Deze naam is al in gebruik door een andere groep.';
 $lang['groups'] = 'Groepen';
-$lang['history'] = 'Geschiedenis';
 $lang['instructions'] = 'Instructies';
 $lang['is_high_disabled'] = '';
 $lang['is_high_enabled'] = 'Hoge kwaliteit';
@@ -346,7 +345,6 @@ $lang['nbm_info_send_recent_post_dates'] = 'Alleen beschikbaar in HTML formaat';
 $lang['no_write_access'] = 'geen schrijftoegang';
 $lang['path'] = 'path';
 $lang['permissions'] = 'Rechten';
-$lang['permuser_info'] = 'Alleen private categorieen zijn getoond. Private/Publieke categorie status kan geregeld worden "Categorieen > Publiek / Private"';
 $lang['private'] = 'private';
 $lang['properties'] = 'Eigenschappen';
 $lang['public'] = 'publiek';
@@ -464,7 +462,6 @@ $lang['update_used_metadata'] = 'Gebruikte metadata';
 $lang['update_wrong_dirname_info'] = 'De naam van de mappen en bestanden moeten bestaan uit letters, "-", "_" of "."';
 $lang['update_wrong_dirname_short'] = 'verkeerde bestandsnaam';
 $lang['upload'] = 'Upload';
-$lang['upload_pictures'] = 'Afbeeldingen';
 $lang['user "%s" added'] = 'gebruiker "%s" toegevoegd';
 $lang['user_status'] = 'Gebruikers status';
 $lang['user_status_admin'] = 'Beheerder';
@@ -511,7 +508,6 @@ $lang['Add this access definition'] = 'Toevoegen toegangs defenitie';
 $lang['Web Services availability duration in days'] = 'Web Services beschikbaar in aantal dagen';
 $lang['Web Services under control'] = 'PhpWebGallery Web Services zijn volledig operationeel en alle verzoeken worden uitgevoerd.';
 $lang['special_admin_menu'] = 'Speciaal';
-$lang['pictures_menu'] = 'Afbeeldingen';
 $lang['note_check_exif'] = '%s moet ingesteld zijn op false in je config_local.inc.php omdat exif niet ondersteund wordt.';
 $lang['note_check_more_info'] = 'Ga naar %s of %s voor meer informatie.';
 $lang['note_check_more_info_forum'] = 'het forum';
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index df322d3cc..59dc5ed45 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -33,7 +33,7 @@
     </dd>
   </dl>
   <dl>
-    <dt>{'pictures_menu'|@translate}</dt>
+    <dt>{'Pictures'|@translate}</dt>
     <dd>
       <ul>
         <li><a href="{$U_WAITING}">{'waiting'|@translate}</a></li>
@@ -58,7 +58,7 @@
     <dt>{'special_admin_menu'|@translate}</dt>
     <dd>
       <ul>
-        <li><a href="{$U_HISTORY_STAT}">{'history'|@translate}</a></li>
+        <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
         <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced_features'|@translate}</a></li>
         {if isset($U_WS_CHECKER) }