update locale

4 files changed, 72 insertions, 7 deletions

diff --git a/locale/en-us/script.lua b/locale/en-us/script.lua
index 56a11d52..0eaf7471 100644
--- a/locale/en-us/script.lua
+++ b/locale/en-us/script.lua
@@ -116,6 +116,18 @@ DIAG_UNDEFINED_DOC_PARAM              =
 'Undefined param `{}`.'
 DIAG_UNKNOWN_DIAG_CODE                =
 'Unknown diagnostic code `{}`.'
+DIAG_CAST_LOCAL_TYPE                  =
+'This variable has explicitly defined as `{def}`. Cannot convert its type to `{ref}`.'
+DIAG_CAST_FIELD_TYPE                  =
+'This field has explicitly defined as `{def}`. Cannot convert its type to `{ref}`.'
+DIAG_ASSIGN_TYPE_MISMATCH             =
+'Cannot assign `{ref}` to `{def}`.'
+DIAG_PARAM_TYPE_MISMATCH              =
+'Cannot assign `{ref}` to parameter `{def}`.'
+DIAG_UNKNOWN_CAST_VARIABLE            =
+'Unknown type conversion variable `{}`.'
+DIAG_CAST_TYPE_MISMATCH               =
+'Cannot convert `{ref}` to `{def}`。'
 
 MWS_NOT_SUPPORT         =
 '{} does not support multi workspace for now, I may need to restart to support the new workspace ...'
diff --git a/locale/en-us/setting.lua b/locale/en-us/setting.lua
index 82892dc2..541228ac 100644
--- a/locale/en-us/setting.lua
+++ b/locale/en-us/setting.lua
@@ -36,6 +36,8 @@ Adjust the enabled state of the built-in library. You can disable (or redefine)
 * `enable`: always enable
 * `disable`: always disable
 ]]
+config.runtime.meta               =
+'Format of the directory name of the meta files.'
 config.diagnostics.enable         =
 "Enable diagnostics."
 config.diagnostics.disable        =
@@ -43,12 +45,30 @@ config.diagnostics.disable        =
 config.diagnostics.globals        =
 "Defined global variables."
 config.diagnostics.severity       =
-"Modified diagnostic severity."
+[[
+Modify the diagnostic severity.
+
+End with `!` means override the group setting `diagnostics.groupSeverity`.
+]]
 config.diagnostics.neededFileStatus =
 [[
 * Opened:  only diagnose opened files
 * Any:     diagnose all files
-* Disable: disable this diagnostic
+* None:    disable this diagnostic
+
+End with `!` means override the group setting `diagnostics.groupFileStatus`.
+]]
+config.diagnostics.groupSeverity  =
+[[
+Modify the diagnostic severity in a group.
+'Fallback' means that diagnostics in this group are controlled by `diagnostics.severity` separately.
+Other settings will override individual settings without end of `!`.
+]]
+config.diagnostics.groupFileStatus =
+[[
+Modify the diagnostic needed file status in a group.
+'Fallback' means that diagnostics in this group are controlled by `diagnostics.neededFileStatus` separately.
+Other settings will override individual settings without end of `!`.
 ]]
 config.diagnostics.workspaceDelay =
 "Latency (milliseconds) for workspace diagnostics. When you start the workspace, or edit any file, the entire workspace will be re-diagnosed in the background. Set to negative to disable workspace diagnostics."
@@ -213,6 +233,13 @@ config.hint.await                        =
 'If the called function is marked `---@async`, prompt `await` at the call.'
 config.format.enable                     =
 'Enable code formatter.'
+config.format.defaultConfig              =
+[[
+The default format configuration. Has a lower priority than `.editorconfig` file in the workspace.
+Read [formatter docs](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs) to learn usage.
+]]
+config.spell.dict                        = -- TODO: need translate!
+'Custom words for spell checking.'
 config.telemetry.enable                  =
 [[
 Enable telemetry to send your editor information and error logs over the network. Read our privacy policy [here](https://github.com/sumneko/lua-language-server/wiki/Privacy-Policy).
diff --git a/locale/zh-cn/script.lua b/locale/zh-cn/script.lua
index 8919ff0a..302cd718 100644
--- a/locale/zh-cn/script.lua
+++ b/locale/zh-cn/script.lua
@@ -121,13 +121,13 @@ DIAG_CAST_LOCAL_TYPE                  =
 DIAG_CAST_FIELD_TYPE                  =
 '已显式定义字段的类型为 `{def}` ，不能再将其类型转换为 `{ref}`。'
 DIAG_ASSIGN_TYPE_MISMATCH             =
-'类型不匹配，不能将 `{ref}` 赋值给 `{def}`。'
+'不能将 `{ref}` 赋值给 `{def}`。'
 DIAG_PARAM_TYPE_MISMATCH              =
-'参数类型不匹配，不能将 `{ref}` 赋值给 `{def}`。'
+'不能将 `{ref}` 赋给参数 `{def}`。'
 DIAG_UNKNOWN_CAST_VARIABLE            =
 '未知的类型转换变量 `{}`。'
 DIAG_CAST_TYPE_MISMATCH               =
-'类型不匹配，不能将 `{ref}` 转换为 `{def}`。'
+'不能将 `{ref}` 转换为 `{def}`。'
 
 MWS_NOT_SUPPORT         =
 '{} 目前还不支持多工作目录，我可能需要重启才能支持新的工作目录...'
diff --git a/locale/zh-cn/setting.lua b/locale/zh-cn/setting.lua
index 1c538c60..bb357448 100644
--- a/locale/zh-cn/setting.lua
+++ b/locale/zh-cn/setting.lua
@@ -36,6 +36,8 @@ config.runtime.builtin            =
 * `enable`: 总是启用
 * `disable`: 总是禁用
 ]]
+config.runtime.meta               =
+'meta文件的目录名称格式。'
 config.diagnostics.enable         =
 "启用诊断。"
 config.diagnostics.disable        =
@@ -43,12 +45,29 @@ config.diagnostics.disable        =
 config.diagnostics.globals        =
 "已定义的全局变量。"
 config.diagnostics.severity       =
-"修改诊断等级。"
+[[
+修改诊断等级。
+以 `!` 结尾的设置优先级高于组设置 `diagnostics.groupSeverity`。
+]]
 config.diagnostics.neededFileStatus =
 [[
 * Opened:  只诊断打开的文件
 * Any:     诊断任何文件
-* Disable: 禁用此诊断
+* None:    禁用此诊断
+
+以 `!` 结尾的设置优先级高于组设置 `diagnostics.groupFileStatus`。
+]]
+config.diagnostics.groupSeverity  =
+[[
+批量修改一个组中的诊断等级。
+设置为 `Fallback` 意味着组中的诊断由 `diagnostics.severity` 单独设置。
+其他设置将覆盖单独设置，但是不会覆盖以 `!` 结尾的设置。
+]]
+config.diagnostics.groupFileStatus =
+[[
+批量修改一个组中的文件状态。
+设置为 `Fallback` 意味着组中的诊断由 `diagnostics.neededFileStatus` 单独设置。
+其他设置将覆盖单独设置，但是不会覆盖以 `!` 结尾的设置。
 ]]
 config.diagnostics.workspaceDelay =
 "进行工作区诊断的延迟（毫秒）。当你启动工作区，或编辑了任意文件后，将会在后台对整个工作区进行重新诊断。设置为负数可以禁用工作区诊断。"
@@ -213,6 +232,13 @@ config.hint.await                        =
 '如果调用的函数被标记为了 `---@async` ，则在调用处提示 `await` 。'
 config.format.enable                     =
 '启用代码格式化程序。'
+config.format.defaultConfig              =
+[[
+默认的格式化配置，优先级低于工作区内的 `.editorconfig` 文件。
+请查阅[格式化文档](https://github.com/CppCXY/EmmyLuaCodeStyle/tree/master/docs)了解用法。
+]]
+config.spell.dict                        =
+'拼写检查的自定义单词。'
 config.telemetry.enable                  =
 [[
 启用遥测，通过网络发送你的编辑器信息与错误日志。在[此处](https://github.com/sumneko/lua-language-server/wiki/%E9%9A%90%E7%A7%81%E5%A3%B0%E6%98%8E)阅读我们的隐私声明。