Issue 0000598: NBM: Add new informations

Notification by mail:
Add new informations about last categories and last images like new feature of RSS notification.

2 parts:
  - Possibility to send HTML mail
  - Include last categories and last images on HTML format into notification mail


ccs & HTML experts! Please! Check, fix, improve and enhance HTML mail content!


git-svn-id: http://piwigo.org/svn/trunk@1784 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 33 insertions, 18 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 68f7124ed..06ae1dd6c 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -269,7 +269,8 @@ $lang['metadata_basic'] = 'basic';
 $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_background_treatment_redirect_second'] = 'Execution time is out, treatment must be continue [Estmated time: %d second].';
+$lang['nbm_background_treatment_redirect_seconds'] = 'Execution time is out, treatment must be continue [Estmated time: %d seconds].';
 $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 ?';
@@ -277,24 +278,32 @@ $lang['nbm_col_last_send'] = 'Last send';
 $lang['nbm_col_mail'] = 'email';
 $lang['nbm_col_user'] = 'User';
 $lang['nbm_complementary_mail_content'] = 'Complementary mail content';
-$lang['nbm_content_byebye'] = 'See you soon';
-$lang['nbm_content_goto'] = 'Go to %s %s.';
-$lang['nbm_content_hello'] = 'Hello %s';
-$lang['nbm_content_new_elements'] = 'New elements were added on %s';
-$lang['nbm_content_new_elements_between'] = 'New elements were added between %s and %s';
+$lang['nbm_content_byebye'] = 'See you soon,';
+$lang['nbm_content_goto_1'] = 'Go to ';
+$lang['nbm_content_goto_2'] = '.';
+$lang['nbm_content_hello_1'] = 'Hello ';
+$lang['nbm_content_hello_2'] = ',';
+$lang['nbm_content_new_elements'] = 'New elements were added ';
+$lang['nbm_content_new_elements_single'] = ' on ';
+$lang['nbm_content_new_elements_between_1'] = 'between ';
+$lang['nbm_content_new_elements_between_2'] = ' and ';
 $lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subcribed you for receiving notifications by mail';
 $lang['nbm_content_subscribe_by_himself'] = 'You have subcribed to receiving notifications by mail';
-$lang['nbm_content_subscribe_link'] = 'To subscribe, click on %s .';
-$lang['nbm_content_subscribe_unsubscribe_contact'] = 'If you encounter problems or have any question, please send a message to %s.';
+$lang['nbm_content_subscribe_link'] = 'To subscribe';
+$lang['nbm_content_problem_contact'] = 'If you encounter problems or have any question, please send a message to ';
+$lang['nbm_content_pb_contact_object'] = '[NBM] Problems or questions';
 $lang['nbm_content_unsubscribe_by_admin'] = 'The webmaster has unsubcribed you from receiving notifications by mail';
 $lang['nbm_content_unsubscribe_by_himself'] = 'You have unsubcribed from receiving notifications by mail';
-$lang['nbm_content_unsubscribe_link'] = 'To unsubscribe, click on %s .';
+$lang['nbm_content_click_on'] = ', click on ';
+$lang['nbm_content_unsubscribe_link'] = 'To unsubscribe';
 $lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used';
 $lang['nbm_item_notification'] = 'Notification';
 $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_mail_sent'] = '%d mail was sent.';
 $lang['nbm_msg_n_mails_sent'] = '%d mails were sent.';
-$lang['nbm_msg_no_mail_to_send'] = '%d mails were not sent.';
+$lang['nbm_msg_n_mail_not_send'] = '%d mail was not sent.';
+$lang['nbm_msg_n_mails_not_send'] = '%d mails were not sent.';
 $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.';
@@ -308,7 +317,7 @@ $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';
+$lang['nbm_send_detailed_content'] = 'Add detailed content';
 $lang['nbm_send_mail_as'] = 'Send mail as';
 $lang['nbm_send_mail_to_users'] = 'Send mail to users';
 $lang['nbm_send_mode'] = 'Send';
@@ -321,15 +330,21 @@ $lang['nbm_title_param'] = 'Parameters';
 $lang['nbm_title_send'] = 'Select recipients';
 $lang['nbm_title_subscribe'] = 'Subscribe/unsubscribe users';
 $lang['nbm_unsubscribe_col'] = 'Unsubcribed';
-$lang['nbm_updated_param_count'] = '%d parameters are updated.';
-$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user(s) are not updated.';
-$lang['nbm_user_change_enabled_false'] = 'User %s [%s] removed from the subscription list.';
-$lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to the subscription list.';
-$lang['nbm_user_change_enabled_updated_data_count'] = '%d user(s) are updated.';
-$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] not removed from the subscription list.';
-$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] not added to the subscription list.';
+$lang['nbm_updated_param_count'] = '%d parameter was updated.';
+$lang['nbm_updated_params_count'] = '%d parameters were updated.';
+$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user was not updated.';
+$lang['nbm_users_change_enabled_error_on_updated_data_count'] = '%d users were not updated.';
+$lang['nbm_user_change_enabled_false'] = 'User %s [%s] was removed from the subscription list.';
+$lang['nbm_user_change_enabled_true'] = 'User %s [%s] was added to the subscription list.';
+$lang['nbm_user_change_enabled_updated_data_count'] = '%d user was updated.';
+$lang['nbm_users_change_enabled_updated_data_count'] = '%d users were updated.';
+$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] was not removed from the subscription list.';
+$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] was not added to the subscription list.';
 $lang['nbm_user_x_added'] = 'User %s [%s] added.';
 $lang['nbm_warning_subscribe_unsubcribe'] = 'Warning: subscribing or unsubcribing will send mails to users';
+$lang['nbm_send_html_mail'] = 'Send mail on HTML format';
+$lang['nbm_send_recent_post_dates'] = 'Include display of recent pictures group by dates';
+$lang['nbm_info_send_recent_post_dates'] = 'Available only with HTML format';
 $lang['no_write_access'] = 'no write access';
 $lang['path'] = 'path';
 $lang['permissions'] = 'Permissions';