Skip to content

Commit

Permalink
Merge pull request #443 from ecawthon/sympa-6.2 by ecawthon
Browse files Browse the repository at this point in the history
Make third person singular pronouns gender neutral
  • Loading branch information
ikedas authored Oct 16, 2018
2 parents 7f206f4 + 6278d95 commit df5a6ce
Show file tree
Hide file tree
Showing 94 changed files with 539 additions and 539 deletions.
2 changes: 1 addition & 1 deletion default/mail_tt2/listmaster_notification.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ Subject: [% FILTER qencode %][%|loc(param0)%]List owner/moderator email changes[
[% 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 their 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 they are 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%]

Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/listowner_notification.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,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 their 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 they are 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%]

Expand Down
6 changes: 3 additions & 3 deletions default/web_tt2/help_admin-members.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
</ul>

<p class="retraitita">[%|helploc%]By default, each page displays 25 subscribers. You can browse through the pages by using the browsing arrows or display more subscribers on each page. You may also wish to sort subscribers according to different criteria by clicking on the corresponding column header.[%END%]</p>
<p>[%|helploc%]To <strong>search a subscriber</strong>, enter all or part of his/her email address or name in the input field and click on the '<strong>Search</strong>' button.[%END%]</p>
<p>[%|helploc%]To <strong>search a subscriber</strong>, enter all or part of their email address or name in the input field and click on the '<strong>Search</strong>' button.[%END%]</p>
<p>[%|helploc%]You can <strong>subscribe other people to the list</strong> from this page:[%END%]</p>
<ul>
<li>[%|helploc%]To add <strong>a single person</strong>, enter his/her email address in the input field and click on the '<strong>Add</strong>' button.[%END%]</li>
<li>[%|helploc%]To add <strong>a single person</strong>, enter their email address in the input field and click on the '<strong>Add</strong>' button.[%END%]</li>
<li>[%|helploc%]To add <strong>several persons</strong>, click on the '<strong>Multiple add</strong>' button. In the input field that displays, enter the email addresses and names of the people you want to subscribe to the list and click on '<strong>Add subscribers</strong>'.[%END%]</li>
</ul>

Expand All @@ -40,7 +40,7 @@

<p class="retraitita">[%|helploc%]Tip: to select all subscribers at once, first make sure that they are all displayed on the page, and then click on the 'Toggle selection' button: all subscribers will be selected in a single click![%END%]</p>

<p>[%|helploc%]To <strong>change a subscriber's subscriber options</strong>, click on his/her email address.[%END%]</p>
<p>[%|helploc%]To <strong>change a subscriber's subscriber options</strong>, click on their email address.[%END%]</p>
<p>[%|helploc%]From this page, you can <strong>change the name, email address and message delivery mode of the subscriber</strong>. You can also <strong>unsubscribe him/her</strong>.[%END%]</p>

<p>[%|helploc%]If the subscriber is <a href="admin-bounces.html">bouncing</a>, another form displays under the 'Subscriber information' form:[%END%]</p>
Expand Down
2 changes: 1 addition & 1 deletion default/web_tt2/help_faq-admin.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p>[%|helploc%]To find the cause of the problem, do as follows:[%END%]</p>
<ol>
<li>[%|helploc%]<strong>Check that the user is really subscribed to the list</strong> on the 'Manage subscribers' page.[%END%]</li>
<li>[%|helploc%]<strong>Check the subscriber's message delivery mode</strong>; the page about the subscriber is available by clicking on his/her email address from the members list. When the delivery mode is the 'Digest' mode, it is normal that the subscriber does not receive messages as soon as they are sent.[%END%]</li>
<li>[%|helploc%]<strong>Check the subscriber's message delivery mode</strong>; the page about the subscriber is available by clicking on their email address from the members list. When the delivery mode is the 'Digest' mode, it is normal that the subscriber does not receive messages as soon as they are sent.[%END%]</li>
<li>[%|helploc%]<strong>Check that the subscriber's email address is not bouncing</strong> on the 'Bounces' page. A subscriber email address is considered to be bouncing when messages sent to it generate error logs (called "bounces"). These errors can be temporary (inbox full, mail server unavailable) or permanent (no email account for the user). In any case, the mailing list server automatically manages the deletion of addresses generating too many errors.[%END%]</li>
<li>[%|helploc%]<strong>Try and send a message yourself to the subscriber</strong> in order to check if he/she receives it.[%END%]</li>
<li>[%|helploc%]As a last resort, <strong>contact the listmaster</strong>, who will check the mail server logs in order to find the cause of the problem.[%END%]</li>
Expand Down
2 changes: 1 addition & 1 deletion default/web_tt2/help_shared-edit.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<li>[%|helploc%]<strong>Denying write access to a folder</strong> avoids proliferation of files published by unauthorized persons. To keep control of the list, sometimes it is more sensible to deny write access to the root folder of the shared document web space. It is also possible to offer a writable folder and to lock it at a given date or time, for example to control delivery of works by students.[%END%]</li>
<li>[%|helploc%]<strong>Denying write access to a file</strong> ensures that no one will be able to modify it. For example, this is the most suitable option for teachers willing to put at their students' disposal a set of documents, such as exam questions.[%END%]</li>
<li>[%|helploc%]<strong>Denying read access to a folder</strong> makes it possible to store several confidential documents without having to change read access rights individually for each of them.[%END%]</li>
<li>[%|helploc%]<strong>Denying read access to a file</strong> ensures its confidentiality. For example, a teacher can ask his/her students to upload their "exam copies" on a list and to restrict read access to their files in order to prevent other students from looking at them.[%END%]</li>
<li>[%|helploc%]<strong>Denying read access to a file</strong> ensures its confidentiality. For example, a teacher can ask their students to upload their "exam copies" on a list and to restrict read access to their files in order to prevent other students from looking at them.[%END%]</li>
</ul>
<p>[%|helploc%]<strong>You are allowed to change access rights only to documents you uploaded or created yourself</strong> on the lists (one exception: list owners can change access rights to any document published on the lists; this does not concern moderators).[%END%]</p>
<p>[%|helploc%]<strong>To change access rights for a document, click on the 'Access' text</strong> in front of the document's name, in the 'Access' column. You are brought to the access rights editing page.[%END%]</p>
Expand Down
2 changes: 1 addition & 1 deletion doc/auth.conf.pod
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ instance C<alternate_email>, C<mailalternateaddress>, ... You make a list of
these attributes separated by commas (C<,>).

With this list, Sympa creates a cookie which contains various information:
Whether the user is authenticated via LDAP or not, his alternate email.
Whether the user is authenticated via LDAP or not, their alternate email.
Storing the alternate email is interesting when you want to canonify your
preferences and subscriptions, that is to say you want to use a unique
address in C<user_table> and C<subscriber_table>, which is the canonic email.
Expand Down
2 changes: 1 addition & 1 deletion ext/NetVOOT/lib/Net/VOOT/SURFconext.pm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Net::VOOT::SURFconext - access to a VOOT server of SURFnet
(organized by SURFnet) which arranges access rights to people on
universities and research institutes (participants) to facilities offered
by other participants. For instance, a student on one university can
use the library and WiFi of an other university when he is on visit there.
use the library and WiFi of an other university when they are on visit there.
SURFconext uses OAuth2 authentication.
Expand Down
6 changes: 3 additions & 3 deletions po/sympa/af.po
Original file line number Diff line number Diff line change
Expand Up @@ -10593,7 +10593,7 @@ msgstr ""
#: default/mail_tt2/listmaster_notification.tt2:239
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -11210,7 +11210,7 @@ msgstr ""
#: default/mail_tt2/listowner_notification.tt2:131
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -14976,7 +14976,7 @@ msgid ""
"Users listed below are excluded from the list. Beware, that this feature is "
"different from the blacklist. Exclusion makes sense when a list is based on "
"external data sources ; thanks to exclusion, a user can unsubscribe (or "
"being removed by list owner) even though he should be included via an "
"being removed by list owner) even though they should be included via an "
"external data source. Users get into the exclusion table, through the "
"standard unsubscribe/delete functions. They get off the exclusion table with "
"the standard subscribe/add functions."
Expand Down
6 changes: 3 additions & 3 deletions po/sympa/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -11291,7 +11291,7 @@ msgstr "تغيير عنوان البريد"
#: default/mail_tt2/listmaster_notification.tt2:239
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -11924,7 +11924,7 @@ msgstr "تغيير عنوان البريد"
#: default/mail_tt2/listowner_notification.tt2:131
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -15554,7 +15554,7 @@ msgid ""
"Users listed below are excluded from the list. Beware, that this feature is "
"different from the blacklist. Exclusion makes sense when a list is based on "
"external data sources ; thanks to exclusion, a user can unsubscribe (or "
"being removed by list owner) even though he should be included via an "
"being removed by list owner) even though they should be included via an "
"external data source. Users get into the exclusion table, through the "
"standard unsubscribe/delete functions. They get off the exclusion table with "
"the standard subscribe/add functions."
Expand Down
6 changes: 3 additions & 3 deletions po/sympa/bg.po
Original file line number Diff line number Diff line change
Expand Up @@ -10839,7 +10839,7 @@ msgstr ""
#: default/mail_tt2/listmaster_notification.tt2:239
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -11456,7 +11456,7 @@ msgstr ""
#: default/mail_tt2/listowner_notification.tt2:131
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -15226,7 +15226,7 @@ msgid ""
"Users listed below are excluded from the list. Beware, that this feature is "
"different from the blacklist. Exclusion makes sense when a list is based on "
"external data sources ; thanks to exclusion, a user can unsubscribe (or "
"being removed by list owner) even though he should be included via an "
"being removed by list owner) even though they should be included via an "
"external data source. Users get into the exclusion table, through the "
"standard unsubscribe/delete functions. They get off the exclusion table with "
"the standard subscribe/add functions."
Expand Down
6 changes: 3 additions & 3 deletions po/sympa/br.po
Original file line number Diff line number Diff line change
Expand Up @@ -10731,7 +10731,7 @@ msgstr ""
#: default/mail_tt2/listmaster_notification.tt2:239
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -11348,7 +11348,7 @@ msgstr ""
#: default/mail_tt2/listowner_notification.tt2:131
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -15108,7 +15108,7 @@ msgid ""
"Users listed below are excluded from the list. Beware, that this feature is "
"different from the blacklist. Exclusion makes sense when a list is based on "
"external data sources ; thanks to exclusion, a user can unsubscribe (or "
"being removed by list owner) even though he should be included via an "
"being removed by list owner) even though they should be included via an "
"external data source. Users get into the exclusion table, through the "
"standard unsubscribe/delete functions. They get off the exclusion table with "
"the standard subscribe/add functions."
Expand Down
30 changes: 15 additions & 15 deletions po/sympa/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -11763,7 +11763,7 @@ msgstr "Llista %1: Problemes al canviar l'adreça electrònica"
#, fuzzy
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -12444,7 +12444,7 @@ msgstr "Llista %1: Error en canviar l'adreça de correu del membre"
#, fuzzy
msgid ""
"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.\n"
"2) because they are included via a the following data sources: %3.\n"
"\n"
"If you are able to do so, you should probably update these data sources with "
"this person's new email address."
Expand Down Expand Up @@ -16560,7 +16560,7 @@ msgstr ""
#~ "Users listed below are excluded from the list. Beware, that this feature "
#~ "is different from the blacklist. Exclusion makes sense when a list is "
#~ "based on external data sources ; thanks to exclusion, a user can "
#~ "unsubscribe (or being removed by list owner) even though he should be "
#~ "unsubscribe (or being removed by list owner) even though they should be "
#~ "included via an external data source. Users get into the exclusion table, "
#~ "through the standard unsubscribe/delete functions. They get off the "
#~ "exclusion table with the standard subscribe/add functions."
Expand Down Expand Up @@ -18095,23 +18095,23 @@ msgstr ""

#~ msgid ""
#~ "REMIND <list> * Send a reminder message to each "
#~ "subscriber (this is a way to inform anyone what is his real subscribing "
#~ "subscriber (this is a way to inform anyone what is their real subscribing "
#~ "email)."
#~ msgstr ""
#~ "REMIND <list> * Envia un missatge de recordatori a cada subscriptor "
#~ "(aquesta és una manera d'informar-los de quin és el correu electrònic amb "
#~ "el que se'ls ha donat d'alta)."

#~ msgid ""
#~ "Member %1 has changed his owner/editor email address to %2. This change "
#~ "Member %1 has changed their owner/editor email address to %2. This change "
#~ "has been performed for the following lists:"
#~ msgstr ""
#~ "L'usuari %1 ha modificat la seva adreça de correu d'administració/"
#~ "moderació per a %2. Aquest canvi s'aplicarà a les llistes següents:"

#~ msgid ""
#~ "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.\n"
#~ "Admin %1 could not change their admin email address (new email address is %"
#~ "2) because they are included via a the following data sources: %3.\n"
#~ "\n"
#~ "If you are able to do so, you should probably update these data sources "
#~ "with this person's new email address."
Expand All @@ -18124,7 +18124,7 @@ msgstr ""
#~ "amb la nova adreça de correu."

#~ msgid ""
#~ "WARNING: %1 %2 failed to unsubscribe from %3 because his address was not "
#~ "WARNING: %1 %2 failed to unsubscribe from %3 because their address was not "
#~ "found in the list.\n"
#~ "You may help this person looking for similar email in subscriber list "
#~ "using the following link :"
Expand All @@ -18135,8 +18135,8 @@ msgstr ""
#~ "la llista de subscriptors usant el següent enllaç :"

#~ msgid ""
#~ "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.\n"
#~ "User %1 could not change their member email address (new email address is %"
#~ "2) because they are included via a the following data sources: %3.\n"
#~ "\n"
#~ "If you are able to do so, you should probably update these data sources "
#~ "with this person's new email address."
Expand Down Expand Up @@ -18786,7 +18786,7 @@ msgstr ""
#~ "If your message was really meant to be sent to the list, it was\n"
#~ "interpreted by the software as a command. Please contact the list "
#~ "owner: \n"
#~ "%1-request@%3 so that he can take care of your message.\n"
#~ "%1-request@%3 so that they can take care of your message.\n"
#~ "\n"
#~ "Thank you for your attention.\n"
#~ msgstr ""
Expand Down Expand Up @@ -19271,8 +19271,8 @@ msgstr ""
#~ msgstr "Podeu modificar ací la vostra adreça de correu:"

#~ msgid ""
#~ "Changing a user's email address will apply the change his memberships but "
#~ "it will also apply to his ownerships if he is owner of some lists."
#~ "Changing a user's email address will apply the change their memberships but "
#~ "it will also apply to their ownerships if they are owner of some lists."
#~ msgstr ""
#~ "El canvi d'adreça de correu s'aplica a les subscripcions de la persona, i "
#~ "també al vostre paper de propietari/ària i de moderador/a de llistes."
Expand Down Expand Up @@ -19990,7 +19990,7 @@ msgstr ""

#, fuzzy
#~ msgid ""
#~ "WARNING: %1 %2 failed to unsubscribe from %3 because his address was not "
#~ "WARNING: %1 %2 failed to unsubscribe from %3 because their address was not "
#~ "found in the list.\n"
#~ "(You may help this person)."
#~ msgstr ""
Expand Down Expand Up @@ -20231,7 +20231,7 @@ msgstr ""
#~ msgstr "Llista \"%1\" petició de creació"

#~ msgid ""
#~ "User %1 has changed his owner/editor email address to %2. This changed "
#~ "User %1 has changed their owner/editor email address to %2. This changed "
#~ "has been performed to the following lists :"
#~ msgstr ""
#~ "L'usuari %1 ha canviat la seva adreça de correu d'administrador/editor a %"
Expand Down
Loading

0 comments on commit df5a6ce

Please sign in to comment.