From 875a6b15c89f168e15faf74af9efe180e1bb909e Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 15 May 2006 22:21:08 +0000 Subject: 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 --- language/en_UK.iso-8859-1/admin.lang.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'language/en_UK.iso-8859-1') diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index 16c483eef..a29ab89f4 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -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'; -- cgit v1.2.3