diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index fef86a6e9..e250bd713 100755 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -196,6 +196,7 @@ $lang['Basic settings'] = 'Basic settings'; $lang['Batch Manager'] = 'Batch Manager'; $lang['between'] = "between"; $lang['between %d and %d pixels'] = 'between %d and %d pixels'; +$lang['between %d and %d'] = 'between %d and %d'; $lang['between %.2f and %.2f'] = 'between %.2f and %.2f'; $lang['bottom left corner'] = 'bottom left corner'; $lang['bottom right corner'] = 'bottom right corner'; @@ -1279,7 +1280,6 @@ $lang['No search in progress'] = 'No search in progress'; $lang['Create a new album at root'] = 'Create a new album at root'; $lang['Create a sub-album of "%s"'] = 'Create a sub-album of "%s"'; $lang['No research in progress'] = 'No research in progress'; - $lang['Visited'] = 'Visited'; $lang['Downloaded'] = 'Downloaded'; $lang['Additional filters'] = 'Additional filters'; @@ -1289,7 +1289,6 @@ $lang['Add as filter'] = 'Add as filter'; $lang['Show plugins compatible with previous version of Piwigo'] = 'Show plugins compatible with previous version of Piwigo'; $lang['Place first'] = 'Place first'; $lang['Place last'] = 'Place last'; - $lang['Piwigo is also on mobile.'] = 'Piwigo is also on mobile.'; $lang['Try now !'] = 'Try now!'; $lang['Install Piwigo on mobile'] = 'Install Piwigo on mobile'; @@ -1351,6 +1350,31 @@ $lang['Activate button "%s"'] = 'Activate button "%s"'; $lang['Detect and avoid duplicates during upload'] = 'Detect and avoid duplicates during upload'; $lang['During upload, if Piwigo detects the photo already exists, associate the existing photo to the destination album, without duplicating file'] = 'During upload, if Piwigo detects the photo already exists, associate the existing photo to the destination album, without duplicating file'; $lang['%d files'] = "%d files"; +$lang['Auto-update'] = 'Auto-update'; +$lang['Core'] = 'Core'; +$lang['System Activities'] = 'System Activities'; $lang['Shrink'] = 'Shrink'; $lang['Expand'] = 'Expand'; -// Leave this line empty \ No newline at end of file +$lang['Image'] = 'Image'; +$lang['was succesfully deleted'] = 'was succesfully deleted'; +$lang['Who can see ?'] = 'Who can see ?'; +$lang['level of confidentiality'] = 'level of confidentiality'; +$lang['You have unsaved changes'] = 'You have unsaved changes'; +$lang['Changes saved'] = 'Changes saved'; +$lang['An error has occured'] = 'An error has occured'; +$lang['image(s) contains unsaved changes'] = 'image(s) contains unsaved changes'; +$lang['Pagination has changed and needs to be reloaded !'] = 'Pagination has changed and needs to be reloaded !'; +$lang['Metadata sync complete'] = 'Metadata sync complete'; +$lang['Save'] = 'Save'; +$lang['Creation mode'] = 'Creation mode'; +$lang['Create and select'] = 'Create and select'; +$lang['Add a sub-album to “%s”'] = 'Add a sub-album to “%s”'; +$lang['Activate create mode to create and select an album'] = 'Activate create mode to create and select an album'; +$lang['Name field must not be empty'] = 'Name field must not be empty'; +$lang['Create a root album'] = 'Create a root album'; +$lang['Create your first album'] = 'Create your first album'; +$lang['First choose an album, then add your files'] = 'First choose an album, then add your files'; +$lang['Select or create an album'] = 'Select or create an album'; +$lang['List'] = 'List'; +$lang['Added on %s'] = 'Added on %s'; +// Leave this line empty diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index 015055747..6b58c1547 100755 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -443,4 +443,10 @@ $lang['%d visits'] = '%d visits'; $lang['rating score %s'] = 'rating score %s'; $lang['year %d'] = 'year %d'; $lang['last 3 months'] = 'Last 3 months'; -$lang['last 24 hours'] = 'last 24 hours'; \ No newline at end of file +$lang['last 24 hours'] = 'last 24 hours'; +$lang['Album already selected'] = 'Album already selected'; +$lang['Only the first %d albums are displayed, out of %d.'] = 'Only the first %d albums are displayed, out of %d.'; +$lang['Pages'] = "Pages"; +$lang['The PDF you requested is too large to display on this page.']= 'The PDF you requested is too large to display on this page.'; +$lang['Click here to display it']= 'Click here to display it'; + diff --git a/language/en_UK/help/help_add_photos.html b/language/en_UK/help/help_add_photos.html index 8fdd865a5..437daee1d 100644 --- a/language/en_UK/help/help_add_photos.html +++ b/language/en_UK/help/help_add_photos.html @@ -25,3 +25,5 @@

Go to FTP

+ +

For more information on adding photos to Piwigo, read the dedicated article in our online documentation: Importing photos into Piwigo.

diff --git a/language/en_UK/help/help_groups.html b/language/en_UK/help/help_groups.html index aed7d7a8e..37ecdc4a5 100644 --- a/language/en_UK/help/help_groups.html +++ b/language/en_UK/help/help_groups.html @@ -9,3 +9,5 @@ Manage.

interdiction : if user "jack" belongs to groups "family" and "friends", and that only group "family" can see album "Christmas 2010" album then "jack" will be able to see "Christmas 2010".

+ +

To find out more about user groups, see the dedicated article in our online documentation: User groups.

\ No newline at end of file diff --git a/language/en_UK/help/help_permissions.html b/language/en_UK/help/help_permissions.html index cc034e0e4..ebcbddf79 100644 --- a/language/en_UK/help/help_permissions.html +++ b/language/en_UK/help/help_permissions.html @@ -1,57 +1,16 @@
Permissions on albums -

If privacy levels do not fit your needs, you can also manage permissions on albums for a user or a group. You can manage permissions on photos and albums at the same time, without conflict.

+

The simplest and most common way of managing access rights to photos is to use album permissions.

-

You can forbid access to albums. Switch the album access type to -"private" if you want to manage permissions.

+

To find out how album permissions work, read the dedicated article in our online documentation: Permissions and album visibility.

-

You can set a album to private by editing a single album -(Administration » Albums » Manage -» edit) or by setting options to your whole album tree -(Administration » Albums » -Properties » Public / Private).

- -

Once the album is private, you can manage permissions for groups and -users with 3 screens:

- -
-
Permissions on photos -

Each photo has a privacy level (a lock). Each user also has a privacy level (a key). There are 5 privacy levels:

-
    -
  1. None
    2. -
  2. Contacts
    3. -
  3. Friends (which is higher than a contact)
    4. -
  4. Family (which is higher than a friend)
    5. -
  5. Admins (which is higher than any other level)
    6. -
+

If you're not happy with permissions per album, you can also manage permissions per photo using confidentiality levels. You can manage permissions by photo and by album at the same time, without conflict.

-

Higher levels have permissions on lower levels. For a given user, the higher the privacy level, the more photos he can see.

- -

For example, if photo "peter_wedding-0024.jpg" has "Family" privacy level, then:

- - -

A user that has no permission to see the content of a album won't see the album itself, not even its title. The same principle applies to a tag.

- -

You can set the privacy level of a user on Administration » Users » Manage screen.

+

To find out how to set and use photo confidentiality levels, see the dedicated article in our online documentation: Privacy levels.

diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 08aa0c2c7..07d1c20e7 100755 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -356,7 +356,7 @@ $lang['synchronize files metadata with database photos informations'] = 'Synchro $lang['even already synchronized photos'] = "Même les photos déjà synchronisées"; $lang['Used metadata'] = "Méta-données employées"; $lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = "Le nom des répertoires et des fichiers ne doit être constitué que de lettres, de chiffres, de \"-\", \"_\" et \".\""; -$lang['wrong filename'] = 'nom de fichier en erreur'; +$lang['wrong filename'] = "nom de fichier erroné"; $lang['Upload'] = "Ajout"; $lang['user "%s" added'] = "utilisateur \"%s\" ajouté"; $lang['User status'] = "Statut de l'utilisateur"; @@ -913,6 +913,7 @@ $lang['View in gallery'] = 'Voir dans la galerie'; $lang['Number of albums per page'] = 'Nombre d\'albums par page'; $lang['Ratio'] = 'Ratio'; $lang['between %d and %d pixels'] = 'entre %d et %d pixels'; +$lang['between %d and %d'] = 'entre %d et %d'; $lang['between %.2f and %.2f'] = 'entre %.2f et %.2f'; $lang['Manage the members'] = 'Gérer les membres'; $lang['Type here the name of the new group'] = 'Inscrivez ici le nom du nouveau groupe'; @@ -1302,7 +1303,7 @@ $lang['Discover'] = 'Découvrir'; $lang['Latest Piwigo news'] = 'Dernière nouvelle de Piwigo'; $lang['Understood, do not show again'] = 'Compris, ne plus afficher'; $lang['%s pixels, %.2f MB'] = '%s pixels, %.2f Mo'; -$lang['Upload Formats'] = 'Télécharger des formats'; +$lang['Upload Formats'] = 'Ajouter des formats'; $lang['Add formats'] = 'Ajouter des formats'; $lang['No format for this picture'] = 'Il n\'y a pas de format pour cette photo'; $lang['Add another set of formats'] = 'Ajouter un autre lot de formats'; @@ -1351,6 +1352,31 @@ $lang['Activate button "%s"'] = 'Afficher le bouton "%s"'; $lang['Detect and avoid duplicates during upload'] = 'Détecter et éviter les doublons à l\'import'; $lang['During upload, if Piwigo detects the photo already exists, associate the existing photo to the destination album, without duplicating file'] = 'Pendant l\'ajout de photo, si Piwigo détecte que la photo existe déjà, associer la photo existante à l\'album de destination, sans dupliquer le fichier.'; $lang['%d files'] = "%d fichiers"; +$lang['Auto-update'] = 'Mise à jour auto'; +$lang['Core'] = 'Noyau'; +$lang['System Activities'] = 'Activités système'; $lang['Shrink'] = 'Réduire'; $lang['Expand'] = 'Agrandir'; -// Leave this line empty \ No newline at end of file +$lang['Image'] = "L'image"; +$lang['was succesfully deleted'] = 'a été supprimée avec succès'; +$lang['Who can see ?'] = 'Qui peut voir ?'; +$lang['level of confidentiality'] = 'niveau de confidentialité'; +$lang['You have unsaved changes'] = 'Changements non sauvegardés'; +$lang['Changes saved'] = 'Changements enregistrés'; +$lang['An error has occured'] = 'Une erreur est survenue'; +$lang['image(s) contains unsaved changes'] = 'image(s) ne sont pas sauvegardées'; +$lang['Pagination has changed and needs to be reloaded !'] = "La pagination a changée et nécessite d'être rechargée !"; +$lang['Metadata sync complete'] = 'Méta-données synchronisées'; +$lang['Save'] = 'Enregistrer'; +$lang['Creation mode'] = 'Mode création'; +$lang['Create and select'] = 'Créer et sélectionner'; +$lang['Add a sub-album to “%s”'] = 'Ajouter un sous-album à “%s”'; +$lang['Activate create mode to create and select an album'] = 'Activer le mode création pour créer et sélectionner un album'; +$lang['Name field must not be empty'] = 'Le champ nom ne doit pas être vide'; +$lang['Create a root album'] = 'Créer un album racine'; +$lang['Create your first album'] = 'Créez votre premier album'; +$lang['First choose an album, then add your files'] = 'Choisissez d\'abord un album, puis ajoutez vos fichiers'; +$lang['Select or create an album'] = 'Sélectionner ou créer un album'; +$lang['List'] = 'Liste'; +$lang['Added on %s'] = 'Ajouté le %s'; +// Leave this line empty diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index f324fd141..50b3285ce 100755 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -63,7 +63,9 @@ $lang['Anti-flood system : please wait for a moment before trying to post anothe $lang['Any tag'] = 'N\'importe quel tag'; $lang['Are you sure?'] = "Etes-vous sûr ?"; $lang['ascending'] = 'croissant'; +$lang['At least one listed rule must be satisfied.'] = 'Au moins un des critères doit être satisfait.'; $lang['Author'] = 'Auteur'; +$lang['author(s) : %s'] = 'auteur(s) : %s'; $lang['Author: %s'] = 'Auteur : %s'; $lang['Auto login'] = 'Connexion auto'; $lang['available for administrators only'] = 'disponible uniquement pour les administrateurs'; @@ -134,6 +136,7 @@ $lang['display your favorites photos'] = 'afficher mes favoris'; $lang['Display'] = 'Affichage'; $lang['Download this file'] = 'Télécharger ce fichier'; $lang['Download'] = 'Télécharger'; +$lang['Each listed rule must be satisfied.'] = 'Chaque critère doit être satisfait'; $lang['Edit a comment'] = "Éditer un commentaire"; $lang['edit'] = 'éditer'; $lang['Edit'] = 'Editer'; @@ -280,9 +283,11 @@ $lang['Search for words'] = 'Recherche de mots'; $lang['Search in albums'] = 'Rechercher dans les albums'; $lang['Search in sub-albums'] = 'Rechercher dans les sous-albums'; $lang['Search results'] = 'Résultats de recherche'; +$lang['Search rules'] = 'Critères de recherche'; $lang['Search tags'] = 'Rechercher les tags'; $lang['search'] = 'recherche'; $lang['Search'] = 'Recherche'; +$lang['searched words : %s'] = 'mots recherchés : %s'; $lang['Sent by'] = 'Envoyé par'; $lang['Send my connection settings by email'] = 'Recevoir mes identifiants par email'; $lang['set as album representative'] = 'Choisir comme représentante de cet album'; @@ -340,7 +345,7 @@ $lang['You are not authorized to access the requested page'] = 'Vous n\'avez pas $lang['You will receive a link to create a new password via email.'] = 'Par email, vous recevrez un lien à cliquer pour renouveler votre mot de passe.'; $lang['Your comment has been registered'] = 'Votre commentaire a été enregistré'; $lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Votre commentaire n\'a pas été enregistré parce qu\'il ne satisfait aux règles de validation'; -$lang['Your favorites'] = 'Mes favoris'; +$lang['Your favorites'] = 'Mes favorites'; $lang['Your Gallery Customization'] = 'Personnalisation de votre affichage '; $lang['Your username has been successfully changed to : %s'] = 'Votre nom d\'utilisateur a bien été changé par : %s'; $lang['Your password has been reset'] = 'Votre mot de passe a été réinitialisé'; @@ -443,4 +448,9 @@ $lang['%d visits'] = '%d visites'; $lang['rating score %s'] = 'score %s'; $lang['year %d'] = 'année %d'; $lang['last 3 months'] = '3 derniers mois'; -$lang['last 24 hours'] = '24 dernières heures'; \ No newline at end of file +$lang['last 24 hours'] = '24 dernières heures'; +$lang['Only the first %d albums are displayed, out of %d.'] = 'Seuls les %d premiers sont affichés, sur %d.'; +$lang['Album already selected'] = 'Album déjà sélectionné'; +$lang['Pages'] = "Pages"; +$lang['The PDF you requested is too large to display on this page.']= 'Le PDF que vous avez demandé est trop volumineux pour être affiché sur cette page.'; +$lang['Click here to display it']= 'Cliquez ici pour le voir';