Commit 1cd30c97 authored by david.verdin's avatar david.verdin
Browse files

[change][Submitted by P. Maes, univ. Louvain] Removing URL from...

[change][Submitted by P. Maes, univ. Louvain] Removing URL from internationalization messages. Leavinf them had no sense, as an URL won't be translated, and any change in the layout (such as putting the URL in another line) would break the translation key. Fixed by putting the URL out of the i18n string.


git-svn-id: https://subversion.renater.fr/sympa/trunk@5917 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 75c9efc6
......@@ -4,4 +4,4 @@ Subject: [% FILTER qencode %][%|loc%]Your document has been installed.[%END%][%E
[%|loc(filename,list.name,list.host,installed_by)%]Your document %1 for list %2@%3
has been installed by %4 list editor.[%END%]
[%|loc(conf.wwsympa_url,list.name)%]The list document repository : %1/d_read/%2[%END%]
[%|loc%]The list document repository:[%END%] [% conf.wwsympa_url %]/d_read/[% list.name %]
......@@ -14,30 +14,29 @@ Content-Disposition: inline
[%|loc(list.name,msg_from)%]One new message from list %1 from %2 arrived. [%END%]
[%- IF spam_status == 'spam' -%][%|loc%]This message has been tagged as spam[%END%][% END %]
[%|loc(mod_spool_size)%]There are %1 message(s) awaiting moderation.[%END%]
[%|loc%]To browse the awaiting messages, you should click on the following link:[%END%] [% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[%|loc(mod_spool_size)%]They are %1 messages awaiting moderation.[%END%]
[%|loc%]To browse the awaiting messages, you should click on the following link:[%END%] <[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]>
[% IF method == 'md5' -%]
[% IF request_topic -%][%|loc(list.name,conf.wwsympa_url,modkey)%]To tag the message in list %1 for the appropriate topic, please use the following link :
[% IF request_topic -%][%|loc(list.name)%]To tag the message in list %1 for the appropriate topic, please use the following link:[%END%]
%2/viewmod/%1/%3
[%END%]
[% conf.wwsympa_url %]/viewmod/[% list.name %]/[% modkey %]
[%- ELSE -%]
[%- IF spam_status == 'spam' -%]
Because the new message is suspected to be a spam it is not attached to this one. You must use
the web interface to reject or validate it.
[%- ELSE -%]
[%|loc(list.name)%]To distribute the attached message in list %1:[%END%]
[% FILTER escape_url %]mailto:[%conf.sympa%]?subject=DISTRIBUTE [%list.name%] [%modkey%][% END %]
[%|loc(conf.email,conf.host)%]Or send a message to %1@%2 with the following subject :[%END%]
<[% FILTER escape_url %]mailto:[%conf.sympa%]?subject=DISTRIBUTE [%list.name%] [%modkey%][% END %]>
[%|loc(conf.email,conf.host)%]Or send a message to %1@%2 with the following subject:[%END%]
DISTRIBUTE [% list.name %] [% modkey %]
[%|loc%]To reject it (it will be removed):[%END%]
[% FILTER escape_url %]mailto:[%conf.sympa%]?subject=REJECT [%list.name%] [%modkey%][% END %]
[%|loc(conf.email,conf.host)%]Or send a message to %1@%2 with the following subject :[%END%]
<[% FILTER escape_url %]mailto:[%conf.sympa%]?subject=REJECT [%list.name%] [%modkey%][% END %]>
[%|loc(conf.email,conf.host)%]Or send a message to %1@%2 with the following subject:[%END%]
REJECT [% list.name %] [% modkey %]
[%|loc(conf.wwsympa_url)%]The messages moderating documentation: %1/help/admin#moderate[%END%]
[%|loc(conf.wwsympa_url)%]The messages moderating documentation:[%END%] <[% conf.wwsympa_url %]/help/admin#moderate>
--[% boundary %]
Content-Type: message/rfc822
......
......@@ -7,7 +7,7 @@ Content-Disposition: inline
[%|loc(total,list.name,list.host)%]There are %1 messages to be moderated for list %2@%3[%END%]
[%|loc(conf.wwsympa_url)%]The messages moderating documentation: %1/help/admin#moderate[%END%]
[%|loc%]The messages moderating documentation:[%END%] <[% conf.wwsympa_url %]/help/admin#moderate>
[% IF spool %]
--[% boundary1 %]
......
......@@ -32,8 +32,8 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Management of list %1[%END%][%EN
[%|loc(delegator,list.name,list.host)%]You have been delegate the responsability of list moderator by %1 for list %2@%3.[%END%]
[% END %]
[%|loc(conf.wwsympa_url,list.name)%]The list homepage: %1/info/%2[%END%]
[%|loc(conf.wwsympa_url)%]Owner and moderator guide: %1/help/admin[%END%]
[%|loc%]The list homepage:[%END%] [% conf.wwsympa_url %]/info/[% list.name %]
[%|loc%]Owner and moderator guide:[%END%] [% conf.wwsympa_url %]/help/admin
[% ELSIF type == 'ticket_to_send' -%]
......
......@@ -9,6 +9,6 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Welcome to list %1[%END%][%END%]
[% CATCH %]
[% END %]
[%|loc(conf.wwsympa_url,list.name)%]The list homepage: %1/info/%2[%END%]
[%|loc(conf.wwsympa_url)%]General informations about mailing lists: %1/help/introduction[%END%]
[%|loc%]The list homepage:[%END%] [% conf.wwsympa_url %]/info/[% list.name %]
[%|loc%]General informations about mailing lists:[%END%] [% conf.wwsympa_url %]/help/introduction
......@@ -44,7 +44,7 @@ msgstr "Synthese de vos abonnements"
#: ../src/Conf.pm:135
#, fuzzy
msgid "Error at line %d : %s\n"
msgstr "Erreur ligne %d : %s"
msgstr "Erreur ligne %d : %s\n"
# nlsref 1,3
#: ../src/Conf.pm:415
......@@ -6324,8 +6324,8 @@ msgstr ""
#. (conf.wwsympa_url,list.name)
#: ../mail_tt2/d_install_shared.tt2:7
msgid "The list document repository : %1/d_read/%2"
msgstr "L'espace documents de la liste : %1/d_read/%2"
msgid "The list document repository:"
msgstr "L'espace documents de la liste : "
#: ../mail_tt2/d_reject_shared.tt2:2
msgid "Your document has been rejected."
......@@ -8095,27 +8095,21 @@ msgstr "Ce message a été marqué comme spam."
msgid "They are %1 messages awaiting moderation."
msgstr "IL y a %1 messages en attente de modération."
#. (conf.wwsympa_url,one_time_ticket)
#: ../mail_tt2/moderate.tt2:18
msgid ""
"To browse the awaiting messages, you should click on the following link : %1/"
"ticket/%2"
"To browse the awaiting messages, you should click on the following link:"
msgstr ""
"Pour consulter la liste des messages en attente, veuillez cliquer sur le "
"lien suivant : %1/ticket/%2"
"lien suivant :"
#. (list.name,conf.wwsympa_url,modkey)
#. (list.name)
#: ../mail_tt2/moderate.tt2:24
msgid ""
"To tag the message in list %1 for the appropriate topic, please use the "
"following link :\n"
"\n"
"%2/viewmod/%1/%3\n"
"following link:"
msgstr ""
"Pour sélectionner un thème pour votre message, adressé à la liste %1, "
"consultez la page suivante :\n"
"\n"
"%2/viewmod/%1/%3\n"
"consultez la page suivante :"
#. (list.name)
#: ../mail_tt2/moderate.tt2:30
......@@ -8124,19 +8118,17 @@ msgstr "Pour diffuser le message ci-joint dans la liste %1 :"
#. (conf.email,conf.host)
#: ../mail_tt2/moderate.tt2:32 ../mail_tt2/moderate.tt2:37
msgid "Or send a message to %1@%2 with the following subject :"
msgid "Or send a message to %1@%2 with the following subject:"
msgstr "ou envoyez un e-mail à %1@%2 avec comme sujet :"
#: ../mail_tt2/moderate.tt2:35
msgid "To reject it (it will be removed):"
msgstr "Pour refuser sa diffusion (il sera effacé), cliquez ici :"
#. (conf.wwsympa_url)
#: ../mail_tt2/moderate.tt2:40 ../mail_tt2/modindex.tt2:10
msgid "The messages moderating documentation: %1/help/admin#moderate"
msgid "The messages moderating documentation:"
msgstr ""
"La documentation relative à la modération des messages : %1/help/"
"admin#moderate"
"La documentation relative à la modération des messages :"
#. (list.name)
#: ../mail_tt2/modindex.tt2:2
......@@ -8499,15 +8491,13 @@ msgid ""
msgstr "Vous avez été nommé modérateur de la liste %2@%3 par %1. "
# nlsref 15,14
#. (conf.wwsympa_url,list.name)
#: ../mail_tt2/user_notification.tt2:35 ../mail_tt2/welcome.tt2:12
msgid "The list homepage: %1/info/%2"
msgstr "La page d'accueil de la liste : %1/info/%2"
msgid "The list homepage:"
msgstr "La page d'accueil de la liste :"
#. (conf.wwsympa_url)
#: ../mail_tt2/user_notification.tt2:36
msgid "Owner and moderator guide: %1/help/admin"
msgstr "Le guide de l'administrateur : %1/help/admin"
msgid "Owner and moderator guide:"
msgstr "Le guide de l'administrateur :"
#: ../mail_tt2/user_notification.tt2:40
msgid "Changing your subscriber email address"
......@@ -8551,10 +8541,9 @@ msgstr "Bienvenue dans la liste %1@%2"
msgid "Your subscription email is %1"
msgstr "Votre adresse d'abonné est : %1"
#. (conf.wwsympa_url)
#: ../mail_tt2/welcome.tt2:13
msgid "General informations about mailing lists: %1/help/introduction"
msgstr "Introduction aux listes de diffusion : %1/help/introduction"
msgid "General informations about mailing lists:"
msgstr "Introduction aux listes de diffusion :"
# nlsref 4,17
#: ../mail_tt2/which.tt2:2
......
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