summaryrefslogtreecommitdiff
path: root/locale/en-us
diff options
context:
space:
mode:
Diffstat (limited to 'locale/en-us')
-rw-r--r--locale/en-us/meta.lua4
-rw-r--r--locale/en-us/script.lua8
2 files changed, 9 insertions, 3 deletions
diff --git a/locale/en-us/meta.lua b/locale/en-us/meta.lua
index 09612d76..8e4a2fb1 100644
--- a/locale/en-us/meta.lua
+++ b/locale/en-us/meta.lua
@@ -135,7 +135,7 @@ select =
'If `index` is a number, returns all arguments after argument number `index`; a negative number indexes from the end (`-1` is the last argument). Otherwise, `index` must be the string `"#"`, and `select` returns the total number of extra arguments it received.'
setfenv =
-'Sets the environment to be used by the given function. '
+'Sets the environment to be used by the given function.'
setmetatable =
[[
@@ -653,7 +653,7 @@ string.format =
'Returns a formatted version of its variable number of arguments following the description given in its first argument.'
string.gmatch =
[[
-Returns an iterator function that, each time it is called, returns the next captures from `pattern` (see §6.4.1) over the string s.
+Returns an iterator function that, each time it is called, returns the next captures from `pattern` (see §6.4.1) over the string s.
As an example, the following loop will iterate over all the words from string s, printing one per line:
```lua
diff --git a/locale/en-us/script.lua b/locale/en-us/script.lua
index a166cf47..1cba9dd5 100644
--- a/locale/en-us/script.lua
+++ b/locale/en-us/script.lua
@@ -33,7 +33,9 @@ DIAG_PREVIOUS_CALL =
DIAG_PREFIELD_CALL =
'Will be interpreted as `{}{}`. It may be necessary to add a `,` or `;`.'
DIAG_OVER_MAX_ARGS =
-'The function takes only {:d} parameters, but you passed {:d}.'
+'The function received a maximum of {:d} arguments, but got {:d}.'
+DIAG_MISS_ARGS =
+'the function received at least {:d} arguments, but got {:d}.'
DIAG_OVER_MAX_VALUES =
'Only has {} variables, but you set {} values.'
DIAG_AMBIGUITY_1 =
@@ -94,6 +96,8 @@ DIAG_NOT_YIELDABLE =
'The {}th parameter of this function was not marked as yieldable, but an async function was passed in. (Use `---@param name async fun()` to mark as yieldable)'
DIAG_DISCARD_RETURNS =
'The return values of this function cannot be discarded.'
+DIAG_NEED_CHECK_NIL =
+'Need check nil.'
DIAG_CIRCLE_DOC_CLASS =
'Circularly inherited classes.'
DIAG_DOC_FIELD_NO_CLASS =
@@ -271,6 +275,8 @@ PARSER_LUADOC_MISS_DIAG_MODE =
'<diagnostic mode> expected.'
PARSER_LUADOC_ERROR_DIAG_MODE =
'<diagnostic mode> incorrect.'
+PARSER_LUADOC_MISS_LOCAL_NAME =
+'<local name> expected.'
SYMBOL_ANONYMOUS =
'<Anonymous>'