12 files changed, 78 insertions, 14 deletions
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index c9b2abe13..d231d2798 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -634,5 +634,15 @@ $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders pe
 $lang['plugins_server_error'] = 'Can\'t connect to server.';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Purge compiled templates'] = 'Purge compiled templates';
-/* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
+$lang['Caddie is currently empty'] = 'Caddie is currently empty';
+$lang['conf_upload_title'] = 'Upload';
+$lang['Show upload link every time'] = 'Show upload link every time';
+$lang['User access level to upload'] = 'User access level to upload';
+$lang['ACCESS_0'] = 'Free access';
+$lang['ACCESS_1'] = 'Access to all';
+$lang['ACCESS_2'] = 'Access to subscribed';
+$lang['ACCESS_3'] = 'Access to administrators';
+$lang['ACCESS_4'] = 'Access to webmasters';
+$lang['ACCESS_5'] = 'No access';
+
 ?>
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 43c78de97..e8abb3d3a 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -306,7 +306,6 @@ $lang['title_send_mail'] = 'A comment on your site';
 $lang['today'] = 'today';
 $lang['update_rate'] = 'Update your rating';
 $lang['update_wrong_dirname'] = 'wrong filename';
-$lang['upload_advise'] = 'Choose an image to place in the category : ';
 $lang['upload_advise_filesize'] = 'the filesize of the picture must not exceed : ';
 $lang['upload_advise_filetype'] = 'the picture must be to the fileformat jpg, gif or png';
 $lang['upload_advise_height'] = 'the height of the picture must not exceed : ';
@@ -364,4 +363,6 @@ $lang['%d element are also linked to current tags'] = '%d image is also linked t
 $lang['%d elements are also linked to current tags'] = '%d images are also linked to current tags';
 $lang['See elements linked to this tag only'] = 'See images linked to this tag only';
 $lang['elements posted during the last %d days'] = 'images posted during the last %d days';
+$lang['Choose an image'] = 'Choose an image';
+
 ?>
diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html
index c722be2e4..cb9f1f7c0 100644
--- a/language/en_UK/help/configuration.html
+++ b/language/en_UK/help/configuration.html
@@ -34,8 +34,6 @@ page.</li>
 
   <li><strong>Email admins when a new user registers</strong>: Administrators will be received mail for each registration.</li>
 
-  <li><strong>Email adminis when a picture is uploaded</strong>: Administrators will be received mail for each picture uploaded by a user.</li>
-
 </ul>
 
 <h3>History</h3>
@@ -78,6 +76,13 @@ User comments validation takes place in the screen <span class="pwgScreen">Admin
 
 </ul>
 
+<!--TODO --><h3>Upload</h3>
+<ul>
+<!--TODO -->  <li><strong>Show upload link every time</strong>: If exists uploadeable categories, add link will be show for each categoy.</li>
+<!--TODO -->  <li><strong>User access level to upload</strong>: Allows to restrict upload by users</li>
+  <li><strong>Email adminis when a picture is uploaded</strong>: Administrators will be received mail for each picture uploaded by a user.</li>
+</ul>
+
 <h3>Default display</h3>
 
 <p>Here you can change display options used by default, when guest is not
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index acee9a7bf..fadce5427 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -639,5 +639,15 @@ $lang['plugins_check_chmod'] = 'Verifique los autorizaciones del expediente " pl
 $lang['plugins_server_error'] = 'Imposible conectarse al servidor.';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Purge compiled templates'] = 'Purgar el templates compilado';
-$lang['Caddie is currently empty'] = 'Caddie is currently empty';
+/* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
+/* TODO */ $lang['conf_upload_title'] = 'Upload';
+/* TODO */ $lang['Show upload link every time'] = 'Show upload link every time';
+/* TODO */ $lang['User access level to upload'] = 'User access level to upload';
+/* TODO */ $lang['ACCESS_0'] = 'Free access';
+/* TODO */ $lang['ACCESS_1'] = 'Access to all';
+/* TODO */ $lang['ACCESS_2'] = 'Access to subscribed';
+/* TODO */ $lang['ACCESS_3'] = 'Access to administrators';
+/* TODO */ $lang['ACCESS_4'] = 'Access to webmasters';
+/* TODO */ $lang['ACCESS_5'] = 'No access';
+
 ?>
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 99d1ac42d..96d4a8a5f 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -306,7 +306,6 @@ $lang['title_send_mail'] = 'Una opinión sobre esta pagina';
 $lang['today'] = 'hoy';
 $lang['update_rate'] = 'Actualizar nota';
 $lang['update_wrong_dirname'] = 'Mal nombre de repertorio';
-$lang['upload_advise'] = 'Elegir una imagen para agregar en esta categoría : ';
 $lang['upload_advise_filesize'] = 'El peso de la imagen debe sobrepasar : ';
 $lang['upload_advise_filetype'] = 'El tamaño de la imagen debe ser jpg, png ou gif';
 $lang['upload_advise_height'] = 'La altura de la imagen no debe sobrepasar : ';
@@ -364,4 +363,6 @@ $lang['%d element are also linked to current tags'] = '%d imagen es también vin
 $lang['%d elements are also linked to current tags'] = '%d imagenes son igualmente vinculadas a los tags corrientes';
 $lang['See elements linked to this tag only'] = 'Ver las imágenes relacionadas únicamente a este tag';
 $lang['elements posted during the last %d days'] = 'esta imagen tiene menos de %d dias';
+$lang['Choose an image'] = 'Elegir una imagen';
+
 ?>
diff --git a/language/es_ES/help/configuration.html b/language/es_ES/help/configuration.html
index 1623b3365..f2aa3d1fe 100644
--- a/language/es_ES/help/configuration.html
+++ b/language/es_ES/help/configuration.html
@@ -24,8 +24,6 @@ cass="filename">include/config_default.inc.php</span></p>
 
   <li><strong>Permitir el registro de los utilizadores</strong>: La inscripción es libre para ellos todos.</li>
 
-  <li><strong>Notificar a los administradores cuando una imagen es cargada</strong>: Los administradores recibirán un courriel a cada imagen puesto en disposición por un utilizador.</li>
-
 </ul>
 
 <h3>Reseña histórica</h3>
@@ -62,6 +60,13 @@ La validación de los comentarios utilizadores se efectua en la pantalla <span c
 
 </ul>
 
+<!--TODO --><h3>Upload</h3>
+<ul>
+<!--TODO -->  <li><strong>Show upload link every time</strong>: If exists uploadeable categories, add link will be show for each categoy.</li>
+<!--TODO -->  <li><strong>User access level to upload</strong>: Allows to restrict upload by users</li>
+  <li><strong>Notificar a los administradores cuando una imagen es cargada</strong>: Los administradores recibirán un courriel a cada imagen puesto en disposición por un utilizador.</li>
+</ul>
+
 <h3>Fijación por defecto</h3>
 <p>Modificar las opciones de fijación por defecto: para los visitadores no conectados. Una vez conectado, estas opciones son sobrecargadas por las del utilizador, a las que puede modificar en la pantalla <span
 class="pwgScreen">perfila</span>.</p>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index b13c81b10..76f241bee 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -635,4 +635,14 @@ $lang['plugins_server_error'] = 'Impossible de se connecter au serveur.';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Purge compiled templates'] = 'Purger les templates compilés';
 $lang['Caddie is currently empty'] = 'Le panier est actuellement vide.';
+$lang['conf_upload_title'] = 'Téléchargement';
+$lang['Show upload link every time'] = 'Afficher le lien d\'ajout d\'image tout le temps';
+$lang['User access level to upload'] = 'Niveau d\'accès utilisateur pour télécharger';
+$lang['ACCESS_0'] = 'Accès libre';
+$lang['ACCESS_1'] = 'Accès à tous';
+$lang['ACCESS_2'] = 'Accès aux inscrits';
+$lang['ACCESS_3'] = 'Accès aux administrateurs';
+$lang['ACCESS_4'] = 'Accès aux webmestres';
+$lang['ACCESS_5'] = 'Pas d\'accès';
+
 ?>
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 06af0ee76..af5aed3d5 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -306,7 +306,6 @@ $lang['title_send_mail'] = 'Un commentaire sur le site';
 $lang['today'] = 'aujourd\'hui';
 $lang['update_rate'] = 'Mettre à jour votre note';
 $lang['update_wrong_dirname'] = 'mauvais nom de répertoire';
-$lang['upload_advise'] = 'Choisir une image à ajouter dans cette catégorie : ';
 $lang['upload_advise_filesize'] = 'le poids de l\'image ne doit dépasser : ';
 $lang['upload_advise_filetype'] = 'le format de l\'image doit être jpg, png ou gif';
 $lang['upload_advise_height'] = 'la hauteur de l\'image ne doit pas dépasser : ';
@@ -364,4 +363,6 @@ $lang['%d element are also linked to current tags'] = '%d image est également l
 $lang['%d elements are also linked to current tags'] = '%d images sont également liées aux tags courants';
 $lang['See elements linked to this tag only'] = 'Voir les images liées uniquement à ce tag';
 $lang['elements posted during the last %d days'] = 'images ajoutées au cours de %d derniers jours';
+$lang['Choose an image'] = 'Choisir une image à ajouter';
+
 ?>
diff --git a/language/fr_FR/help/configuration.html b/language/fr_FR/help/configuration.html
index 4f2a9f3d7..086b78e40 100644
--- a/language/fr_FR/help/configuration.html
+++ b/language/fr_FR/help/configuration.html
@@ -34,8 +34,6 @@ galerie.</li>
 
   <li><strong>Notifier les administrateurs lors de l'inscription d'un utilisateur</strong>: Les administrateurs recevront un courriel à chaque inscription.</li>
 
-  <li><strong>Notifier les administrateurs quand une image est téléchargée</strong>: Les administrateurs recevront un courriel à chaque image mis à disposition par un utilisateur.</li>
-
 </ul>
 
 <h3>Historique</h3>
@@ -78,6 +76,13 @@ La validation des commentaires utilisateurs a lieu dans l'écran <span class="pw
 
 </ul>
 
+<h3>Téléchargement</h3>
+<ul>
+  <li><strong>Afficher le lien d'ajout d'image tout le temps</strong>: S'il existe des catégories permettant le téléchargement, le lien d'ajout d'image sera affiché quelque soit la catégorie.</li>
+  <li><strong>Niveau d'accès utilisateur pour télécharger</strong>: Permet de restreindre l'ajout à certains utilisateurs</li>
+  <li><strong>Notifier les administrateurs quand une image est téléchargée</strong>: Les administrateurs recevront un courriel à chaque image mis à disposition par un utilisateur.</li>
+</ul>
+
 <h3>Affichage par défaut</h3>
 <p>Modifier les options d'affichage par défaut: pour les visiteurs non
 connectés. Une fois connecté, ces options sont surchargées par celles de
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index cc05317a8..02bb2c522 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -643,4 +643,14 @@ $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 /* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates';
 /* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
+/* TODO */ $lang['conf_upload_title'] = 'Upload';
+/* TODO */ $lang['Show upload link every time'] = 'Show upload link every time';
+/* TODO */ $lang['User access level to upload'] = 'User access level to upload';
+/* TODO */ $lang['ACCESS_0'] = 'Free access';
+/* TODO */ $lang['ACCESS_1'] = 'Access to all';
+/* TODO */ $lang['ACCESS_2'] = 'Access to subscribed';
+/* TODO */ $lang['ACCESS_3'] = 'Access to administrators';
+/* TODO */ $lang['ACCESS_4'] = 'Access to webmasters';
+/* TODO */ $lang['ACCESS_5'] = 'No access';
+
 ?>
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 40c338d9a..4f20be252 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -306,7 +306,6 @@ $lang['title_send_mail'] = 'commentaar op je site';
 $lang['today'] = 'vandaag';
 $lang['update_rate'] = 'Werk je beoordeling bij';
 $lang['update_wrong_dirname'] = 'verkeerde bestandsnaam';
-$lang['upload_advise'] = 'Kies een afbeelding om in een categorie te plaatsen : ';
 $lang['upload_advise_filesize'] = 'het bestandsformaat mag niet te groot zijn : ';
 $lang['upload_advise_filetype'] = 'de afbeelding moet een extensie hebbben die eindigt op jpg, gif of png';
 $lang['upload_advise_height'] = 'de hoogte van de afbeelding mag niet te groot zijn : ';
@@ -364,4 +363,6 @@ $lang['%d element are also linked to current tags'] = '%d image are also linked
 $lang['%d elements are also linked to current tags'] = '%d images are also linked to current tags';
 $lang['See elements linked to this tag only'] = 'Toon afbeelding gelinkt met deze tag';
 $lang['elements posted during the last %d days'] = 'afbeelding binnen de %d dagen';
+$lang['Choose an image'] = 'Kies een afbeelding om';
+
 ?>
diff --git a/language/nl_NL/help/configuration.html b/language/nl_NL/help/configuration.html
index 86ab7e6ec..78cd24169 100644
--- a/language/nl_NL/help/configuration.html
+++ b/language/nl_NL/help/configuration.html
@@ -27,8 +27,6 @@ configuratieparameters die zouden moeten zijn genoeg voor de overgrote meerderhe
 
   <li><strong>Email admins wanneer een nieuwe gebruiker zich registreerd</strong>: Administrators ontvangen een mailtje bij elke registratie.</li>
 
-  <li><strong>Email admins wanneer een afbeelding is ge-upload</strong>: Administrators ontvangen een mailtje voor elke ge-uploade bestand door gebruikers.</li>
-
 </ul>
 
 <h3>Geschiedenis</h3>
@@ -64,6 +62,13 @@ Gebruikers commentaar valideren gaat via het scherm <span class="pwgScreen">Admi
 
 </ul>
 
+<!--TODO --><h3>Upload</h3>
+<ul>
+<!--TODO -->  <li><strong>Show upload link every time</strong>: If exists uploadeable categories, add link will be show for each categoy.</li>
+<!--TODO -->  <li><strong>User access level to upload</strong>: Allows to restrict upload by users</li>
+  <li><strong>Email admins wanneer een afbeelding is ge-upload</strong>: Administrators ontvangen een mailtje voor elke ge-uploade bestand door gebruikers.</li>
+</ul>
+
 <h3>Standaard weergave</h3>
 
 <p>Hier kan je de weergave aan passen die als standaard worden ingesteld, die je gast ziet als hij zich niet heeft aangemeld. Eenmaal aangemeld worden deze