diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-12-13 18:46:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-12-13 18:46:29 +0000 |
| commit | f30462595e83f512cd5f29246a4542773595a224 (patch) | |
| tree | 56eb7ce08ea5a8c6e0c21806e067c8c652e652b9 /config/locales | |
| parent | 3186130966cea85d842faf5c038006f8fb40bb61 (diff) | |
| download | redmine-f30462595e83f512cd5f29246a4542773595a224.tar.gz redmine-f30462595e83f512cd5f29246a4542773595a224.zip | |
Optional Regex delimiters to truncate incoming emails (#5864).
git-svn-id: http://svn.redmine.org/redmine/trunk@16065 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/fr.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index ba839aa78..669ea472f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -130,6 +130,7 @@ en: circular_dependency: "This relation would create a circular dependency" cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks" earlier_than_minimum_start_date: "cannot be earlier than %{date} because of preceding issues" + not_a_regexp: "is not a valid regular expression" actionview_instancetag_blank_option: Please select @@ -403,6 +404,7 @@ en: setting_display_subprojects_issues: Display subprojects issues on main projects by default setting_enabled_scm: Enabled SCM setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" + setting_mail_handler_enable_regex_delimiters: "Enable regular expressions" setting_mail_handler_api_enabled: Enable WS for incoming emails setting_mail_handler_api_key: Incoming email WS API key setting_sys_api_key: Repository management WS API key diff --git a/config/locales/fr.yml b/config/locales/fr.yml index abf39c8e6..a55c1883b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -150,6 +150,7 @@ fr: circular_dependency: "Cette relation créerait une dépendance circulaire" cant_link_an_issue_with_a_descendant: "Une demande ne peut pas être liée à l'une de ses sous-tâches" earlier_than_minimum_start_date: "ne peut pas être antérieure au %{date} à cause des demandes qui précèdent" + not_a_regexp: "n'est pas une expression regulière valide" actionview_instancetag_blank_option: Choisir @@ -415,6 +416,7 @@ fr: setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux setting_enabled_scm: SCM activés setting_mail_handler_body_delimiters: "Tronquer les emails après l'une de ces lignes" + setting_mail_handler_enable_regex_delimiters: "Utiliser les expressions regulières" setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails" setting_mail_handler_api_key: Clé de protection de l'API setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels |