Skip to content
GitLab
Commit 6bfb5e64 authored by Sympa authors's avatar Sympa authors Committed by IKEDA Soji
Browse files

Updating source texts according to fixes on en_US catalog.

parent 99ca1eeb
Hide whitespace changes
Inline Side-by-side
cpanfile
View file @ 6bfb5e64
......@@ -157,7 +157,7 @@ feature 'migrate-from-very-old-version', 'This module provides reversible encryp
requires 'Crypt::CipherSaber', '>= 0.50';
};
feature 'Crypt::Eksblowfish', 'Used to encrypt passwords with the Bcrypt hash algorithm' => sub {
feature 'Crypt::Eksblowfish', 'Used to encrypt passwords with the Bcrypt hash algorithm.' => sub {
requires 'Crypt::Eksblowfish', '>= 0.009';
};
......@@ -206,19 +206,19 @@ feature 'Data::Password', 'Used for configureable hardening of passwords via the
requires 'Data::Password', '>= 1.07';
};
feature 'Encode::Locale', 'Useful when running command line utilities in the console not supporting UTF-8 encoding' => sub {
feature 'Encode::Locale', 'Useful when running command line utilities in the console not supporting UTF-8 encoding.' => sub {
requires 'Encode::Locale', '>= 1.02';
};
feature 'remote-list-including', 'Required when including members of a remote list' => sub {
feature 'remote-list-including', 'Required when including members of a remote list.' => sub {
requires 'IO::Socket::SSL', '>= 0.90';
};
feature 'Mail::DKIM::Verifier', 'Required in order to use DKIM features (both for signature verification and signature insertion)' => sub {
feature 'Mail::DKIM::Verifier', 'Required in order to use DKIM features (both for signature verification and signature insertion).' => sub {
requires 'Mail::DKIM::Verifier', '>= 0.37';
};
feature 'Net::DNS', 'This is required if you set a value for "dmarc_protection_mode" which requires DNS verification' => sub {
feature 'Net::DNS', 'This is required if you set a value for "dmarc_protection_mode" which requires DNS verification.' => sub {
requires 'Net::DNS', '>= 0.65';
};
......@@ -231,11 +231,11 @@ feature 'Net::SMTP', 'This is required if you set "list_check_smtp" sympa.conf p
requires 'Net::SMTP';
};
feature 'soap', 'Required if you want to run the Sympa SOAP server that provides mailing list services via a "web service"' => sub {
feature 'soap', 'Required if you want to run the Sympa SOAP server that provides mailing list services via a "web service".' => sub {
requires 'SOAP::Lite', '>= 0.712';
};
feature 'Unicode::Normalize', 'Normalizes file names represented by Unicode' => sub {
feature 'Unicode::Normalize', 'Normalizes file names represented by Unicode.' => sub {
requires 'Unicode::Normalize', '>= 0.23';
};
......
default/mail_tt2/d_install_shared.tt2
View file @ 6bfb5e64
......@@ -2,6 +2,6 @@
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been installed[%END%][%END%]
[%|loc(filename,list.name,domain,installed_by)%]Your document %1 for list %2@%3 has been installed by %4 list editor.[%END%]
[%|loc(filename,list.name,domain,installed_by)%]Your document %1 for list %2@%3 has been installed by %4 list moderator.[%END%]
[%|loc%]The list document repository:[%END%] [% 'd_read' | url_abs([list.name]) %]
default/mail_tt2/d_reject_shared.tt2
View file @ 6bfb5e64
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been rejected[%END%][%END%]
[%|loc(filename,list.name,domain,rejected_by)%]Your document %1 for list %2@%3 has been rejected by %4 list editor.[%END%]
[%|loc(filename,list.name,domain,rejected_by)%]Your document %1 for list %2@%3 has been rejected by %4 list moderator.[%END%]
default/mail_tt2/listmaster_notification.tt2
View file @ 6bfb5e64
......@@ -223,7 +223,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%]
Subject: [% FILTER qencode %][%|loc(param0)%]List owner/moderator email changes[%END%][%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 -%]
......
default/mail_tt2/report.tt2
View file @ 6bfb5e64
......@@ -297,7 +297,7 @@
[%|loc%]Your message signature was successfully verified using S/MIME.[%END%]
[%~ ELSIF report_entry == 'dkim' ~%]
[%|loc%]Your message contain a DKIM signature. It was successfully verified[%END%]
[%|loc%]Your message contains a DKIM signature. It was successfully verified[%END%]
[%~ ELSIF report_entry == 'sent_to_owner' ~%]
[%|loc%]Your request to subscribe/unsubscribe has been forwarded to the list's owners for approval. You will receive a notification when you have been subscribed (or unsubscribed).[%END%]
......@@ -535,7 +535,7 @@
[%~ ELSIF report_entry == 'already_moderated' ~%]
[%|loc(report_param.listname,report_param.key)%]Unable to access the message on list %1 with key %2.
Warning: this message may already have been sent by one of the list's editors.[%END%]
Warning: this message may already have been sent by one of the list's moderators.[%END%]
[%~###~%]
[%~ ELSIF report_entry == 'already_moderated' ~%]
......
default/mail_tt2/which.tt2
View file @ 6bfb5e64
......@@ -13,7 +13,7 @@ Subject: [% FILTER qencode %][%|loc%]Result of your command[%END%][%END%]
[% END %]
[% END -%]
[% IF is_editor %][%|loc%]Lists you are editor of:[%END%]
[% IF is_editor %][%|loc%]Lists you are moderator of:[%END%]
[% FOREACH l = editor_lists -%]
[% l %]
......
default/scenari/send.editordkim
View file @ 6bfb5e64
title.gettext Moderated, no authentication needed if DKIM signature from editor is OK
title.gettext Moderated, no authentication needed if DKIM signature from moderator is OK
is_editor([listname],[sender]) dkim,md5,smime -> do_it
is_editor([listname],[sender]) smtp -> request_auth
......
default/scenari/send.editorkeyonlyauth
View file @ 6bfb5e64
title.gettext Moderated, need authentication from editor
title.gettext Moderated, need authentication from moderator
is_editor([listname],[sender]) smtp,dkim -> request_auth
true() smtp,dkim,smime,md5 -> editorkey
default/web_tt2/editfile.tt2
View file @ 6bfb5e64
......@@ -49,7 +49,7 @@
<a href="[% 'editfile' | url_rel([list,'welcome.tt2',previous_action]) %]" class="MainMenuLinks">[%|loc%]Edit[%END%]</a> [%|loc%]Welcome message: This message is sent to new subscribers. It can be a full MIME structured message (only for MIME gurus).[%END%]<br />
[% END %]
[% IF files.$item2 %]
<a href="[% 'editfile' | url_rel([list,'reject.tt2',previous_action]) %]" class="MainMenuLinks">[%|loc%]Edit[%END%]</a> [%|loc%]Rejection message: when a message is rejected by list editor, a notification can be sent to the original author. You may prepare various rejection messages.[%END%]<br />
<a href="[% 'editfile' | url_rel([list,'reject.tt2',previous_action]) %]" class="MainMenuLinks">[%|loc%]Edit[%END%]</a> [%|loc%]Rejection message: when a message is rejected by list moderator, a notification can be sent to the original author. You may prepare various rejection messages.[%END%]<br />
[% END %]
[% IF files.$item3 %]
<a href="[% 'editfile' | url_rel([list,'remind.tt2',previous_action]) %]" class="MainMenuLinks">[%|loc%]Edit[%END%]</a> [%|loc%]Reminder message: This message is sent to each subscriber when using the command REMIND. It's very useful to help people who are confused about their own subscription emails or people who are not able to unsubscribe themselves.[%END%]<br />
......
default/web_tt2/get_inactive_lists.tt2
View file @ 6bfb5e64
......@@ -13,7 +13,7 @@
<th>[%|loc%]Send scenario[%END%]</th>
<th>[%|loc%]Creator[%END%]</th>
<th>[%|loc%]Owners[%END%]</th>
<th>[%|loc%]Editors[%END%]</th>
<th>[%|loc%]Moderators[%END%]</th>
</tr>
[% FOREACH list = inactive_lists %]
......
default/web_tt2/including_lists.tt2
View file @ 6bfb5e64
......@@ -21,7 +21,7 @@
[%|loc%]Owner[%END ~%]
[% IF l.value.member_include %][%|loc%], [%END%][%END ~%]
[% ELSIF l.value.editor_include ~%]
[%|loc%]Editor[%END ~%]
[%|loc%]Moderator[%END ~%]
[% IF l.value.member_include %][%|loc%], [%END%][%END ~%]
[% END ~%]
[% IF l.value.member_include %][%|loc%]Subscriber[%END%][%END ~%]
......
default/web_tt2/list_menu.tt2
View file @ 6bfb5e64
......@@ -18,7 +18,7 @@
[%~ ELSIF owner_item ~%]
<i class="fa fa-star" title="[%|loc%]You are owner.[%END%]"></i>
[%~ ELSIF is_editor ~%]
<i class="fa fa-star-o" title="[%|loc%]You are editor.[%END%]"></i>
<i class="fa fa-star-o" title="[%|loc%]You are moderator.[%END%]"></i>
[%~ END %]
[%# Show display name of user specific to this list. %]
......@@ -45,7 +45,7 @@
[%|loc%]Owner[%END%]
[%~ IF is_subscriber %][%|loc%], [%END%][% END %]
[%~ ELSIF is_editor ~%]
[%|loc%]Editor[%END%]
[%|loc%]Moderator[%END%]
[%~ IF is_subscriber %][%|loc%], [%END%][% END %]
[%~ END %]
[%~ END %]
......
default/web_tt2/lists.tt2
View file @ 6bfb5e64
......@@ -35,7 +35,7 @@
[%|loc%]Owner[%END ~%]
[% IF which.$listname.is_subscriber %][%|loc%], [%END%][%END ~%]
[% ELSIF which.$listname.is_editor ~%]
[%|loc%]Editor[%END ~%]
[%|loc%]Moderator[%END ~%]
[% IF which.$listname.is_subscriber %][%|loc%], [%END%][%END ~%]
[% END ~%]
[% IF which.$listname.is_subscriber %][%|loc%]Subscriber[%END%][%END ~%]
......
default/web_tt2/my.tt2
View file @ 6bfb5e64
......@@ -22,7 +22,7 @@
[%|loc%]Owner[%END ~%]
[% IF l.value.is_subscriber %][%|loc%], [%END%][%END ~%]
[% ELSIF l.value.is_editor ~%]
[%|loc%]Editor[%END ~%]
[%|loc%]Moderator[%END ~%]
[% IF l.value.is_subscriber %][%|loc%], [%END%][%END ~%]
[% END ~%]
[% IF l.value.is_subscriber %][%|loc%]Subscriber[%END%][%END ~%]
......
default/web_tt2/nav.tt2
View file @ 6bfb5e64
......@@ -25,7 +25,7 @@
data-responsive-menu="drilldown medium-dropdown">
<li><a href="#list_create">[%|loc%]Create a list using a template[%END%]</a></li>
[% IF 0 %]<li class="divider" role="separator"></li>[% END %]
<li><a href="#list_copy">[%|loc%]Copy an existing list.[%END%]</a></li>
<li><a href="#list_copy">[%|loc%]Copy an existing list[%END%]</a></li>
</ul>
</menu>
</nav>
......@@ -230,7 +230,7 @@
[% IF action == 'compose_mail' %]
<h2 class="show-for-medium">
[% IF subaction == "html_news_letter" ~%]
[%|loc%]Sending an html page to the list [%END%]
[%|loc%]Sending an HTML page to the list[%END%]
[%~ ELSE ~%]
[%|loc%]Sending a message to the list[%END%]
[%~ END %]
......@@ -247,7 +247,7 @@
<div class="title-bar-title">
<span>
[% IF subaction == "html_news_letter" ~%]
[%|loc%]Sending an html page to the list [%END%]
[%|loc%]Sending an HTML page to the list[%END%]
[%~ ELSE ~%]
[%|loc%]Sending a message to the list[%END%]
[%~ END %]
......
default/web_tt2/search_user.tt2
View file @ 6bfb5e64
......@@ -34,7 +34,7 @@
<td>
[% IF l.value.is_member %][%|loc%]member[%END%] [% END %]
[% IF l.value.is_owner %][%|loc%]owner[%END%] [% END %]
[% IF l.value.is_editor %][%|loc%]editor[%END%] [% END %]
[% IF l.value.is_editor %][%|loc%]moderator[%END%] [% END %]
</td>
<td>
[%|optdesc('reception')%][% l.value.reception %][% END %]
......
default/web_tt2/user_menu.tt2
View file @ 6bfb5e64
......@@ -22,7 +22,7 @@
[%~ ELSIF owner_item ~%]
<i class="fa fa-star" title="[%|loc%]You are owner.[%END%]"></i>
[%~ ELSIF is_editor ~%]
<i class="fa fa-star-o" title="[%|loc%]You are editor.[%END%]"></i>
<i class="fa fa-star-o" title="[%|loc%]You are moderator.[%END%]"></i>
[%~ END %]
[%# Show roles on this list. ~%]
......@@ -38,7 +38,7 @@
[%|loc%]Owner[%END%]
[%~ IF is_subscriber %][%|loc%], [%END%][% END %]
[%~ ELSIF is_editor ~%]
[%|loc%]Editor[%END%]
[%|loc%]Moderator[%END%]
[%~ IF is_subscriber %][%|loc%], [%END%][% END %]
[%~ END %]
[%~ END %]
......
src/lib/Sympa/ConfDef.pm
View file @ 6bfb5e64
......@@ -568,7 +568,7 @@ our @params = (
'vhost' => '1',
'edit' => '1',
'gettext_comment' =>
'Restrict list ownership to addresses in the specified domains. This can be used to reserve list ownership to a group of trusted users from a set of domains associated with an organization, while allowing editors and subscribers from the Internet at large.',
'Restrict list ownership to addresses in the specified domains. This can be used to reserve list ownership to a group of trusted users from a set of domains associated with an organization, while allowing moderators and subscribers from the Internet at large.',
'default' => undef,
},
{ 'name' => 'owner_domain_min',
......@@ -1720,7 +1720,7 @@ our @params = (
'optional' => '1',
'gettext_id' => 'Script to report spam',
'gettext_comment' =>
'If set, when a list editor report undetected spams for list moderation, this external script is invoked and the message is injected into standard input of the script.',
'If set, when a list moderator report undetected spams for list moderation, this external script is invoked and the message is injected into standard input of the script.',
'vhost' => '1',
'file' => 'sympa.conf',
},
......@@ -1781,7 +1781,7 @@ our @params = (
{ 'gettext_id' => 'Data sources setup',
'gettext_comment' =>
'Including subscribers, owners and editors from data sources. Appropriate database driver (DBD) modules are required: DBD-CSV, DBD-mysql, DBD-ODBC, DBD-Oracle, DBD-Pg, DBD-SQLite, DBD-Sybase and/or Net-LDAP. And also, if secure connection (LDAPS) to LDAP server is required: IO-Socket-SSL.',
'Including subscribers, owners and moderators from data sources. Appropriate database driver (DBD) modules are required: DBD-CSV, DBD-mysql, DBD-ODBC, DBD-Oracle, DBD-Pg, DBD-SQLite, DBD-Sybase and/or Net-LDAP. And also, if secure connection (LDAPS) to LDAP server is required: IO-Socket-SSL.',
},
{ 'name' => 'default_sql_fetch_timeout',
......
src/lib/Sympa/ListDef.pm
View file @ 6bfb5e64
......@@ -2578,7 +2578,7 @@ our %user_info = (
group => 'description',
gettext_id => "Moderators",
gettext_comment =>
"Editors are responsible for moderating messages. If the mailing list is moderated, messages posted to the list will first be passed to the editors, who will decide whether to distribute or reject it.\nFYI: Defining editors will not make the list moderated; you will have to set the \"send\" parameter.\nFYI: If the list is moderated, any editor can distribute or reject a message without the knowledge or consent of the other editors. Messages that have not been distributed or rejected will remain in the moderation spool until they are acted on.",
"Moderators are responsible for moderating messages. If the mailing list is moderated, messages posted to the list will first be passed to the moderators, who will decide whether to distribute or reject it.\nFYI: Defining moderators will not make the list moderated; you will have to set the \"send\" parameter.\nFYI: If the list is moderated, any moderator can distribute or reject a message without the knowledge or consent of the other moderators. Messages that have not been distributed or rejected will remain in the moderation spool until they are acted on.",
format => {
email => {
order => 1,
......
src/lib/Sympa/ListOpt.pm
View file @ 6bfb5e64
......@@ -188,7 +188,7 @@ my %list_option = (
{'gettext_id' => 'authenticated by S/MIME signature'},
'dkim_authenticated_messages' =>
{'gettext_id' => 'authenticated by DKIM signature'},
'editor_validated_messages' => {'gettext_id' => 'approved by editor'},
'editor_validated_messages' => {'gettext_id' => 'approved by moderator'},
'any' => {'gettext_id' => 'any messages'},
# archive.period
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment