Merge branch '6.1' into 6

silverstripe · Nov 13, 2023 · 770e09e · 770e09e
2 parents 4b85a33 + 9e4c37e
commit 770e09e
Show file tree

Hide file tree

Showing 4 changed files with 333 additions and 30 deletions.
diff --git a/client/lang/fr.js b/client/lang/fr.js
@@ -6,19 +6,19 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('fr', {
-    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
-    "UserForms.ADDED_FIELD": "Added new field",
-    "UserForms.ADDED_OPTION": "Added option",
-    "UserForms.ADDING_FIELD": "Adding new field",
-    "UserForms.ADDING_OPTION": "Adding option",
-    "UserForms.ADDING_RULE": "Adding rule",
-    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
-    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
-    "UserForms.ERROR_CREATING_FIELD": "Error creating field",
-    "UserForms.ERROR_CREATING_OPTION": "Error creating option",
-    "UserForms.HIDE_OPTIONS": "Hide options",
-    "UserForms.LEAVE_CONFIRMATION": "You have unsaved changes!",
-    "UserForms.REMOVED_OPTION": "Removed option",
-    "UserForms.SHOW_OPTIONS": "Show options"
+    "GRIDFIELD.ERRORINTRANSACTION": "Une erreur est survenue durant la transaction avec le serveur\nMerci de réessayer plus tard.",
+    "UserForms.ADDED_FIELD": "Nouveau champ ajouté",
+    "UserForms.ADDED_OPTION": "Option ajoutée",
+    "UserForms.ADDING_FIELD": "Ajout d'un nouveau champ",
+    "UserForms.ADDING_OPTION": "Ajout d'une option",
+    "UserForms.ADDING_RULE": "Ajout d'une règle",
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Toutes les soumissions seront définitivement supprimées. Continuer ?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Veuillez corriger les erreurs suivantes et réessayer :",
+    "UserForms.ERROR_CREATING_FIELD": "Erreur lors de la création du champ",
+    "UserForms.ERROR_CREATING_OPTION": "Erreur lors de la création de l'option",
+    "UserForms.HIDE_OPTIONS": "Masquer les options",
+    "UserForms.LEAVE_CONFIRMATION": "Vous avez des changements non enregistrés !",
+    "UserForms.REMOVED_OPTION": "Option supprimée",
+    "UserForms.SHOW_OPTIONS": "Afficher les options"
 });
 }
diff --git a/client/lang/src/fr.js b/client/lang/src/fr.js
@@ -1,16 +1,16 @@
 {
-    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
-    "UserForms.ADDED_FIELD": "Added new field",
-    "UserForms.ADDED_OPTION": "Added option",
-    "UserForms.ADDING_FIELD": "Adding new field",
-    "UserForms.ADDING_OPTION": "Adding option",
-    "UserForms.ADDING_RULE": "Adding rule",
-    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
-    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
-    "UserForms.ERROR_CREATING_FIELD": "Error creating field",
-    "UserForms.ERROR_CREATING_OPTION": "Error creating option",
-    "UserForms.HIDE_OPTIONS": "Hide options",
-    "UserForms.LEAVE_CONFIRMATION": "You have unsaved changes!",
-    "UserForms.REMOVED_OPTION": "Removed option",
-    "UserForms.SHOW_OPTIONS": "Show options"
+    "GRIDFIELD.ERRORINTRANSACTION": "Une erreur est survenue durant la transaction avec le serveur\nMerci de réessayer plus tard.",
+    "UserForms.ADDED_FIELD": "Nouveau champ ajouté",
+    "UserForms.ADDED_OPTION": "Option ajoutée",
+    "UserForms.ADDING_FIELD": "Ajout d'un nouveau champ",
+    "UserForms.ADDING_OPTION": "Ajout d'une option",
+    "UserForms.ADDING_RULE": "Ajout d'une règle",
+    "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Toutes les soumissions seront définitivement supprimées. Continuer ?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Veuillez corriger les erreurs suivantes et réessayer :",
+    "UserForms.ERROR_CREATING_FIELD": "Erreur lors de la création du champ",
+    "UserForms.ERROR_CREATING_OPTION": "Erreur lors de la création de l'option",
+    "UserForms.HIDE_OPTIONS": "Masquer les options",
+    "UserForms.LEAVE_CONFIRMATION": "Vous avez des changements non enregistrés !",
+    "UserForms.REMOVED_OPTION": "Option supprimée",
+    "UserForms.SHOW_OPTIONS": "Afficher les options"
 }