merge -r1312:1313 from branch 1.6 to trunk (bug 373 fixed)

git-svn-id: http://piwigo.org/svn/trunk@1314 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2006-05-15 22:21:08 +00:00
commit 875a6b15c8
7 changed files with 95 additions and 36 deletions

View file

@ -110,6 +110,7 @@ $lang['Name'] = 'Name';
$lang['New name'] = 'New name';
$lang['New parent category'] = 'New parent category';
$lang['New tag'] = 'New tag';
$lang['No tag defined. Use Administration>Pictures>Tags'] = 'No tag defined. Use Administration>Pictures>Tags';
$lang['No'] = 'No';
$lang['Number of comments per page'] = 'Number of comments per page';
$lang['Number of images per row'] = 'Number of images per row';
@ -254,9 +255,8 @@ $lang['metadata_exif'] = 'EXIF';
$lang['metadata_iptc'] = 'IPTC';
$lang['name'] = 'name';
$lang['nbm_background_treatment_redirect'] = 'Execution time is out, treatment must be continue [Estmated time: %d secondes].';
$lang['nbm_redirect_msg'] = 'Processing treatment.'."\n\n".'Please wait...';
$lang['nbm_repost_submit'] = 'Continue processing treatment';
$lang['nbm_break_timeout_list_user'] = 'Prepared time for list of users to send mail is limited. Others users are not listed.';
$lang['nbm_break_timeout_send_mail'] = 'Time to send mail is limited. Others mails are skipped.';
$lang['nbm_col_check_user_send_mail'] = 'To send ?';
$lang['nbm_col_last_send'] = 'Last send';
$lang['nbm_col_mail'] = 'email';
@ -280,7 +280,6 @@ $lang['nbm_msg_error_sending_email_to'] = 'Error when sending email to %s [%s].'
$lang['nbm_msg_mail_sent_to'] = 'Mail sent to %s [%s].';
$lang['nbm_msg_n_mails_sent'] = '%d mails were sent.';
$lang['nbm_msg_no_mail_to_send'] = '%d mails were not sent.';
$lang['nbm_break_timeout_send_mail'] = 'Time to send mail is limited. Others mails are skipped.';
$lang['nbm_no_mail_to_send'] = 'No mail to send.';
$lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.';
$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if there are new elements to notify.';
@ -290,6 +289,8 @@ $lang['nbm_object_news'] = 'New elements added';
$lang['nbm_object_subcribe'] = 'Subcribe to notification by mail';
$lang['nbm_object_unsubcribe'] = 'Unsubcribe from notification by mail';
$lang['nbm_param_mode'] = 'Parameter';
$lang['nbm_redirect_msg'] = 'Processing treatment.'."\n\n".'Please wait...';
$lang['nbm_repost_submit'] = 'Continue processing treatment';
$lang['nbm_send_check_all'] = 'Check All';
$lang['nbm_send_complementary_mail_content'] = 'Complementary mail content';
$lang['nbm_send_detailed_content'] = 'Send detailed content';

View file

@ -111,6 +111,7 @@ $lang['Name'] = 'Nom';
$lang['New name'] = 'Nouveau nom';
$lang['New parent category'] = 'Nouvelle catégorie parente';
$lang['New tag'] = 'Nouveau tag';
$lang['No tag defined. Use Administration>Pictures>Tags'] = 'Aucun tag défini. Utiliser l\'écran Adminstration>Images>Tags';
$lang['No'] = 'Non';
$lang['Number of comments per page'] = 'Nombre de commentaires utilisateur par page';
$lang['Number of images per row'] = 'Nombre de miniatures par ligne';
@ -158,9 +159,9 @@ $lang['Status'] = 'Statut';
$lang['Storage category'] = 'Catégorie de stockage';
$lang['Submit'] = 'Valider';
$lang['Sum of rates'] = 'Somme des notes';
$lang['Tag selection'] = 'Sélection de tags';
$lang['Tag "%s" was added'] = 'Le tag "%s" a été ajouté';
$lang['Tag "%s" already exist'] = 'Le tag "%s" existe déjà';
$lang['Tag "%s" was added'] = 'Le tag "%s" a été ajouté';
$lang['Tag selection'] = 'Sélection de tags';
$lang['Take selected elements out of caddie'] = 'Sortir les éléments sélectionnés du panier';
$lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Impossible de connaître la dernière version cat la fonction allow_url_fopen est désactivée.';
$lang['User comments validation'] = 'Validation des commentaires utilisateur';
@ -257,9 +258,8 @@ $lang['metadata_exif'] = 'EXIF';
$lang['metadata_iptc'] = 'IPTC';
$lang['name'] = 'nom';
$lang['nbm_background_treatment_redirect'] = 'Le temps d\'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d secondes].';
$lang['nbm_redirect_msg'] = 'Traitement en cours.'."\n".'Veuillez patienter...';
$lang['nbm_repost_submit'] = 'Continuer le traitement en cours...';
$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.';
$lang['nbm_break_timeout_send_mail'] = 'Le temps d\'envoi des mails est limité. Les autres envois de mail ont été ignorés.';
$lang['nbm_col_check_user_send_mail'] = 'A envoyer ?';
$lang['nbm_col_last_send'] = 'Dernier envoi';
$lang['nbm_col_mail'] = 'email';
@ -283,7 +283,6 @@ $lang['nbm_msg_error_sending_email_to'] = 'Erreur lors de l\'envoi du mail
$lang['nbm_msg_mail_sent_to'] = 'Mail envoyé à %s [%s].';
$lang['nbm_msg_n_mails_sent'] = '%s mails ont été envoyés.';
$lang['nbm_msg_no_mail_to_send'] = '%s mails n\'ont pas été envoyés.';
$lang['nbm_break_timeout_send_mail'] = 'Le temps d\'envoi des mails est limité. Les autres envois de mail ont été ignorés.';
$lang['nbm_no_mail_to_send'] = 'Pas de mail à envoyer.';
$lang['nbm_no_user_available_to_send_L1'] = 'Il n\'y a pas d\'utilisateur à notifier par mail.';
$lang['nbm_no_user_available_to_send_L2'] = 'Un utilisateur est à notifier si de nouveaux éléments sont disponibles pour cet utilisateur.';
@ -293,6 +292,8 @@ $lang['nbm_object_news'] = 'Nouveaux
$lang['nbm_object_subcribe'] = 'Inscription à la notification par mail';
$lang['nbm_object_unsubcribe'] = 'Désinscription à la notification par mail';
$lang['nbm_param_mode'] = 'Paramétrage';
$lang['nbm_redirect_msg'] = 'Traitement en cours.'."\n".'Veuillez patienter...';
$lang['nbm_repost_submit'] = 'Continuer le traitement en cours...';
$lang['nbm_send_check_all'] = 'Tout cocher';
$lang['nbm_send_complementary_mail_content'] = 'Contenu complémentaire du mail';
$lang['nbm_send_detailed_content'] = 'Envoi d\'un contenu détaillé';