aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-03-27 08:58:33 +0200
committerGitHub2018-03-27 08:58:33 +0200
commit0cc229aa718b44b0c1e4880cfe2f5fc830571bfa (patch)
tree7dcbd901cea12336c169050a293ac8e9e782a22f
parentdef56ba856879e421cbb50019f7906b48f406846 (diff)
parentd0e15cd7841f1f13a2ef0011a2845036b12e9d62 (diff)
downloadchouette-core-0cc229aa718b44b0c1e4880cfe2f5fc830571bfa.tar.bz2
Merge pull request #401 from af83/6241-compliance-control-set-affectation-labels
Refs #6241 Fix Compliance Control set affectation labels
-rw-r--r--config/locales/workbenches.en.yml5
-rw-r--r--config/locales/workbenches.fr.yml4
2 files changed, 9 insertions, 0 deletions
diff --git a/config/locales/workbenches.en.yml b/config/locales/workbenches.en.yml
index 2d9b27045..b11f35049 100644
--- a/config/locales/workbenches.en.yml
+++ b/config/locales/workbenches.en.yml
@@ -29,3 +29,8 @@ en:
zero: "workbench"
one: "workbench"
other: "workbenches"
+ attributes:
+ workbench:
+ import_compliance_control_set_id: Space data before import
+ merge_compliance_control_set_id: Space data before merge
+
diff --git a/config/locales/workbenches.fr.yml b/config/locales/workbenches.fr.yml
index 8eee1a516..d7e3327ac 100644
--- a/config/locales/workbenches.fr.yml
+++ b/config/locales/workbenches.fr.yml
@@ -29,3 +29,7 @@ fr:
zero: "espace de travail"
one: "espace de travail"
other: "espaces de travail"
+ attributes:
+ workbench:
+ import_compliance_control_set_id: Jeu de données après import
+ merge_compliance_control_set_id: Jeu de Données avant intégration