Merge branch 'sumneko:master' into master

5 files changed, 25 insertions, 4 deletions

diff --git a/locale/en-us/meta.lua b/locale/en-us/meta.lua
index 858cde13..839dc27a 100644
--- a/locale/en-us/meta.lua
+++ b/locale/en-us/meta.lua
@@ -677,6 +677,12 @@ Returns the elements from the given list. This function is equivalent to
 ```
 By default, `i` is `1` and `j` is `#list`.
 ]]
+table.foreach               =
+'Executes the given f over all elements of table. For each element, f is called with the index and respective value as arguments. If f returns a non-nil value, then the loop is broken, and this value is returned as the final value of foreach.'
+table.foreachi              =
+'Executes the given f over the numerical indices of table. For each index, f is called with the index and respective value as arguments. Indices are visited in sequential order, from 1 to n, where n is the size of the table. If f returns a non-nil value, then the loop is broken and this value is returned as the result of foreachi.'
+table.getn                  =
+'Returns the number of elements in the table. This function is equivalent to `#list`.'
 
 utf8                        =
 ''
diff --git a/locale/en-us/script.lua b/locale/en-us/script.lua
index f5a3ec30..f16235b4 100644
--- a/locale/en-us/script.lua
+++ b/locale/en-us/script.lua
@@ -34,7 +34,7 @@ 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}.'
-DIAG_OVER_MAX_ARGS      =
+DIAG_OVER_MAX_VALUES    =
 'Only has {} variables, but you set {} values.'
 DIAG_AMBIGUITY_1        =
 'Compute `{}` first. You may need to add brackets.'
@@ -80,7 +80,7 @@ DIAG_COSE_NON_OBJECT    =
 'Cannot close a value of this type. (Unless set `__close` meta method)'
 DIAG_COUNT_DOWN_LOOP    =
 'Do you mean `{}` ?'
-DIAG_IMPLICIT_ANY       =
+DIAG_UNKNOWN            =
 'Can not infer type.'
 DIAG_DEPRECATED         =
 'Deprecated.'
@@ -464,6 +464,10 @@ This icon is a cat,
 Not a dog nor a fox!
              ↓↓↓
 ]]
+WINDOW_LUA_STATUS_DIAGNOSIS_TITLE=
+'Perform workspace diagnosis'
+WINDOW_LUA_STATUS_DIAGNOSIS_MSG  =
+'Do you want to perform workspace diagnosis?'
 WINDOW_APPLY_SETTING             =
 'Apply setting'
 WINDOW_CHECK_SEMANTIC            =
@@ -490,6 +494,8 @@ WINDOW_APPLY_WHITOUT_SETTING     =
 'Apply but do not modify settings'
 WINDOW_ASK_APPLY_LIBRARY         =
 'Do you need to configure your work environment as `{}`?'
+WINDOW_SEARCHING_IN_FILES        =
+'Searching in files...'
 
 CONFIG_LOAD_FAILED               =
 'Unable to read the settings file: {}'
@@ -531,3 +537,4 @@ CLI_CHECK_SUCCESS =
 'Diagnosis completed, no problems found'
 CLI_CHECK_RESULTS =
 'Diagnosis complete, {} problems found, see {}'
+
diff --git a/locale/pt-br/script.lua b/locale/pt-br/script.lua
index aa16c3d3..f40dc0c6 100644
--- a/locale/pt-br/script.lua
+++ b/locale/pt-br/script.lua
@@ -80,7 +80,7 @@ DIAG_COSE_NON_OBJECT    =
 'Não é possível fechar um valor desse tipo. (A menos que se defina o meta método `__close`)'
 DIAG_COUNT_DOWN_LOOP    =
 'Você quer dizer `{}` ?'
-DIAG_IMPLICIT_ANY       =
+DIAG_UNKNOWN            =
 'Não pode inferir tipo.'
 DIAG_DEPRECATED         =
 'Descontinuada.'
diff --git a/locale/zh-cn/meta.lua b/locale/zh-cn/meta.lua
index 8e7c37e8..61ba6c9b 100644
--- a/locale/zh-cn/meta.lua
+++ b/locale/zh-cn/meta.lua
@@ -655,6 +655,12 @@ table.unpack                =
 ```
 i 默认为 1 ，j 默认为 #list。
 ]]
+table.foreach               =
+'遍历表中的每一个元素，并以key和value执行回调函数。如果回调函数返回一个非nil值则循环终止,并且返回这个值。该函数等同pair(list),比pair(list)更慢。不推荐使用'
+table.foreachi              =
+'遍历数组中的每一个元素，并以索引号index和value执行回调函数。如果回调函数返回一个非nil值则循环终止,并且返回这个值。该函数等同ipair(list),比ipair(list)更慢。不推荐使用'
+table.getn                  =
+'返回表的长度。该函数等价于#list。'
 
 utf8                        =
 ''
diff --git a/locale/zh-cn/script.lua b/locale/zh-cn/script.lua
index f30257fb..75026526 100644
--- a/locale/zh-cn/script.lua
+++ b/locale/zh-cn/script.lua
@@ -80,7 +80,7 @@ DIAG_COSE_NON_OBJECT    =
 '无法 close 此类型的值。（除非给此类型设置 `__close` 元方法）'
 DIAG_COUNT_DOWN_LOOP    =
 '你的意思是 `{}` 吗？'
-DIAG_IMPLICIT_ANY       =
+DIAG_UNKNOWN            =
 '无法推测出类型。'
 DIAG_DEPRECATED         =
 '已废弃。'
@@ -489,6 +489,8 @@ WINDOW_APPLY_WHITOUT_SETTING     =
 '应用但不修改设置'
 WINDOW_ASK_APPLY_LIBRARY         =
 '是否需要将你的工作环境配置为 `{}` ？'
+WINDOW_SEARCHING_IN_FILES        =
+'正在文件中搜索...'
 
 CONFIG_LOAD_FAILED               =
 '无法读取设置文件：{}'