Merge pull request #4 from taggart/templates

riseup fixes to templates

Author: ikedas

default/mail_tt2/helpfile.tt2

@@ -49,7 +49,7 @@ Subject: [% FILTER qencode %][%|loc%]User guide[%END%][%END%]
  [%|loc%]DEL <list> user@host            * To delete a user from a list[%END%]
  [%|loc%]STATS <list>                    * To consult the statistics for <list>[%END%]
 
- [%|loc%]REMIND <list>                   * Send a reminder message to each subscriber (this is a way to inform anyone what is his real subscribing email).[%END%]
+ [%|loc%]REMIND <list>                   * Send a reminder message to each subscriber (this is a way to inform anyone what is their real subscribing email).[%END%]
 [%END#wrap%][% END %]
 [% IF is_editor -%]
 [%|wrap(0,39)%]

default/mail_tt2/listmaster_notification.tt2

@@ -226,7 +226,7 @@ Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END
 [% ELSIF type == 'listowner_email_changed' -%]
 Subject: [% FILTER qencode %][%|loc(param0)%]List owner/editor email changes[%END%][%END%]
 
-[%|loc(previous_email,new_email)%]Member %1 has changed his owner/editor email address to %2. This change has been performed for the following lists:[%END%]
+[%|loc(previous_email,new_email)%]Member %1 has changed their owner/editor email address to %2. This change has been performed for the following lists:[%END%]
 [% FOREACH updated_list IN updated_lists -%]
 [% updated_list %]
 [% END %]
@@ -235,7 +235,7 @@ Subject: [% FILTER qencode %][%|loc(param0)%]List owner/editor email changes[%EN
 [% ELSIF type == 'failed_to_change_included_admin' -%]
 Subject: [% FILTER qencode %][%|loc(list.name)%]List %1: Failed to change admin email address[%END%][%END%]
 
-[%|loc(current_email,new_email,datasource)%]Admin %1 could not change his admin email address (new email address is %2) because he is included via a the following data sources: %3.
+[%|loc(current_email,new_email,datasource)%]Admin %1 could not change their admin email address (new email address is %2) because he is included via a the following data sources: %3.
 
 If you are able to do so, you should probably update these data sources with this person's new email address.[%END%]
 

default/mail_tt2/listowner_notification.tt2

@@ -30,7 +30,7 @@ This list has been closed.[%END%]
 [% ELSIF type == 'warn-signoff' -%]
 Subject: [% FILTER qencode %][%|loc(type,list.name,who,gecos)%]FYI: %1 List "%2" from %3 %4[%END%][%END%]
 
-[%|loc(who,gecos,list.name)%]WARNING: %1 %2 failed to unsubscribe from %3 because his address was not found in the list.
+[%|loc(who,gecos,list.name)%]WARNING: %1 %2 failed to unsubscribe from %3 because their address was not found in the list.
 You may help this person looking for similar email in subscriber list using the following link :[%END%]
 
 [% 'ticket' | url_abs([one_time_ticket]) %]
@@ -135,7 +135,7 @@ X-Sympa-Attach: yes
 [% ELSIF type == 'failed_to_change_included_member' -%]
 Subject: [% FILTER qencode %][%|loc(list.name)%]List %1: Failed to change member email address[%END%][%END%]
 
-[%|loc(current_email,new_email,datasource)%]User %1 could not change his member email address (new email address is %2) because he is included via a the following data sources: %3.
+[%|loc(current_email,new_email,datasource)%]User %1 could not change their member email address (new email address is %2) because he is included via a the following data sources: %3.
 
 If you are able to do so, you should probably update these data sources with this person's new email address.[%END%]
 

default/mail_tt2/remind.tt2

@@ -2,11 +2,13 @@
 From: [% fromlist %]
 Subject: [% FILTER qencode %][%|loc(list.name)%]Reminder of your subscription to %1[%END%][%END%]
 
-[%|loc(list.name,list.host,user.email,user.password)%]Your are subscriber of list %1@%2 with  email %3[%END%]
+[%|loc(list.name,list.host,user.email,user.password)%]You are receiving this mail because you are subscribed to the mailing list %1@%2 with email address %3.[%END%]
 
-[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %]
+It is important to us to not send mail to people that don't want to receive it. If you do not want to be on this mailing list, please follow the instructions below to remove yourself.
+
+[%|loc%]List information: [%END%][% conf.wwsympa_url %]/info/[% list.name %]
 [% IF subscriber.included != 1 %]
-[%|loc%]Unsubscription:[%END%]
+[%|loc%]To unsubscribe:[%END%]
 [% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
   [% conf.email %]@[% conf.host %]
 [%~ END %]

default/mail_tt2/sendpasswd.tt2

@@ -10,7 +10,7 @@ Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%E
 
 [% IF action == 'subrequest' -%]
 
-[%|loc(list,conf.host,request_from_host)%]Someone, probably you, requested to subscribe to list %1@%2. (This request came from host %3).[%END%]
+[%|loc(list,conf.host)%]Someone, probably you, requested to subscribe to list %1@%2.
 [%|loc%]You may ignore this subscription request or click on the following link in order to confirm it [%END%]: [% 'ticket' | url_abs([one_time_ticket]) %]
 
 [% ELSIF action == 'sigrequest' -%]
@@ -22,7 +22,7 @@ Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%E
 
 [% ELSE -%]
 
-[%|loc(conf.host,request_from_host)%]Someone, probably you, requested to allocate or renew your password for your list server account %1. (This request came from host %2).[%END%]
+[%|loc(conf.host)%]Someone, probably you, requested to allocate or renew your password for your list server account %1.[%END%]
 [%|loc%]You may ignore this request or click on the following link in order to choose your password. [%END%]: [% 'ticket' | url_abs([one_time_ticket]) %]
 
 [%END%]

default/mail_tt2/user_notification.tt2

@@ -11,7 +11,7 @@ If this problem persists, you will be automatically unsubscribed from the list.[
 
 
 [% ELSIF type == 'deleted_msg_topics' -%]
-Subject: [% FILTER qencode %][%|loc(list.name)%]Topics udpating in list %1[%END%][%END%]
+Subject: [% FILTER qencode %][%|loc(list.name)%]Topics updated in list %1[%END%][%END%]
 
 [%|loc(list.name)%]Some of the topics you are subscribed to in the list '%1' have been deleted.
 Deleted topic(s) is(are):[%END%]

default/web_tt2/skinsedit.tt2

@@ -3,19 +3,19 @@
 <h2>[%|loc%]Cascading Style Sheet[%END%]</h2>
 
 [% IF css_result %]
-<p><strong>[%|loc%]static css installation succeed. Reload the current page and/or check sympa logs  to be sure that static css a really in use.[%END%]</strong></p>
+<p><strong>[%|loc%]static css installation succeed. Reload the current page and/or check sympa logs to be sure that static css a really in use.[%END%]</strong></p>
 [% END %]
 
 <h2>[%|loc%]Colors[%END%]</h2>
 
 <p>
-[%|loc%]Use the color editor in order to change defined colors. First select the color you want to change and pick a color,then apply it using the test button. The new color is not really installed but it is used only for your own session. When happy with the different colors you choosen, you may save them in a new static CSS.
+[%|loc%]Use the color editor in order to change defined colors. First select the color you want to change and pick a color,then apply it using the test button. The new color is not really installed but it is used only for your own session. When happy with the different colors you chosen, you may save them in a new static CSS.
 [%END%]
 </p>
 
 <p>
 [%|loc%]
-Be careful: the CSS file is overwritten using css.tt2 template, usually this file is comming from Sympa distribution so your CSS customization may be erased when doing this.[% END %]
+Be careful: the CSS file is overwritten using css.tt2 template, usually this file is coming from Sympa distribution so your CSS customization may be erased when doing this.[% END %]
 [%|loc%]So if you want to preserve some site customization from being overwriten when starting a new sympa version, css_path and css_url should not point to the same directory.[%END%]
 </p>
 
@@ -54,7 +54,7 @@ Be careful: the CSS file is overwritten using css.tt2 template, usually this fil
 <p>[%|loc%]Please note that these indications don't cover the exact usage of each color parameter, as it would be far too long to describe. What lies in this table should however give you a correct snapshot of what the color parameters are used for. For more details on rendering, feel free to try changing the colors in your session to see how well all that works.[%END%]</p>
 
 <table  id="color_table" class="responsive">
-<caption>[%|loc%]This table display every colors used in Sympa, with their hexadecimal code [%END%]</caption>
+<caption>[%|loc%]This table displays every color used in Sympa, with their hexadecimal code [%END%]</caption>
 <tr id="color_table_title">
 <th>[%|loc%]parameter[%END%]</th>
 <th>[%|loc%]parameter value[%END%]</th>

default/web_tt2/subindex.tt2

@@ -1,13 +1,13 @@
 <!-- $Id$ -->
 
-<h2>[%|loc%]Listing subscription to moderate[%END%]</h2>
+<h2>[%|loc%]List of subscriptions to moderate[%END%]</h2>
 [% IF mod_subscription %]
 <form class="noborder toggleContainer" data-toggle-selector="input[name='id']"
   action="[% path_cgi %]" method="POST" name="myform"> 
 <fieldset>
 <input type="hidden" name="list" value="[% list %]" />
     <table  class="responsive listOfItems">
-    <caption>[%|loc%]Listing subscription to moderate[%END%]</caption>
+    <caption>[%|loc%]List of subscriptions to moderate[%END%]</caption>
       <tr>
         <th><a href="#"
           data-tooltip aria-haspopup="true"