Skip to content

Commit 12ee7ff

Browse files
committed
Update runtime files
1 parent 4c063a0 commit 12ee7ff

File tree

13 files changed

+1369
-221
lines changed

13 files changed

+1369
-221
lines changed

nsis/lang/simpchinese.nsi

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -45,47 +45,47 @@ LangString str_type_full ${LANG_SIMPCHINESE} \
4545
LangString str_section_old_ver ${LANG_SIMPCHINESE} \
4646
"卸载旧版本"
4747
LangString str_desc_old_ver ${LANG_SIMPCHINESE} \
48-
"卸载系统上旧版本的 Vim"
48+
"卸载系统上已存在的 Vim 版本"
4949

5050
LangString str_section_exe ${LANG_SIMPCHINESE} \
5151
"安装 Vim 图形界面"
5252
LangString str_desc_exe ${LANG_SIMPCHINESE} \
53-
"安装 Vim 图形界面及脚本。此为必选安装"
53+
"安装 Vim 图形界面及运行时文件。此项为必选"
5454

5555
LangString str_section_console ${LANG_SIMPCHINESE} \
56-
"安装 Vim 命令行程序"
56+
"安装 Vim 控制台版本"
5757
LangString str_desc_console ${LANG_SIMPCHINESE} \
58-
"安装 Vim 命令行程序 (vim.exe)。该程序在命令行窗口中运行"
58+
"安装 Vim 的控制台版本(vim.exe"
5959

6060
LangString str_section_batch ${LANG_SIMPCHINESE} \
6161
"安装批处理文件"
6262
LangString str_desc_batch ${LANG_SIMPCHINESE} \
63-
"为 Vim 的各种变体创建批处理程序,以便在命令行下运行 Vim。"
63+
"为 Vim 的各种变体创建批处理文件,以便在命令行下运行 Vim。"
6464

6565
LangString str_group_icons ${LANG_SIMPCHINESE} \
66-
"创建 Vim 图标"
66+
"创建图标"
6767
LangString str_desc_icons ${LANG_SIMPCHINESE} \
6868
"为 Vim 创建若干图标,以方便使用 Vim。"
6969

7070
LangString str_section_desktop ${LANG_SIMPCHINESE} \
71-
"在桌面上"
71+
"桌面图标"
7272
LangString str_desc_desktop ${LANG_SIMPCHINESE} \
73-
"在桌面上为 Vim 创建若干图标,以方便启动 Vim"
73+
"创建 Vim 的桌面快捷方式图标"
7474

7575
LangString str_section_start_menu ${LANG_SIMPCHINESE} \
76-
"在启动菜单的程序菜单下"
76+
"「开始」菜单程序组"
7777
LangString str_desc_start_menu ${LANG_SIMPCHINESE} \
78-
"在启动菜单的程序菜单下添加 Vim 组。适用于 Windows 95 及以上版本"
78+
"在开始菜单中添加 Vim 程序组(适用于 Windows 95 及以上版本"
7979

8080
#LangString str_section_quick_launch ${LANG_SIMPCHINESE} \
8181
# "在快速启动启动栏中"
8282
#LangString str_desc_quick_launch ${LANG_SIMPCHINESE} \
8383
# "在快速启动栏中添加 Vim 图标。"
8484

8585
LangString str_section_edit_with ${LANG_SIMPCHINESE} \
86-
"安装快捷菜单"
86+
"添加到快捷菜单"
8787
LangString str_desc_edit_with ${LANG_SIMPCHINESE} \
88-
"将 Vim 添加到“打开方式”快捷菜单中"
88+
"“用 Vim 编辑”添加到快捷菜单中"
8989

9090
#LangString str_section_edit_with32 ${LANG_SIMPCHINESE} \
9191
# "32 位版本"
@@ -98,10 +98,10 @@ LangString str_desc_edit_with ${LANG_SIMPCHINESE} \
9898
# "将 Vim 添加到 64 位程序的“打开方式”快捷菜单中。"
9999

100100
LangString str_section_vim_rc ${LANG_SIMPCHINESE} \
101-
"创建缺省配置文件"
101+
"创建默认配置文件"
102102
LangString str_desc_vim_rc ${LANG_SIMPCHINESE} \
103-
"在安装目录下生成缺省的 Vim 配置文件(_vimrc)。\
104-
如果该文件已经存在,则略过此项"
103+
"在安装目录下生成默认的 Vim 配置文件(_vimrc)。\
104+
如果该文件已经存在,则跳过该项"
105105

106106
LangString str_group_plugin ${LANG_SIMPCHINESE} \
107107
"创建插件目录"
@@ -121,9 +121,9 @@ LangString str_desc_plugin_vim ${LANG_SIMPCHINESE} \
121121
该目录下的扩展插件。"
122122

123123
LangString str_section_vis_vim ${LANG_SIMPCHINESE} \
124-
"安装 VisVim 插件"
124+
"VisVim 插件"
125125
LangString str_desc_vis_vim ${LANG_SIMPCHINESE} \
126-
"安装用于与微软 Microsoft Visual Studio 进行集成的 VisVim 插件。"
126+
"安装与 Visual Studio 集成的 VisVim 插件。"
127127

128128
LangString str_section_nls ${LANG_SIMPCHINESE} \
129129
"安装多语言支持"
@@ -153,12 +153,12 @@ LangString str_desc_rm_plugin_home ${LANG_SIMPCHINESE} \
153153
LangString str_unsection_plugin_vim ${LANG_SIMPCHINESE} \
154154
"公共插件目录"
155155
LangString str_desc_rm_plugin_vim ${LANG_SIMPCHINESE} \
156-
"Remove the plugin directories from Vim install directory."
156+
"Vim 安装目录下移除插件目录。"
157157

158158
LangString str_unsection_rootdir ${LANG_SIMPCHINESE} \
159-
"Remove the Vim root directory"
159+
"移除 Vim 主目录"
160160
LangString str_desc_rm_rootdir ${LANG_SIMPCHINESE} \
161-
"Remove the Vim root directory. It contains your Vim configuration files!"
161+
"移除 Vim 的主目录,该目录包含您的配置文件!"
162162

163163

164164
##############################################################################
@@ -225,26 +225,26 @@ LangString str_msg_rm_exe_fail ${LANG_SIMPCHINESE} \
225225
# 该目录下仍有其他文件。"
226226

227227
LangString str_msg_uninstalling ${LANG_SIMPCHINESE} \
228-
"Uninstalling the old version..."
228+
"正在卸载旧版本..."
229229

230230
LangString str_msg_registering ${LANG_SIMPCHINESE} \
231-
"Registering..."
231+
"正在注册..."
232232

233233
LangString str_msg_unregistering ${LANG_SIMPCHINESE} \
234-
"Unregistering..."
234+
"正在取消注册..."
235235

236236

237237
##############################################################################
238238
# Dialog Box {{{1
239239
##############################################################################
240240

241241
LangString str_vimrc_page_title ${LANG_SIMPCHINESE} \
242-
"Choose _vimrc settings"
242+
"设置 _vimrc"
243243
LangString str_vimrc_page_subtitle ${LANG_SIMPCHINESE} \
244-
"Choose the settings for enhancement, keyboard and mouse."
244+
"选择键盘、鼠标和增强选项。"
245245

246246
LangString str_msg_compat_title ${LANG_SIMPCHINESE} \
247-
" Vi / Vim behavior "
247+
"Vi / Vim 行为"
248248
LangString str_msg_compat_desc ${LANG_SIMPCHINESE} \
249249
"&Compatibility and enhancements"
250250
LangString str_msg_compat_vi ${LANG_SIMPCHINESE} \
@@ -257,7 +257,7 @@ LangString str_msg_compat_all ${LANG_SIMPCHINESE} \
257257
"Vim with all enhancements (load vimrc_example.vim) (Default)"
258258

259259
LangString str_msg_keymap_title ${LANG_SIMPCHINESE} \
260-
" Mappings "
260+
"键盘映射"
261261
LangString str_msg_keymap_desc ${LANG_SIMPCHINESE} \
262262
"&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
263263
LangString str_msg_keymap_default ${LANG_SIMPCHINESE} \
@@ -266,7 +266,7 @@ LangString str_msg_keymap_windows ${LANG_SIMPCHINESE} \
266266
"Remap a few keys"
267267

268268
LangString str_msg_mouse_title ${LANG_SIMPCHINESE} \
269-
" Mouse "
269+
"鼠标"
270270
LangString str_msg_mouse_desc ${LANG_SIMPCHINESE} \
271271
"&Behavior of right and left buttons"
272272
LangString str_msg_mouse_default ${LANG_SIMPCHINESE} \

runtime/doc/editing.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 8.1. Last change: 2019 Jun 02
1+
*editing.txt* For Vim version 8.1. Last change: 2019 Jun 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -593,7 +593,7 @@ You can use the argument list with the following commands, and with the
593593
expression functions |argc()| and |argv()|. These all work on the argument
594594
list of the current window.
595595

596-
*:ar* *:arg* *:args*
596+
*:ar* *:arg* *:args*
597597
:ar[gs] Print the argument list, with the current file in
598598
square brackets.
599599

runtime/doc/eval.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8868,7 +8868,7 @@ sound_playevent({name} [, {callback}])
88688868
finished. The first argument is the sound ID, the second
88698869
argument is the status:
88708870
0 sound was played to the end
8871-
1 sound was interruped
8871+
1 sound was interrupted
88728872
2 error occured after sound started
88738873
Example: >
88748874
func Callback(id, status)
@@ -8878,21 +8878,21 @@ sound_playevent({name} [, {callback}])
88788878
88798879
< Returns the sound ID, which can be passed to `sound_stop()`.
88808880
Returns zero if the sound could not be played.
8881-
{only available when compiled with the +sound feature}
8881+
{only available when compiled with the |+sound| feature}
88828882

88838883
*sound_playfile()*
88848884
sound_playfile({path} [, {callback}])
88858885
Like `sound_playevent()` but play sound file {path}. {path}
88868886
must be a full path. On Ubuntu you may find files to play
88878887
with this command: >
88888888
:!find /usr/share/sounds -type f | grep -v index.theme
8889-
< {only available when compiled with the +sound feature}
8889+
< {only available when compiled with the |+sound| feature}
88908890

88918891

88928892
sound_stop({id}) *sound_stop()*
88938893
Stop playing sound {id}. {id} must be previously returned by
88948894
`sound_playevent()` or `sound_playfile()`.
8895-
{only available when compiled with the +sound feature}
8895+
{only available when compiled with the |+sound| feature}
88968896

88978897
*soundfold()*
88988898
soundfold({word})

runtime/doc/index.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 8.1. Last change: 2019 May 25
1+
*index.txt* For Vim version 8.1. Last change: 2019 Jun 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1484,7 +1484,6 @@ tag command action ~
14841484
|:perldo| :perld[o] execute Perl command for each line
14851485
|:pop| :po[p] jump to older entry in tag stack
14861486
|:popup| :popu[p] popup a menu by name
1487-
|:popupclear| :popupc[lear] remove all popup windows
14881487
|:ppop| :pp[op] ":pop" in preview window
14891488
|:preserve| :pre[serve] write all text to swap file
14901489
|:previous| :prev[ious] go to previous file in argument list

runtime/doc/popup.txt

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
*popup.txt* For Vim version 8.1. Last change: 2019 Jun 09
1+
*popup.txt* For Vim version 8.1. Last change: 2019 Jun 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
55

66

77
Displaying text in floating window. *popup* *popup-window*
88

9-
THIS IS UNDER DESIGN - ANYTHING MAY STILL CHANGE
9+
THIS IS UNDER DESIGN - ANYTHING MAY STILL CHANGE
1010

1111
1. Introduction |popup-intro|
1212
2. Functions |popup-functions|
@@ -76,31 +76,21 @@ else. E.g. if you use `popup_atcursor()` the popup normally shows just above
7676
the current cursor position, but if the cursor is close to the top of the Vim
7777
window it will be placed below the cursor position.
7878

79+
When the screen scrolls up for output of an Ex command, popups move too, so
80+
that they will not cover the output.
7981

8082

81-
TODO:
82-
83-
Scrolling: When the screen scrolls up for output of an Ex command, what
84-
happens with popups?
85-
1. Stay where they are. Problem: listed text may go behind and can't be read.
86-
2. Scroll with the page. What if they get updated? Either postpone, or take
87-
the scroll offset into account.
88-
Probably 2. is the best choice.
8983

9084

9185
IMPLEMENTATION:
92-
- buffers remain after popup was deleted.
93-
- do not redraw whole window when popup was changed, mark affected lines for
94-
redraw.
86+
- buffers remain after a popup was deleted.
9587
- Why does 'nrformats' leak from the popup window buffer???
96-
- Add 'balloonpopup': instead of showing text, let the callback open a balloon
97-
and return the window ID. The popup will then be closed when the mouse
98-
moves, except when it moves inside the popup.
88+
- Add 'balloonpopup': instead of showing text, let the callback open a popup
89+
window and return the window ID. The popup will then be closed when the
90+
mouse moves, except when it moves inside the popup.
9991
- For the "moved" property also include mouse movement?
10092
- Make redrawing more efficient and avoid flicker:
10193
- put popup menu also put in popup_mask?
102-
- Use changes in popup_mask to decide what windows and range of lines to
103-
redraw?
10494
- Disable commands, feedkeys(), CTRL-W, etc. in a popup window.
10595
Use NOT_IN_POPUP_WINDOW for more commands.
10696
- Invoke filter with character before mapping?
@@ -114,7 +104,7 @@ IMPLEMENTATION:
114104
==============================================================================
115105
2. Functions *popup-functions*
116106

117-
THIS IS UNDER DESIGN - ANYTHING MAY STILL CHANGE
107+
THIS IS UNDER DESIGN - ANYTHING MAY STILL CHANGE
118108

119109
[functions to be moved to eval.txt later, keep overview of functions here]
120110

@@ -164,7 +154,7 @@ popup_create({text}, {options}) *popup_create()*
164154

165155

166156
popup_dialog({text}, {options}) *popup_dialog()*
167-
{not implemented yet}
157+
{not implemented yet}
168158
Just like |popup_create()| but with these default options: >
169159
call popup_create({text}, {
170160
\ 'pos': 'center',
@@ -176,7 +166,7 @@ popup_dialog({text}, {options}) *popup_dialog()*
176166

177167

178168
popup_filter_menu({id}, {key}) *popup_filter_menu()*
179-
{not implemented yet}
169+
{not implemented yet}
180170
Filter that can be used for a popup. It handles the cursor
181171
keys to move the selected index in the popup. Space and Enter
182172
can be used to select an item. Invokes the "callback" of the
@@ -185,7 +175,7 @@ popup_filter_menu({id}, {key}) *popup_filter_menu()*
185175

186176

187177
popup_filter_yesno({id}, {key}) *popup_filter_yesno()*
188-
{not implemented yet}
178+
{not implemented yet}
189179
Filter that can be used for a popup. It handles only the keys
190180
'y', 'Y' and 'n' or 'N'. Invokes the "callback" of the
191181
popup menu with the 1 for 'y' or 'Y' and zero for 'n' or 'N'
@@ -216,7 +206,7 @@ popup_getpos({id}) *popup_getpos()*
216206
core_line screen line of the text box
217207
core_width width of the text box in screen cells
218208
core_height height of the text box in screen cells
219-
visible one if the popup is displayed, zero if hidden
209+
visible one if the popup is displayed, zero if hidden
220210
Note that these are the actual screen positions. They differ
221211
from the values in `popup_getoptions()` for the sizing and
222212
positioning mechanism applied.
@@ -235,7 +225,7 @@ popup_hide({id}) *popup_hide()*
235225

236226

237227
popup_menu({text}, {options}) *popup_menu()*
238-
{not implemented yet}
228+
{not implemented yet}
239229
Show the {text} near the cursor, handle selecting one of the
240230
items with cursorkeys, and close it an item is selected with
241231
Space or Enter. {text} should have multiple lines to make this
@@ -260,7 +250,7 @@ popup_move({id}, {options}) *popup_move()*
260250

261251

262252
popup_notification({text}, {options}) *popup_notification()*
263-
{not implemented yet}
253+
{not implemented yet}
264254
Show the {text} for 3 seconds at the top of the Vim window.
265255
This works like: >
266256
call popup_create({text}, {
@@ -281,7 +271,7 @@ popup_show({id}) *popup_show()*
281271

282272

283273
popup_setoptions({id}, {options}) *popup_setoptions()*
284-
{not implemented yet}
274+
{not implemented yet}
285275
Override options in popup {id} with entries in {options}.
286276

287277

@@ -292,7 +282,7 @@ A new buffer is created to hold the text and text properties of the popup
292282
window. The buffer is always associated with the popup window and
293283
manipulation is restricted:
294284
- the buffer has no name
295-
- 'buftype' is "popup"
285+
- 'buftype' is "popup"
296286
- 'swapfile' is off
297287
- 'bufhidden' is "hide"
298288
- 'buflisted' is off
@@ -424,7 +414,7 @@ The second argument of |popup_create()| is a dictionary with options:
424414
{start} or after {end}
425415
The popup also closes if the cursor moves to another
426416
line or to another window.
427-
filter A callback that can filter typed characters, see
417+
filter A callback that can filter typed characters, see
428418
|popup-filter|.
429419
callback A callback that is called when the popup closes, e.g.
430420
when using |popup_filter_menu()|, see |popup-callback|.
@@ -486,7 +476,7 @@ key, e.g.: >
486476
return 1
487477
endif
488478
return 0
489-
endfunc
479+
endfunc
490480
491481
Currently the key is what results after any mapping. This may change...
492482

0 commit comments

Comments
 (0)