Changeset 1314 for trunk/language/en_UK.iso-8859-1/admin.lang.php

Timestamp:

May 16, 2006, 12:21:08 AM (19 years ago)

Author:

plg

Message:

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

File:

• trunk/language/en_UK.iso-8859-1/admin.lang.php (modified) (4 diffs)

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -111 +111 @@
 $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';
@@ -255 +256 @@
 $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';
@@ -281 +281 @@
 $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.';
@@ -291 +290 @@
 $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';