Skip to content

Commit

Permalink
Updating translation catalogs and source texts according to fixes on …
Browse files Browse the repository at this point in the history
…en_US catalog.
  • Loading branch information
Sympa authors authored and ikedas committed Nov 19, 2017
1 parent 76e7a3b commit 1e2e094
Show file tree
Hide file tree
Showing 121 changed files with 52,073 additions and 21,951 deletions.
2 changes: 1 addition & 1 deletion default/create_list_templates/hotline/comment.tt2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title.gettext Hotline mailing list

<ul>
<li>[%|loc%]everyone can post[%END%]</li>
<li>[%|loc%]everyone may post[%END%]</li>
<li>[%|loc%]private archives[%END%]</li>
<li>[%|loc%]controlled subscription[%END%]</li>
</ul>
2 changes: 1 addition & 1 deletion default/create_list_templates/public_web_forum/comment.tt2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext Web forum ML
title.gettext Web forum mailing list

<ul><li>[%|loc%]Messages can either be read via email (subscription) or via the web (web archives)[%END%]</li>
</ul>
2 changes: 1 addition & 1 deletion default/global_task_models/purge_logs_table.daily.task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext daily delete logs
title.gettext daily deletion of outdated logs

/ACTION
purge_logs_table ()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext daily delete tickets older than sympa.conf/one_time_ticket_table_ttl parameter
title.gettext daily deletion of outdated tickets

/ACTION
purge_one_time_ticket_table ()
Expand Down
2 changes: 1 addition & 1 deletion default/global_task_models/purge_session_table.daily.task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext daily delete sessions older than sympa.conf/session_expiration_period parameter
title.gettext daily termination of outdated sessions

/ACTION
purge_session_table ()
Expand Down
2 changes: 1 addition & 1 deletion default/global_task_models/purge_tables.daily.task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext daily delete unusefull item from any table
title.gettext daily deletion of unuseful items from table

/ACTION
purge_tables ()
Expand Down
2 changes: 1 addition & 1 deletion default/list_task_models/remind.2month.task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext remind message sent to subscribers every 2 month
title.gettext reminder message sent to subscribers every 2 months

/INIT
next([execution_date]+2m,EXEC)
Expand Down
2 changes: 1 addition & 1 deletion default/list_task_models/remind.monthly.task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext remind message sent to subscribers every month
title.gettext reminder message sent to subscribers every month

/INIT
next([execution_date]+1m,EXEC)
Expand Down
2 changes: 1 addition & 1 deletion default/list_task_models/remind.yearly.task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title.gettext remind message sent to subscribers every year
title.gettext reminder message sent to subscribers every year

/INIT
next([execution_date]+1y,EXEC)
Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/bye.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]Unsubscribed from %1[%END%][%END%]

[%|loc(user.email,list.name,list.host)%]Your email address (%1) has been removed from list %2@%3[%END%]
[%|loc%]bye ![%END%]
[%|loc%]bye![%END%]
2 changes: 1 addition & 1 deletion default/mail_tt2/d_install_shared.tt2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[%# d_install_shared.tt2 ~%]
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been installed.[%END%][%END%]
Subject: [% FILTER qencode %][%|loc%]Your document has been installed[%END%][%END%]

[%|loc(filename,list.name,list.host,installed_by)%]Your document %1 for list %2@%3 has been installed by %4 list editor.[%END%]

Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/d_reject_shared.tt2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been rejected.[%END%][%END%]
Subject: [% FILTER qencode %][%|loc%]Your document has been rejected[%END%][%END%]

[%|loc(filename,list.name,list.host,rejected_by)%]Your document %1 for list %2@%3 has been rejected by %4 list editor.[%END%]
4 changes: 2 additions & 2 deletions default/mail_tt2/delivery_status_notification.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Thank you for your attention.[%END%]

[%|loc(virus_name,recipient,sender)%]Our viruschecker found a virus named %1 in a message addressed to %2 and that seems to be yours (From: %3).[%END%]

[%|loc%]We stopped delivery of this email.[%END%]
[%|loc%]Delivery of this message has been blocked.[%END%]

[%|loc%]It may be useful to check your system for viruses.

Expand All @@ -117,7 +117,7 @@ You are not allowed to send this message for the following reason:[%END%]

[% recipient %]

[%|loc%]To find out the correct listname, ask for this server's lists directory:[%END%]
[%|loc%]To find out the correct list name, ask for this server's lists directory:[%END%]

[% | mailtourl({subject => 'WHICH'}) ~%]
[% conf.email %]@[% conf.host %]
Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/expire_warning1.tt2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[%# expire_warning1.tt2 ~%]
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]

[%|loc(list.name,list.host,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more;[%END%]
[%|loc(list.name,list.host,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%]
[% conf.email %]@[% conf.host %]
[%~ END %]
Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/expire_warning2.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]

[%|loc(list.name,list.host,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more;[%END%]
[%|loc(list.name,list.host,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%]
[% conf.email %]@[% conf.host %]
[%~ END %]
Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/invite.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END%

[%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%]

[%|loc%]To subscribe just hit the following link:[%END%]
[%|loc%]To subscribe, click the following URL:[%END%]
[% IF user_interfaces.size() == 1 && user_interfaces.0 == 'mail' -%]
[% | mailtourl({subject => "AUTH ${keyauth} ${cmd}"}) ~%]
[% conf.email %]@[% conf.host %]
Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/list_unknown.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Content-Description: Notification

[% list %]

[%|loc%]To find out the correct listname, ask for this server's lists directory:[%END%]
[%|loc%]To find out the correct list name, ask for this server's lists directory:[%END%]

[% | mailtourl({subject => 'WHICH'}) ~%]
[% conf.email %]@[% conf.host %]
Expand Down
50 changes: 25 additions & 25 deletions default/mail_tt2/listmaster_notification.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Subject: [% FILTER qencode %][%|loc%]Upgrade procedures failed[%END%][%END%]
Subject: [% FILTER qencode %][%|loc%]Database structure updated[%END%][%END%]
X-Sympa-NoWrap: yes

[%|wrap(0,0)%][%|loc(db_name)%]The database structure has been updated; check log file for further details: [%END%][%END#wrap%]
[%|wrap(0,0)%][%|loc(db_name)%]The database structure has been updated, Check the log file for further details: [%END%][%END#wrap%]

[% FOREACH report_item IN report -%]
[% report_item %]
Expand Down Expand Up @@ -133,10 +133,10 @@ X-Sympa-Attach: yes
[% ELSIF type == 'virus_scan_failed' -%]
Subject: [% FILTER qencode %][%|loc%]Antivirus scan failed[%END%][%END%]

[%|loc%]The antivirus scan has failed while processing the following file:[%END%]
[%|loc%]The antivirus scan failed while processing the following file:[%END%]
[% filename %]

[%|loc%]The returned error message:[%END%]
[%|loc%]The error message returned was:[%END%]
[% error_msg %]


Expand All @@ -145,19 +145,19 @@ Subject: [% FILTER qencode %][%|loc%]Parameter error[%END%][%END%]

[%|loc(par_name,par_value)%]The value for parameter %1 was badly defined: %2[%END%]
[%|loc(action)%]%1 impossible.[%END%]
[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[% ELSIF type == 'unable_to_create_dir' -%]
Subject: [% FILTER qencode %][%|loc%]Unable to create directory[%END%][%END%]

[%|loc(dir)%]Sympa could not create directory %1[%END%]
[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[% ELSIF type == 'archiving_failed' -%]
Subject: [% FILTER qencode %][%|loc%]A message archiving failed[%END%][%END%]

[%|loc(file,bad)%]Sympa could not archive message '%1'. Moving it into directory '%2'.[%END%]
[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[% ELSIF type == 'automatic_bounce_management' -%]
[% PROCESS 'automatic_bounce_management.tt2' -%]
Expand All @@ -174,7 +174,7 @@ Content-Disposition: inline
[%|loc(list.name,list.host)%]List: %1@%2[%END%]
[%|loc(error)%]Error: %1[%END%]
[%|loc(feedback_type)%]Feedback type: %1[%END%]
[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

--[%boundary%]
Content-Disposition: inline
Expand Down Expand Up @@ -211,15 +211,15 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Failed to include members for li
[% ELSIF type == 'sync_include_admin_failed' -%]
Subject: [% FILTER qencode %][%|loc(param0)%]admins update failed for list %1[%END%][%END%]

[%|loc%]Sympa could not include admins from external data sources; the database or LDAP directory might be unreachable.[%END%]
[%|loc%]Sympa could not include admins from external data sources. The database or LDAP directory might be unreachable.[%END%]
[%|loc%]Check Sympa log files for more precise information[%END%]

[% ELSIF type == 'no_owner_defined' -%]
Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END%][%END%]

[%|loc(param0)%]No owner is defined for list %1.[%END%]
[%|loc%]The list status has been set to error_config.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]


[% ELSIF type == 'listowner_email_changed' -%]
Expand All @@ -244,36 +244,36 @@ Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END

[%|loc(param0,param1)%]Errors occured while copying family %2 file in list %1 directory.[%END%]
[%|loc%]The list status has been set to error_config.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]


[% ELSIF type == 'no_respect_rules_family' -%]
Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END%][%END%]

[%|loc(param0,param1)%]List %1 configuration does not respect family %2 rules.[%END%]
[%|loc%]The list status has been set to error_config.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]

[% ELSIF type == 'no_check_rules_family' -%]
Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END%][%END%]

[%|loc(param0,param1)%]Sympa could not check family %2 rules with list %1 param_constraint.conf file.[%END%]
[%|loc%]The list status has been set to error_config.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]


[% ELSIF type == 'param_constraint_conf_error' -%]
Subject: [% FILTER qencode %][%|loc%]errors in param_constraint.conf file[%END%][%END%]

[%|loc(param0)%]Error(s) found in the file %1.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]


[% ELSIF type == 'param_constraint_conf_error' -%]
Subject: [% FILTER qencode %][%|loc%]errors in param_constraint.conf file[%END%][%END%]

[%|loc(param0)%]Error(s) found in the file %1.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]

[% ELSIF type == 'file_removed' -%]
Subject: [% FILTER qencode %][%|loc%]File removed[%END%][%END%]
Expand All @@ -287,28 +287,28 @@ Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END

[%|loc(param0,param1)%]Sympa could not load family %2 for list %1.[%END%]
[%|loc%]The list status has been set to error_config.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]

[% ELSIF type == 'instantiation_family' -%]
Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END%][%END%]

[%|loc(param0,param1)%]Failed to instantiate family %2 for list %1[%END%]
[%|loc%]The list status has been set to error_config.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]

[% ELSIF type == 'modify_list_family' -%]
Subject: [% FILTER qencode %][%|loc(param0)%]list %1 in status error_config[%END%][%END%]

[%|loc(param0,param1)%]Sympa could not modify list %1 (Family %2)[%END%]
[%|loc%]The list status has been set to error_config.[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]

[% ELSIF type == 'web_tt2_error' -%]
Subject: [% FILTER qencode %][%|loc%]Failed to parse web template[%END%][%END%]

[%|loc%]Sympa could not deliver the requested page for the following reason: [%END%]
[%|loc(param0)%]Error: %1[%END%]
[%|loc%]Check Sympa log files for more precise information.[%END%]
[%|loc%]Check the Sympa log files for more information.[%END%]

[%# INTERNAL SERVER ERROR : MAIL -%]
[% ELSIF type == 'mail_intern_error' -%]
Expand All @@ -320,14 +320,14 @@ Subject: [% FILTER qencode %][%|loc%]Listmaster: internal server error [%END%][%
[%IF error%][%error%]
[%END%]

[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[% ELSIF type == 'bounce_intern_error' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server error [%END%][%END%]

[%|loc(error)%]The following error occurred while managing bounces: %1[%END%]

[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[% ELSIF type == 'hundred_percent_error' -%]
Subject: [% FILTER qencode %][%|loc(list.name, list.host)%]Listmaster: list %1@%2 at 100 percents error [%END%][%END%]
Expand All @@ -336,7 +336,7 @@ Subject: [% FILTER qencode %][%|loc(list.name, list.host)%]Listmaster: list %1@%

[%|loc(sender)%]The user %1, who tried to send a mail to this list, has been warned, as well as the list owners.[%END%]

[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[%|loc%]Check the bounces in this list:[% END %] [% 'reviewbouncing' | url_abs([listname]) %]

Expand Down Expand Up @@ -393,12 +393,12 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server erro
[%ELSIF error == 'unable_to_load_list_of_topics'%][%|loc%]Unable to load list topics.[%END%]
[%ELSIF error == 'unable_to_load_create_list_templates'%][%|loc%]Unable to load create_list templates.[%END%]
[%ELSIF error == 'unable_get_family'%][%|loc(list.name)%]Unable to get family for list '%1'.[%END%]
[%ELSIF error == 'list_reload'%][%IF new_list.name %][%|loc(new_listname)%]Unable to reload list with new listname '%1'.[%END%][%ELSE%][%|loc%]Unable to reload list[%END%][%END%]
[%ELSIF error == 'list_reload'%][%IF new_list.name %][%|loc(new_listname)%]Unable to reload list with new list name '%1'.[%END%][%ELSE%][%|loc%]Unable to reload list[%END%][%END%]
[%ELSIF error == 'sync_include_failed' %][%|loc(list.name)%]Failed to include members for list '%1'[%END%]
[%ELSIF error == 'sync_include_admin_failed' %][%|loc(list.name)%]Failed to include list admins for list '%1'[%END%]
[%ELSIF error == 'no_owner_defined' %][%|loc%]No owner is defined for the list '%1'[%END%]
[%ELSIF error == 'exportation_failed' %][%|loc(list.name)%]The exportation to an Ldap directory failed for list '%1'[%END%]
[%ELSIF error == 'unable_to_check_list_smtp' %][%|loc(new_listname)%]Unable to check listname '%1' on SMTP server[%END%]
[%ELSIF error == 'unable_to_check_list_smtp' %][%|loc(new_listname)%]Unable to check list name '%1' on SMTP server[%END%]
[%ELSIF error == 'create_shared' %][%|loc(list.name)%]Cannot create shared for list '%1'.[%END%]
[%ELSIF error == 'restore_shared'%][%|loc(list.name)%]Cannot restore shared for list '%1'.[%END%]
[%ELSIF error == 'delete_shared'%][%|loc(list.name)%]Cannot delete shared for list '%1'.[%END%]
Expand All @@ -419,7 +419,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server erro
[%ELSIF error == 'unable_to_rename_list' %][%|loc(list.name,new_listname)%]Unable to rename list '%1' to '%2'.[%END%]
[%ELSIF error%][%error%]
[%END%]
[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[%# SYSTEM ERROR : WEB -%]
[% ELSIF type == 'web_system_error' -%]
Expand All @@ -431,7 +431,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: system error [%END%]
[%IF error == 'a' %]
[%ELSIF error%][% error %]
[%END%]
[%|loc%]See logs for more details.[%END%]
[%|loc%]See the logs for more details.[%END%]

[%# OTHER -%]
[% ELSE -%]
Expand Down
12 changes: 5 additions & 7 deletions default/mail_tt2/listowner_notification.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Subscription request to list %1[

[%|loc(list.name)-%]Dear owner of list %1,

A user asked to be added as a subscriber to your list. If this is OK with you, you should click on the following link:[%END%]
A user asked to be added as a subscriber to your list. If this is OK with you, you should click the following URL:[%END%]
[% IF user_interfaces.size() == 1 && user_interfaces.0 == 'mail' -%]
[% "${conf.email}@${conf.host}" | mailtourl({subject=>"AUTH ${keyauth} ADD ${list.name} ${who} ${gecos}"}) %]

Expand All @@ -60,7 +60,7 @@ A user asked to be added as a subscriber to your list. If this is OK with you, y
[%- END %]

[% IF custom_attribute %]
[%|loc%]The user has provided the following informations:[%END%]
[%|loc%]The user has provided the following information:[%END%]
[% FOREACH attribute = custom_attribute %]
[% attribute.key %][%|loc%]:[%END%] [% attribute.value.value -%]
[%END-%]
Expand All @@ -71,7 +71,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]UNsubscription request from list

[%|loc(list.name)-%]Dear owner of list %1,

A user asked to be deleted from your list. If this is OK with you, you should click on the following link:[% END %]
A user asked to be deleted from your list. If this is OK with you, you should click the following URL:[% END %]
[% IF user_interfaces.size() == 1 && user_interfaces.0 == 'mail' -%]
[% "${conf.email}@${conf.host}" | mailtourl({subject=>"AUTH ${keyauth} DEL ${list.name} ${who}"}) %]

Expand All @@ -87,9 +87,7 @@ A user asked to be deleted from your list. If this is OK with you, you should cl
[% ELSIF type == 'bounce_rate' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]WARNING: bounce rate too high in list %1[%END%][%END%]

[%|loc(list.name,rate)%]Bounce rate in list %1 is %2.

You should delete bouncing subscribers:
[%|loc(list.name,rate)%]Bounce rate in list %1 is %2. You should delete bouncing subscribers:
[%END%]
[% 'reviewbouncing' | url_abs([list.name]) %]

Expand All @@ -111,7 +109,7 @@ Content-Disposition: inline
[% IF reason == 'arf' -%]
[%|loc%]The user complain to abuse service about a message from the list using email feedback report.[%END%]
[% ELSIF reason == 'welcome' -%]
[%|loc%]The welcome message (or a subscription remind) sent to the user has triggered a non-delivery report. The user email address might be incorrect.[%END%]
[%|loc%]The welcome message (or a subscription reminder) sent to the user has triggered a non-delivery report. The user email address might be incorrect.[%END%]
[%END%]
[%|loc%](no action needed)[%END%]

Expand Down
2 changes: 1 addition & 1 deletion default/mail_tt2/message_report.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Subject: [% FILTER qencode %][%|loc%]Message distribution[%END%][%END%]

[% IF entry == 'moderating_message' -%]
[%|loc(list.name)%]Your message for list %1 has been forwarded to editor(s)[%END%]
[%|loc(list.name)%]Your message to the list '%1' has been forwarded to the moderator(s)[%END%]
[% ELSIF entry == 'message_distributed' -%]
[%|loc(key,list.name)%]Message %1 for list '%2' has been distributed.[%END%]
[% ELSIF entry == 'message_rejected' -%]
Expand Down
Loading

0 comments on commit 1e2e094

Please sign in to comment.