Merge remote-tracking branch 'parent/stable-4.2' into kb-draft-5.3-lts

2023-10-10 21:37:49 +09:00 · 2023-10-10 21:37:49 +09:00 · e2c7a6e59b
commit e2c7a6e59b
parent 3d936a8fad 790fd1374f
13 changed files with 90 additions and 46 deletions
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@ -322,6 +322,7 @@ my:
        url: URL ဆုံးမှတ်
    'no': 'မလုပ်ပါ'
    not_recommended: ထောက်ခံထားမှုမရှိ
+    overridden: ပယ်ဖျက်
    recommended: ထောက်ခံထားပြီး
    required:
      mark: "*"