Merge branch 'develop'

# Conflicts:
#	CHANGELOG.md
#	source/misc.php

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.2.1 (2023-05-10)
+------------------
+
+- Change key in misc, replace "required" by "required_field" ; see https://github.com/Laravel-Lang/publisher/issues/329
+
+
 1.2.0 (2023-05-01)
 ------------------
 

GLOSSARY.md

@@ -54,7 +54,7 @@
 |[Yes](#yes)|[No](#no)|[All](#all)|[All Fem](#all-fem)|[Previous](#previous)|
 |[Previous Fem](#previous-fem)|[Next](#next)|[Next Fem](#next-fem)|[Or](#or)|[Other](#other)|
 |[With](#with)|[Without](#without)|[Recycle Bin](#recycle-bin)|[Recycle Bin Of](#recycle-bin-of)|[Archives](#archives)|
-|[Archives Of](#archives-of)|[Required](#required)|[Info Required Fields](#info-required-fields)|[Page N](#page-n)|[Developed By](#developed-by)|
+|[Archives Of](#archives-of)|[Required Field](#required-field)|[Info Required Fields](#info-required-fields)|[Page N](#page-n)|[Developed By](#developed-by)|
 |[Under Maintenance](#under-maintenance)|[Quoted](#quoted)| | | |
 
 
@@ -1627,17 +1627,17 @@ trans('misc.archives_of', [
 
 [Back to top ^](#glossary)
 
-### Required
+### Required Field
 
 <details>
-<summary>Click for details and usage of Required</summary>
+<summary>Click for details and usage of Required Field</summary>
 
-- Key: `'required'`
-- Value: `'required'`
-- Usage: `'misc.required'`
+- Key: `'required_field'`
+- Value: `'required field'`
+- Usage: `'misc.required_field'`
 
 ```php
-trans('misc.required');
+trans('misc.required_field');
 ```
 
 </details>

locales/en/php.json

@@ -101,7 +101,7 @@
     "refresh_something": "refresh :something",
     "reload": "reload",
     "reload_something": "reload :something",
-    "required": "required",
+    "required_field": "required field",
     "restore": "restore",
     "restore_something": "restore :something",
     "save": "save",

locales/fr/php.json

@@ -101,7 +101,7 @@
     "refresh_something": "rafraîchir :something",
     "reload": "recharger",
     "reload_something": "recharger :something",
-    "required": "requis",
+    "required_field": "champs requis",
     "restore": "restaurer",
     "restore_something": "restaurer :something",
     "save": "enregistrer",

source/misc.php

@@ -24,7 +24,8 @@
     'archives' => 'archives',
     'archives_of' => 'archives of :things',
 
-    'required' => 'required',
+    'required_field' => 'required field',
+
     'info_required_fields' => 'Mandatory fields are indicated by:',
 
     'page_n' => 'Page :number',