Merge remote-tracking branch 'vim/master'

2026-06-11 15:37:29 +02:00 · 2018-06-21 20:49:30 -07:00
parent ed3fd67cfc 39902a06d9
commit 21f99c1562
83 changed files with 1049 additions and 505 deletions
@@ -90,7 +90,7 @@ func! Test_check_colors()
    let err['background'] = 'Should not issue :syn on'
  endif

-  " 7) Does not define filetype specfic groups like vimCommand, htmlTag,
+  " 7) Does not define filetype specific groups like vimCommand, htmlTag,
  let hi_groups = ['vim', 'html', 'python', 'sh', 'ruby']
  for group in hi_groups
    let pat='\Chi\%[ghlight]\s*\zs'.group.'\w\+\>'
@@ -670,7 +670,10 @@ DirChanged			The working directory has changed in response
 ExitPre				When using `:quit`, `:wq` in a way it makes
 				Vim exit, or using `:qall`, just after
 				|QuitPre|.  Can be used to close any
-				non-essential window.
+				non-essential window.  Exiting may still be
+				cancelled if there is a modified buffer that
+				isn't automatically saved, use |VimLeavePre|
+				for really exiting.
 							*FileChangedShell*
 FileChangedShell		When Vim notices that the modification time of
 				a file has changed since editing started.
@@ -1399,7 +1402,7 @@ Careful: '[ and '] change when using commands that change the buffer.
 In commands which expect a file name, you can use "<afile>" for the file name
 that is being read |:<afile>| (you can also use "%" for the current file
 name).  "<abuf>" can be used for the buffer number of the currently effective
-buffer.  This also works for buffers that doesn't have a name.  But it doesn't
+buffer.  This also works for buffers that don't have a name.  But it doesn't
 work for files without a buffer (e.g., with ":r file").

 							*gzip-example*
@@ -806,8 +806,14 @@ The text of the prompt can be set with the |prompt_setprompt()| function.
 The user can go to Normal mode and navigate through the buffer.  This can be
 useful see older output or copy text.

+The CTRL-W key can be used to start a window command, such as CTRL-W w to
+switch to the next window.  This also works in Insert mode (use Shift-CTRL-W
+to delete a word). When leaving the window Insert mode will be stopped.  When
+coming back to the prompt window Insert mode will be restored.
+
 Any command that starts Insert mode, such as "a", "i", "A" and "I", will move
-the cursor to the last line, after the prompt.
+the cursor to the last line.  "A" will move to the end of the line, "I" to the
+start of the line.


 vim:tw=78:ts=8:ft=help:norl:
@@ -894,7 +894,8 @@ These modifiers can be given, in this order:
 		directory.
 	:.	Reduce file name to be relative to current directory, if
 		possible.  File name is unmodified if it is not below the
-		current directory.
+		current directory, but on MS-Windows the drive is removed if
+		it is the current drive.
 		For maximum shortness, use ":~:.".
 	:h	Head of the file name (the last component and any separators
 		removed).  Cannot be used with :e, :r or :t.
@@ -2108,6 +2108,7 @@ cscope_connection([{num}, {dbpath} [, {prepend}]])
 cursor({lnum}, {col} [, {off}])
 				Number	move cursor to {lnum}, {col}, {off}
 cursor({list})			Number	move cursor to position in {list}
+debugbreak({pid})		Number  interrupt process being debugged
 deepcopy({expr} [, {noref}])	any	make a full copy of {expr}
 delete({fname} [, {flags}])	Number	delete the file or directory {fname}
 deletebufline({expr}, {first}[, {last}])
@@ -3480,6 +3481,11 @@ cursor({list})
 		position within a <Tab> or after the last character.
 		Returns 0 when the position could be set, -1 otherwise.

+debugbreak({pid})					*debugbreak()*
+		Specifically used to interrupt a program being debugged.  It
+		will cause process {pid} to get a SIGTRAP.  Behavior for other
+		processes is undefined. See |terminal-debugger|.
+		{only available on MS-Windows}

 deepcopy({expr} [, {noref}])				*deepcopy()* *E698*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
@@ -5488,6 +5494,20 @@ job_start({command} [, {options}])			*job_start()*
 		The returned Job object can be used to get the status with
 		|job_status()| and stop the job with |job_stop()|.

+		Note that the job object will be deleted if there are no
+		references to it.  This closes the stdin and stderr, which may
+		cause the job to fail with an error.  To avoid this keep a
+		reference to the job.  Thus instead of: >
+	call job_start('my-command')
+<		use: >
+	let myjob = job_start('my-command')
+<		and unlet "myjob" once the job is not needed or is past the
+		point where it would fail (e.g. when it prints a message on
+		startup).  Keep in mind that variables local to a function
+		will cease to exist if the function returns.  Use a
+		script-local variable if needed: >
+	let s:myjob = job_start('my-command')
+<
 		{options} must be a Dictionary.  It can contain many optional
 		items, see |job-options|.

@@ -249,7 +249,7 @@ g:decada.Make_Command	string
 		External command used for |g:decada.Make()| (|'makeprg'|).

 						       *g:decada.Error_Format*
-g:decada.Error_Format|	string
+g:decada.Error_Format	string
 		Error format (|'errorformat'|).

 ==============================================================================
@@ -1,4 +1,6 @@
-*ft_rust.txt*      Filetype plugin for Rust
+*ft_rust.txt*	For Vim version 8.1.  Last change: 2017 Nov 02
+
+This is documentation for the Rust filetype plugin.

 ==============================================================================
 CONTENTS                                                      *rust*
@@ -434,11 +434,11 @@ An example for using CTRL-G U: >

 This makes it possible to use the cursor keys in Insert mode, without breaking
 the undo sequence and therefore using |.| (redo) will work as expected.
-Also entering a text like (with the "(" mapping from above): >
+Also entering a text like (with the "(" mapping from above):

   Lorem ipsum (dolor

-will be repeatable by the |.|to the expected
+will be repeatable by using |.| to the expected

   Lorem ipsum (dolor)

@@ -144,7 +144,7 @@ The default value for $VIM is set at compile time and can be determined with >
  :version

 The normal value is /boot/home/config/share/vim.  If you don't like it you can
-set the Vim environment variable to override this, or set 'helpfile' in your
+set the VIM environment variable to override this, or set 'helpfile' in your
 .vimrc: >

  :if version >= 500
@@ -169,7 +169,7 @@ you will need to get a version older than that.
 ==============================================================================
 6. Running under Windows 3.1				*win32-win3.1*

-					*win32s* *windows-3.1* *gui-w32s*
+				*win32s* *windows-3.1* *gui-w32s* *win16*
 There was a special version of gvim that runs under Windows 3.1 and 3.11.
 Support was removed in patch 7.4.1363.

@@ -1977,7 +1977,7 @@ set "lite_minlines" to the value you desire.  Example: >

 LPC						*lpc.vim* *ft-lpc-syntax*

-LPC stands for a simple, memory-efficient language: Lars Pensj| C.  The
+LPC stands for a simple, memory-efficient language: Lars Pensjö C.  The
 file name of LPC is usually *.c.  Recognizing these files as LPC would bother
 users writing only C programs.	If you want to use LPC syntax in Vim, you
 should set a variable in your .vimrc file: >
@@ -5163,6 +5163,7 @@ ant.vim	syntax.txt	/*ant.vim*
 ap	motion.txt	/*ap*
 apache.vim	syntax.txt	/*apache.vim*
 append()	eval.txt	/*append()*
+appendbufline()	eval.txt	/*appendbufline()*
 aquote	motion.txt	/*aquote*
 arabic.txt	arabic.txt	/*arabic.txt*
 arabicfonts	arabic.txt	/*arabicfonts*
@@ -5829,6 +5830,7 @@ definitions	intro.txt	/*definitions*
 delete()	eval.txt	/*delete()*
 delete-insert	change.txt	/*delete-insert*
 delete-menus	gui.txt	/*delete-menus*
+deletebufline()	eval.txt	/*deletebufline()*
 deleting	change.txt	/*deleting*
 demoserver.py	channel.txt	/*demoserver.py*
 design-assumptions	develop.txt	/*design-assumptions*
@@ -8157,6 +8159,10 @@ profiling-variable	eval.txt	/*profiling-variable*
 progname-variable	eval.txt	/*progname-variable*
 progpath-variable	eval.txt	/*progpath-variable*
 progress.vim	syntax.txt	/*progress.vim*
+prompt-buffer	channel.txt	/*prompt-buffer*
+prompt_setcallback()	eval.txt	/*prompt_setcallback()*
+prompt_setinterrupt()	eval.txt	/*prompt_setinterrupt()*
+prompt_setprompt()	eval.txt	/*prompt_setprompt()*
 pronounce	intro.txt	/*pronounce*
 psql	ft_sql.txt	/*psql*
 ptcap.vim	syntax.txt	/*ptcap.vim*
@@ -9088,10 +9094,13 @@ termdebug-commands	terminal.txt	/*termdebug-commands*
 termdebug-communication	terminal.txt	/*termdebug-communication*
 termdebug-customizing	terminal.txt	/*termdebug-customizing*
 termdebug-example	terminal.txt	/*termdebug-example*
+termdebug-prompt	terminal.txt	/*termdebug-prompt*
 termdebug-starting	terminal.txt	/*termdebug-starting*
 termdebug-stepping	terminal.txt	/*termdebug-stepping*
 termdebug-variables	terminal.txt	/*termdebug-variables*
 termdebug_popup	terminal.txt	/*termdebug_popup*
+termdebug_shortcuts	terminal.txt	/*termdebug_shortcuts*
+termdebug_use_prompt	terminal.txt	/*termdebug_use_prompt*
 termdebug_wide	terminal.txt	/*termdebug_wide*
 terminal	terminal.txt	/*terminal*
 terminal-api	terminal.txt	/*terminal-api*
@@ -9645,6 +9654,7 @@ whitespace	pattern.txt	/*whitespace*
 wildcard	editing.txt	/*wildcard*
 wildcards	editing.txt	/*wildcards*
 wildmenumode()	eval.txt	/*wildmenumode()*
+win16	os_win32.txt	/*win16*
 win32	os_win32.txt	/*win32*
 win32-!start	gui_w32.txt	/*win32-!start*
 win32-PATH	os_win32.txt	/*win32-PATH*
@@ -111,6 +111,16 @@ have a problem with this, disable bracketed paste by putting this in your
 If this is done while Vim is running the 't_BD' will be sent to the terminal
 to disable bracketed paste.

+If your terminal supports bracketed paste, but the options are not set
+automatically, you can try using something like this: >
+
+	if &term =~ "screen"
+	  let &t_BE = "\e[?2004h"
+	  let &t_BD = "\e[?2004l"
+	  exec "set t_PS=\e[200~"
+	  exec "set t_PE=\e[201~"
+	endif
+<
 							*cs7-problem*
 Note: If the terminal settings are changed after running Vim, you might have
 an illegal combination of settings.  This has been reported on Solaris 2.5
@@ -19,8 +19,8 @@ If the result is "1" you have it.
      Resizing				|terminal-resizing|
      Terminal Modes			|Terminal-mode|
      Cursor style			|terminal-cursor-style|
-      Special keys			|terminal-special-keys|
      Session				|terminal-session|
+      Special keys			|terminal-special-keys|
      Unix				|terminal-unix|
      MS-Windows			|terminal-ms-windows|
 2. Terminal communication	|terminal-communication|
@@ -116,9 +116,12 @@ break: >

 <							*options-in-terminal*
 After opening the terminal window and setting 'buftype' to "terminal" the
-BufWinEnter autocommand event is triggered.  This makes it possible to set
+TerminalOpen autocommand event is triggered.  This makes it possible to set
 options specifically for the window and buffer.  Example: >
-   au BufWinEnter * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
+   au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
+The <abuf> is set to the terminal buffer, but if there is no window (hidden
+terminal) then setting options will happen in the wrong buffer, therefore the
+check for &buftype in the example.

 Mouse events (click and drag) are passed to the terminal.  Mouse move events
 are only passed when Vim itself is receiving them.  For a terminal that is
@@ -449,7 +452,7 @@ Currently supported commands:
 		of the terminal and {argument}, the decoded JSON argument. 
 		The function name must start with "Tapi_" to avoid
 		accidentally calling a function not meant to be used for the
-		terminal API
+		terminal API.
 		The user function should sanity check the argument.
 		The function can use |term_sendkeys()| to send back a reply.
 		Example in JSON: >
@@ -702,11 +705,11 @@ Put focus on the gdb window and type: >
 Vim will start running in the program window. Put focus there and type: >
 	:help gui
 Gdb will run into the ex_help breakpoint.  The source window now shows the 
-ex_cmds.c file.  A ">>" marker will appear where the breakpoint was set.  The
-line where the debugger stopped is highlighted.  You can now step through the
-program.  Let's use the mouse: click on the "Next" button in the window
-toolbar.  You will see the highlighting move as the debugger executes a line
-of source code.
+ex_cmds.c file.  A red "1 " marker will appear in the signcolumn where the
+breakpoint was set.  The line where the debugger stopped is highlighted.  You
+can now step through the program.  Let's use the mouse: click on the "Next"
+button in the window toolbar.  You will see the highlighting move as the
+debugger executes a line of source code.

 Click "Next" a few times until the for loop is highlighted.  Put the cursor on
 the end of "eap->arg", then click "Eval" in the toolbar.  You will see this
@@ -785,6 +788,13 @@ source code, a new window will be created for the source code.  This also
 happens if the buffer in the source code window has been modified and can't be
 abandoned.

+Gdb gives each breakpoint a number.  In Vim the number shows up in the sign
+column, with a red background.  You can use these gdb commands:
+- info break	list breakpoints
+- delete N	delete breakpoint N
+You can also use the `:Clear` command if the cursor is in the line with the
+breakpoint, or use the "Clear breakpoint" right-click menu entry.
+

 Inspecting variables ~
 					*termdebug-variables* *:Evaluate*
@@ -828,6 +838,13 @@ There is another, hidden, buffer, which is used for Vim to communicate with
 gdb.  The buffer name is "gdb communication".  Do not delete this buffer, it
 will break the debugger.

+Gdb has some weird behavior, the plugin does its best to work around that.
+For example, after typing "continue" in the gdb window a CTRL-C can be used to
+interrupt the running program.  But after using the MI command
+"-exec-continue"  pressing CTRL-C does not interrupt.  Therefore you will see
+"continue" being used for the `:Continue` command, instead of using the
+communication channel.
+

 Customizing ~

@@ -885,7 +902,7 @@ vertical split: >
  let g:termdebug_wide = 163
 This will set &columns to 163 when :Termdebug is used.  The value is restored
 when quitting the debugger.
-If g:termdebug_wide is set and &Columns is already  larger than
+If g:termdebug_wide is set and &columns is already larger than
 g:termdebug_wide then a vertical split will be used without changing &columns.
 Set it to 1 to get a vertical split without every changing &columns (useful
 for when the terminal can't be resized by Vim).
@@ -42,11 +42,35 @@ Prompt buffer:
 - Add a command line history.
 - delay next prompt until plugin gives OK?

+Terminal debugger:
+- Using terminal window: after "cont" in gdb window CTRL-C interrupts, but
+  after :Continue it does not.  Mode of UI is changed?  :Stop does work.
+- patch from Christian to handle changing 'background'
+  and a patch to show breakpoint nr in sign. (June 14)
+- Make prompt-buffer variant work better.
+- Termdebug does not work when Vim was build with mzscheme: gdb hangs just
+  after "run".  Everything else works, including communication channel.  Not
+  initializing mzscheme avoid the problem, thus it's not some #ifdef.
+- Show breakpoint number in the sign? (Uri Moszkowicz, 2018 Jun 13, #3007)
+- Allow for users to create their own gdb mappings.  Perhaps by making the gdb
+  buffer global?  (Uri Moszkowicz, #3012) Or with a function to send a command
+  to gdb.
+
 Terminal emulator window:
- Win32: Termdebug doesn't work, because gdb does not support mi2 on a tty.
-  This plugin: https://github.com/cpiger/NeoDebug  runs gdb as a job,
-  redirecting input and output.
-  Open new console for for program with: "set new-console on"
+- With a vertical split only one window is updated. (Linwei, 2018 Jun 2,
+  #2977)
+- When typing : at the more prompt, instead of entering a new Vim command, the
+  : is inserted in the terminal window.  Should skip terminal_loop here.
+  ()
+- When pasting should call vterm_keyboard_start_paste(), e.g. when using
+  K_MIDDLEMOUSE, calling insert_reg().
+- Users expect parsing the :term argument like a shell does, also support
+  single quotes.  E.g. with:  :term grep 'alice says "hello"'  (#1999)
+- When running a shell in a terminal to run Vim tests, CTRL-W : the command
+  line keeps getting cleard.  Doing the same in another window is OK. (Jason
+  Franklin, 2018 Jun 17)
+- How to access selection in Terminal running a shell? (damnskippy, 2018 May
+  27, #29620  When terminal doesn't use the mouse, use modeless selection.
 - Win32: Redirecting input does not work, half of Test_terminal_redir_file()
  is disabled.
 - Win32: Redirecting output works but includes escape sequences.
@@ -61,9 +85,6 @@ Terminal emulator window:
  http://bazaar.launchpad.net/~leonerd/pangoterm/trunk/view/head:/main.c#L134
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
  conversions.
- Termdebug does not work when Vim was build with mzscheme: gdb hangs just
-  after "run".  Everything else works, including communication channel.  Not
-  initializing mzscheme avoid the problem, thus it's not some #ifdef.

 Does not build with MinGW out of the box:
 - _stat64 is not defined, need to use "struct stat" in vim.h
@@ -75,26 +96,32 @@ Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
 (Nobuhiro Takasaki, #2833)  Also check t_Co.

-Patch to fix arguments of :edit. (Dominique Pelle, 2018 May 28 #2966)
-
-Ptch to update html syntax. (Jorge Maldonado Ventura, #2974)
-
-Patch to fix that restoring window doesn't work when 'winheight' is large.
-(Darrell Nash, 2018 May 30, #2971)  Doesn't work?  Issue #2970
-
-Patch to add completion to :unlet for environment vars. (Jason Franklin, 2018
-May 30) Last update.
-
 Errors found with random data:
    heap-buffer-overflow in alist_add (#2472)

 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list

-Patch to make "is" and "as" work bettter. (Jason Franklin, 2018 May 19)
+Patch to make "is" and "as" work better. (Jason Franklin, 2018 May 19)

 Patch to add tests for user and language completion. (Dominique Pelle, 2018
-Jun 2, #2978)
+Jun 2, #2978)  typo wk -> we
+Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
+Aug 16)
+
+Patch to add tests for libcall() and libcallnr(). (Dominique Pelle, #2982)
+
+Patch to fix that v:shell_error is always zero when using terminal for shell
+command. (Ichizok, 2018 Jun 8, #2994)
+
+Patch to make test for terminal out&error more reliable. (Ichizok, 2018 Jun 8,
+#2991)
+
+Patch to fix duplicate entry in tagfiles() and add a test. (Dominique Pelle,
+#2979)
+
+Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
+Related to bracketed paste.

 Using ":file" in quickfix window during an autocommand doesn't work. 
 (Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
@@ -107,6 +134,9 @@ Patch for xterm and vt320 builtin termcap. (Kouichi Iwamoto, 2018 May 31,
 Patch to add more testing for :cd command. (Dominique Pelle, 2018 May 30,
 #2972)

+Patch to make mode() return something different for Normal mode when coming
+from Insert mode with CTRL-O. (#3000)
+
 Script generated by :mksession does not work well if there are windows with
 modified buffers
  change "silent only" into "silent only!"
@@ -162,6 +192,12 @@ CreateFile() returns ERROR_SHARING_VIOLATION (Linwei, 2018 May 5)
 Should add a test for every command line argument.  Check coverage for what is
 missing: --nofork, -A , -b, -h, etc.

+":au * * command" should not be allowed, only use * for event when listing or
+deleting autocmds, not when adding them.
+
+Quickfix window height is not kept with a vertical split. (Lifepillar, 2018
+Jun 10, #2998)
+
 Patch for variable tabstops.  On github (Christian Brabandt, 2014 May 15)
 Update 2018 March 12, #2711

@@ -215,7 +251,7 @@ Add the debug command line history to viminfo.
 Avoid that "sign unplace id" does a redraw right away, esp. when there is a
 sequence of these commands. (Andy Stewart, 2018 Mar 16)

-ch_sendraw() with long string does not try to read inbetween, which may cause
+ch_sendraw() with long string does not try to read in between, which may cause
 a deadlock if the reading side is waiting for the write to finish. (Nate
 Bosch, 2018 Jan 13, #2548)

@@ -242,6 +278,9 @@ Using 'wildignore' also applies to literally entered file name.  Also with

 Patch to support ":tag <tagkind> <tagname". (emmrk, 2018 May 7, #2871)

+Inserting a line in a CompleteDone autocommand may confuse undo. (micbou,
+2018 Jun 18, #3027)
+
 Implement option_save() and option_restore():
 option_restore({list})					*option_restore()*
 		Restore options previously saved by option_save().
@@ -933,7 +972,7 @@ Possibly include the needed code so that it can be build everywhere.
 Add a way to restart a timer.  It's similar to timer_stop() and timer_start(),
 but the reference remains valid.

-Need to try out instructions in INSSTALLpc.txt about how to install all
+Need to try out instructions in INSTALLpc.txt about how to install all
 interfaces and how to build Vim with them.
 Appveyor build with self-installing executable, includes getting most
 interfaces: https://github.com/k-takata/vim/tree/chrisbra-appveyor-build
@@ -1511,9 +1550,6 @@ The input map for CTRL-O in mswin.vim causes problems after CTRL-X CTRL-O.
 Suggestion for another map. (Philip Mat, 2012 Jun 18)
 But use "gi" instead of "a".  Or use CTRL-\ CTRL-O.

-Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
-Aug 16)
-
 When there are no command line arguments ":next" and ":argu" give E163, which
 is confusing.  Should say "the argument list is empty".

@@ -4168,8 +4204,6 @@ Vim script language:
 	virtualmode()		add argument to obtain whether "$" was used in
 				Visual block mode.
 	getacp()		Win32: get codepage (Glenn Maynard)
-	deletebufline()		delete line in any buffer
-	appendbufline()		append line in any buffer
 	libcall()		Allow more than one argument.
 	libcallext()		Like libcall(), but using a callback function
 				to allow the library to execute a command or
@@ -221,8 +221,8 @@ The most obvious side effect of this change is that when you source a vimrc
 file twice, the autocommands in it will be defined twice.  To avoid this, do
 one of these:

- Remove any autocommands that might potentially defined twice before
-  defining them.  Example: >
+- Remove any autocommands that might already be defined before defining
+  them.  Example: >
 	:au! * *.ext
 	:au BufEnter *.ext ...

@@ -16113,7 +16113,7 @@ Files:      src/edit.c, src/testdir/test_popup.vim

 Patch 8.0.0248
 Problem:    vim_strcat() cannot handle overlapping arguments.
-Solution:   Use mch_memmove() instead of strcpy(). (Justin M Keyes,
+Solution:   Use mch_memmove() instead of strcpy(). (Justin M. Keyes,
            closes #1415)
 Files:      src/misc2.c

@@ -16363,7 +16363,7 @@ Files:      src/screen.c
 Patch 8.0.0287
 Problem:    Cannot access the arguments of the current function in debug mode.
            (Luc Hermitte)
-Solution:   use get_funccal(). (Lemonboy, closes #1432, closes #1352)
+Solution:   use get_funccal(). (LemonBoy, closes #1432, closes #1352)
 Files:      src/userfunc.c

 Patch 8.0.0288 (after 8.0.0284)
@@ -16728,7 +16728,7 @@ Files:      src/gui_gtk_x11.c

 Patch 8.0.0350
 Problem:    Not enough test coverage for Perl.
-Solution:   Add more Perl tests. (Dominique Perl, closes #1500)
+Solution:   Add more Perl tests. (Dominique Pelle, closes #1500)
 Files:      src/testdir/test_perl.vim

 Patch 8.0.0351
@@ -18229,7 +18229,7 @@ Files:      src/edit.c, src/testdir/test_popup.vim

 Patch 8.0.0597
 Problem:    Off-by-one error in buffer size computation.
-Solution:   Use ">=" instead of ">". (Lemonboy, closes #1694)
+Solution:   Use ">=" instead of ">". (LemonBoy, closes #1694)
 Files:      src/quickfix.c

 Patch 8.0.0598
@@ -18346,7 +18346,7 @@ Patch 8.0.0616
 Problem:    When setting the cterm background with ":hi Normal" the value of
            'background' may be set wrongly.
 Solution:   Check that the color is less than 16.  Don't set 'background' when
-            it was set explicitly. (Lemonboy, closes #1710)
+            it was set explicitly. (LemonBoy, closes #1710)
 Files:      src/syntax.c, src/testdir/test_syntax.vim

 Patch 8.0.0617 (after 8.0.0615)
@@ -18477,8 +18477,8 @@ Files:      src/gui_gtk.c

 Patch 8.0.0638
 Problem:    Cannot build with new MSVC version VS2017.
-Solution:   Change the compiler arguments. (Leonardo Manera, closes #1731,
-            closes #1747)
+Solution:   Change the compiler arguments. (Leonardo Valeri Manera,
+	    closes #1731, closes #1747)
 Files:      src/GvimExt/Makefile, src/Make_mvc.mak

 Patch 8.0.0639
@@ -19070,7 +19070,7 @@ Files:      src/testdir/test_arglist.vim

 Patch 8.0.0724
 Problem:    The message for yanking doesn't indicate the register.
-Solution:   Show the register name in the "N lines yanked" message. (Lemonboy,
+Solution:   Show the register name in the "N lines yanked" message. (LemonBoy,
            closes #1803, closes #1809)
 Files:      src/ops.c, src/Makefile, src/testdir/test_registers.vim,
            src/testdir/Make_all.mak
@@ -21611,7 +21611,7 @@ Files:      src/configure.ac, src/auto/configure

 Patch 8.0.1157
 Problem:    Compiler warning on MS-Windows.
-Solution:   Add type cast. (Yasuhiro Matsomoto)
+Solution:   Add type cast. (Yasuhiro Matsumoto)
 Files:      src/main.c

 Patch 8.0.1158
@@ -21911,7 +21911,7 @@ Files:      runtime/doc/autocmd.txt, src/ex_getln.c, src/fileio.c, src/vim.h,

 Patch 8.0.1207
 Problem:    Profiling skips the first and last script line.
-Solution:   Check for BOM after setting script ID. (Lemonboy, closes #2103,
+Solution:   Check for BOM after setting script ID. (LemonBoy, closes #2103,
            closes #2112) Add a test. List the trailing script lines.
 Files:      src/testdir/test_profile.vim, src/ex_cmds2.c

@@ -22108,7 +22108,7 @@ Problem:    Mac features are confusing.
 Solution:   Make feature names more consistent, add "osxdarwin". Rename
            feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
            Also includes a fix for when Ruby throws an exception inside
-            :rubyfile.(ujihisa)
+            :rubyfile. (ujihisa)
 Files:      runtime/doc/eval.txt, runtime/doc/os_mac.txt, src/auto/configure,
            src/config.h.in, src/configure.ac, src/digraph.c, src/edit.c,
            src/evalfunc.c, src/feature.h, src/fileio.c, src/getchar.c,
@@ -23256,7 +23256,7 @@ Files:      src/screen.c

 Patch 8.0.1423
 Problem:    Error in return not caught by try/catch.
-Solution:   Call update_force_abort(). (Yasuhiro Matsomoto, closes #2483)
+Solution:   Call update_force_abort(). (Yasuhiro Matsumoto, closes #2483)
 Files:      src/testdir/test_eval.in, src/testdir/test_eval_stuff.vim,
            src/Makefile, src/testdir/Make_all.mak, src/userfunc.c

@@ -23287,7 +23287,7 @@ Files:      src/ex_getln.c

 Patch 8.0.1429
 Problem:    Crash when calling term_start() with empty argument.
-Solution:   Check for invalid argument. (Yasuhiro Matsomoto, closes #2503)
+Solution:   Check for invalid argument. (Yasuhiro Matsumoto, closes #2503)
            Fix memory leak.
 Files:      src/terminal.c, src/testdir/test_terminal.vim

@@ -23677,7 +23677,7 @@ Files:      src/misc2.c, src/evalfunc.c
 Patch 8.0.1493
 Problem:    Completion items cannot be annotated.
 Solution:   Add a "user_data" entry to the completion item. (Ben Jackson,
-            coses #2608, closes #2508)
+            closes #2608, closes #2508)
 Files:      runtime/doc/insert.txt, src/edit.c, src/structs.h,
            src/testdir/test_ins_complete.vim

@@ -24187,8 +24187,8 @@ Files:      src/os_unix.c

 Patch 8.0.1573
 Problem:    getwinpos(1) may cause response to be handled as command.
-Solution:   Handle any cursor position report once one was request. (partly by
-            Hirohito Higashi)
+Solution:   Handle any cursor position report once one was requested. (partly
+	    by Hirohito Higashi)
 Files:      src/term.c

 Patch 8.0.1574
@@ -24669,7 +24669,7 @@ Files:      runtime/pack/dist/opt/termdebug/plugin/termdebug.vim

 Patch 8.0.1656
 Problem:    No option to have xxd produce upper case variable names.
-Solution:   Add the -C argument. (Matt Panaro closes #2772)
+Solution:   Add the -C argument. (Matt Panaro, closes #2772)
 Files:      src/xxd/xxd.c

 Patch 8.0.1657
@@ -25402,7 +25402,7 @@ Files:      src/testdir/test_quickfix.vim, src/fileio.c, src/proto/fileio.pro,
 Patch 8.0.1782
 Problem:    No simple way to label quickfix entries.
 Solution:   Add the "module" item, to be used instead of the file name for
-            display purposes. (Martin Szamotulski, closes #1757)
+            display purposes. (Marcin Szamotulski, closes #1757)
 Files:      runtime/doc/eval.txt, runtime/doc/quickfix.txt, src/alloc.h,
            src/quickfix.c, src/testdir/test_quickfix.vim

@@ -223,9 +223,9 @@ CTRL-W ^	Does ":split #", split window in two and edit alternate file.
 		and edit buffer N.

 						*CTRL-W_:*
-CTRL-W :	Does the same as typing |:| : edit a command line.  Useful in a
+CTRL-W :	Does the same as typing |:| - enter a command line.  Useful in a
 		terminal window, where all Vim commands must be preceded with
-		CTRL-W or 'termkey'.
+		CTRL-W or 'termwinkey'.

 Note that the 'splitbelow' and 'splitright' options influence where a new
 window will appear.
@@ -67,14 +67,19 @@ if !exists('termdebugger')
 endif

 let s:pc_id = 12
-let s:break_id = 13
+let s:break_id = 13  " breakpoint number is added to this
 let s:stopped = 1

-if &background == 'light'
-  hi default debugPC term=reverse ctermbg=lightblue guibg=lightblue
-else
-  hi default debugPC term=reverse ctermbg=darkblue guibg=darkblue
-endif
+func s:Highlight(init, old, new)
+  let default = a:init ? 'default ' : ''
+  if a:new ==# 'light' && a:old !=# 'light'
+    exe "hi " . default . "debugPC term=reverse ctermbg=lightblue guibg=lightblue"
+  elseif a:new ==# 'dark' && a:old !=# 'dark'
+    exe "hi " . default . "debugPC term=reverse ctermbg=darkblue guibg=darkblue"
+  endif
+endfunc
+
+call s:Highlight(1, '', &background)
 hi default debugBreakpoint term=reverse ctermbg=red guibg=red

 func s:StartDebug(bang, ...)
@@ -93,6 +98,7 @@ func s:StartDebug_internal(dict)
    return
  endif
  let s:ptywin = 0
+  let s:pid = 0

  " Uncomment this line to write logging in "debuglog".
  " call ch_logfile('debuglog', 'w')
@@ -266,6 +272,8 @@ func s:StartDebug_prompt(dict)
    exe 'bwipe! ' . s:promptbuf
    return
  endif
+  " Mark the buffer modified so that it's not easy to close.
+  set modified
  let s:gdb_channel = job_getchannel(s:gdbjob)  

  " Interpret commands while the target is running.  This should usualy only
@@ -325,10 +333,6 @@ func s:StartDebugCommon(dict)
  " There can be only one.
  sign define debugPC linehl=debugPC

-  " Sign used to indicate a breakpoint.
-  " Can be used multiple times.
-  sign define debugBreakpoint text=>> texthl=debugBreakpoint
-
  " Install debugger commands in the text window.
  call win_gotoid(s:sourcewin)
  call s:InstallCommands()
@@ -345,11 +349,13 @@ func s:StartDebugCommon(dict)
    endif
  endif

+  " Contains breakpoints that have been placed, key is the number.
  let s:breakpoints = {}

  augroup TermDebug
    au BufRead * call s:BufRead()
    au BufUnload * call s:BufUnloaded()
+    au OptionSet background call s:Highlight(0, v:option_old, v:option_new)
  augroup END

  " Run the command if the bang attribute was given and got to the debug
@@ -393,10 +399,21 @@ func s:PromptCallback(text)
  call s:SendCommand(a:text)
 endfunc

-" Function called when pressing CTRL-C in the prompt buffer.
+" Function called when pressing CTRL-C in the prompt buffer and when placing a
+" breakpoint.
 func s:PromptInterrupt()
  call ch_log('Interrupting gdb')
-  call job_stop(s:gdbjob, 'int')
+  if has('win32')
+    " Using job_stop() does not work on MS-Windows, need to send SIGTRAP to
+    " the debugger program so that gdb responds again.
+    if s:pid == 0
+      echoerr 'Cannot interrupt gdb, did not find a process ID'
+    else
+      call debugbreak(s:pid)
+    endif
+  else
+    call job_stop(s:gdbjob, 'int')
+  endif
 endfunc

 " Function called when gdb outputs text.
@@ -405,7 +422,7 @@ func s:GdbOutCallback(channel, text)

  " Drop the gdb prompt, we have our own.
  " Drop status and echo'd commands.
-  if a:text == '(gdb) ' || a:text == '^done' || a:text[0] == '&' || a:text[0] == '='
+  if a:text == '(gdb) ' || a:text == '^done' || a:text[0] == '&'
    return
  endif
  if a:text =~ '^^error,msg='
@@ -427,7 +444,7 @@ func s:GdbOutCallback(channel, text)

  " Add the output above the current prompt.
  call append(line('$') - 1, text)
-  set nomodified
+  set modified

  call win_gotoid(curwinid)
 endfunc
@@ -436,7 +453,7 @@ endfunc
 " to the next ", unescaping characters.
 func s:DecodeMessage(quotedText)
  if a:quotedText[0] != '"'
-    echoerr 'DecodeMessage(): missing quote'
+    echoerr 'DecodeMessage(): missing quote in ' . a:quotedText
    return
  endif
  let result = ''
@@ -456,6 +473,16 @@ func s:DecodeMessage(quotedText)
  return result
 endfunc

+" Extract the "name" value from a gdb message with fullname="name".
+func s:GetFullname(msg)
+  let name = s:DecodeMessage(substitute(a:msg, '.*fullname=', '', ''))
+  if has('win32') && name =~ ':\\\\'
+    " sometimes the name arrives double-escaped
+    let name = substitute(name, '\\\\', '\\', 'g')
+  endif
+  return name
+endfunc
+
 func s:EndTermDebug(job, status)
  exe 'bwipe! ' . s:commbuf
  unlet s:gdbwin
@@ -496,6 +523,7 @@ endfunc
 func s:EndPromptDebug(job, status)
  let curwinid = win_getid(winnr())
  call win_gotoid(s:gdbwin)
+  set nomodified
  close
  if curwinid != s:gdbwin
    call win_gotoid(curwinid)
@@ -522,6 +550,8 @@ func s:CommOutput(chan, msg)
 	call s:HandleNewBreakpoint(msg)
      elseif msg =~ '^=breakpoint-deleted,'
 	call s:HandleBreakpointDelete(msg)
+      elseif msg =~ '^=thread-group-started'
+	call s:HandleProgramRun(msg)
      elseif msg =~ '^\^done,value='
 	call s:HandleEvaluate(msg)
      elseif msg =~ '^\^error,msg='
@@ -636,9 +666,13 @@ func s:DeleteCommands()
  for key in keys(s:breakpoints)
    exe 'sign unplace ' . (s:break_id + key)
  endfor
-  sign undefine debugPC
-  sign undefine debugBreakpoint
  unlet s:breakpoints
+
+  sign undefine debugPC
+  for val in s:BreakpointSigns
+    exe "sign undefine debugBreakpoint" . val
+  endfor
+  let s:BreakpointSigns = []
 endfunc

 " :Break - Set a breakpoint at the cursor position.
@@ -649,16 +683,15 @@ func s:SetBreakpoint()
  if !s:stopped
    let do_continue = 1
    if s:way == 'prompt'
-      " Need to send a signal to get the UI to listen.  Strangely this is only
-      " needed once.
-      call job_stop(s:gdbjob, 'int')
+      call s:PromptInterrupt()
    else
      call s:SendCommand('-exec-interrupt')
    endif
    sleep 10m
  endif
-  call s:SendCommand('-break-insert --source '
-	\ . fnameescape(expand('%:p')) . ' --line ' . line('.'))
+  " Use the fname:lnum format, older gdb can't handle --source.
+  call s:SendCommand('-break-insert '
+	\ . fnameescape(expand('%:p')) . ':' . line('.'))
  if do_continue
    call s:SendCommand('-exec-continue')
  endif
@@ -780,17 +813,22 @@ func s:HandleCursor(msg)
  let wid = win_getid(winnr())

  if a:msg =~ '^\*stopped'
+    call ch_log('program stopped')
    let s:stopped = 1
  elseif a:msg =~ '^\*running'
+    call ch_log('program running')
    let s:stopped = 0
  endif

-  call s:GotoSourcewinOrCreateIt()
-
-  let fname = substitute(a:msg, '.*fullname="\([^"]*\)".*', '\1', '')
+  if a:msg =~ 'fullname='
+    let fname = s:GetFullname(a:msg)
+  else
+    let fname = ''
+  endif
  if a:msg =~ '^\(\*stopped\|=thread-selected\)' && filereadable(fname)
    let lnum = substitute(a:msg, '.*line="\([^"]*\)".*', '\1', '')
    if lnum =~ '^[0-9]*$'
+    call s:GotoSourcewinOrCreateIt()
      if expand('%:p') != fnamemodify(fname, ':p')
 	if &modified
 	  " TODO: find existing window
@@ -806,13 +844,22 @@ func s:HandleCursor(msg)
      exe 'sign place ' . s:pc_id . ' line=' . lnum . ' name=debugPC file=' . fname
      setlocal signcolumn=yes
    endif
-  else
+  elseif !s:stopped || fname != ''
    exe 'sign unplace ' . s:pc_id
  endif

  call win_gotoid(wid)
 endfunc

+let s:BreakpointSigns = []
+
+func s:CreateBreakpoint(nr)
+  if index(s:BreakpointSigns, a:nr) == -1
+    call add(s:BreakpointSigns, a:nr)
+    exe "sign define debugBreakpoint" . a:nr . " text=" . a:nr . " texthl=debugBreakpoint"
+  endif
+endfunc
+
 " Handle setting a breakpoint
 " Will update the sign that shows the breakpoint
 func s:HandleNewBreakpoint(msg)
@@ -820,6 +867,7 @@ func s:HandleNewBreakpoint(msg)
  if nr == 0
    return
  endif
+  call s:CreateBreakpoint(nr)

  if has_key(s:breakpoints, nr)
    let entry = s:breakpoints[nr]
@@ -828,7 +876,7 @@ func s:HandleNewBreakpoint(msg)
    let s:breakpoints[nr] = entry
  endif

-  let fname = substitute(a:msg, '.*fullname="\([^"]*\)".*', '\1', '')
+  let fname = s:GetFullname(a:msg)
  let lnum = substitute(a:msg, '.*line="\([^"]*\)".*', '\1', '')
  let entry['fname'] = fname
  let entry['lnum'] = lnum
@@ -839,7 +887,7 @@ func s:HandleNewBreakpoint(msg)
 endfunc

 func s:PlaceSign(nr, entry)
-  exe 'sign place ' . (s:break_id + a:nr) . ' line=' . a:entry['lnum'] . ' name=debugBreakpoint file=' . a:entry['fname']
+  exe 'sign place ' . (s:break_id + a:nr) . ' line=' . a:entry['lnum'] . ' name=debugBreakpoint' . a:nr . ' file=' . a:entry['fname']
  let a:entry['placed'] = 1
 endfunc

@@ -860,6 +908,17 @@ func s:HandleBreakpointDelete(msg)
  endif
 endfunc

+" Handle the debugged program starting to run.
+" Will store the process ID in s:pid
+func s:HandleProgramRun(msg)
+  let nr = substitute(a:msg, '.*pid="\([0-9]*\)\".*', '\1', '') + 0
+  if nr == 0
+    return
+  endif
+  let s:pid = nr
+  call ch_log('Detected process ID: ' . s:pid)
+endfunc
+
 " Handle a BufRead autocommand event: place any signs.
 func s:BufRead()
  let fname = expand('<afile>:p')
@@ -879,4 +938,3 @@ func s:BufUnloaded()
    endif
  endfor
 endfunc
-
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2018 Jan 28
+" Last Change: 2018 May 31
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim

 " Standard syntax initialization
@@ -40,8 +40,8 @@ let s:pairs = [

 " Define some common expressions we can use later on
 syn keyword debcontrolArchitecture contained all any
-exe 'syn keyword debcontrolArchitecture contained '. join(map(s:kernels, {k,v -> v .'-any'}))
-exe 'syn keyword debcontrolArchitecture contained '. join(map(s:archs, {k,v -> 'any-'.v}))
+exe 'syn keyword debcontrolArchitecture contained '. join(map(copy(s:kernels), {k,v -> v .'-any'}))
+exe 'syn keyword debcontrolArchitecture contained '. join(map(copy(s:archs), {k,v -> 'any-'.v}))
 exe 'syn keyword debcontrolArchitecture contained '. join(s:archs)
 exe 'syn keyword debcontrolArchitecture contained '. join(s:pairs)

@@ -3,8 +3,8 @@
 " Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 " Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " Repository:           https://notabug.org/jorgesumle/vim-html-syntax
-" Last Change:          2017 Dec 16
-" Included patch from Jorge Maldonado Ventura to add the dialog element
+" Last Change:          2018 May 31
+" Included patch from Jay Sitter to add WAI-ARIA htmlArg keywords
 "

 " Please check :help html.vim for some comments and a description of the options
@@ -77,6 +77,29 @@ syn keyword htmlArg contained size src start target text type url
 syn keyword htmlArg contained usemap ismap valign value vlink vspace width wrap
 syn match   htmlArg contained "\<\(http-equiv\|href\|title\)="me=e-1

+" aria attributes
+syn match htmlArg contained "\<\(aria-activedescendant\|aria-atomic\)\>"
+syn match htmlArg contained "\<\(aria-autocomplete\|aria-busy\|aria-checked\)\>"
+syn match htmlArg contained "\<\(aria-colcount\|aria-colindex\|aria-colspan\)\>"
+syn match htmlArg contained "\<\(aria-controls\|aria-current\)\>"
+syn match htmlArg contained "\<\(aria-describedby\|aria-details\)\>"
+syn match htmlArg contained "\<\(aria-disabled\|aria-dropeffect\)\>"
+syn match htmlArg contained "\<\(aria-errormessage\|aria-expanded\)\>"
+syn match htmlArg contained "\<\(aria-flowto\|aria-grabbed\|aria-haspopup\)\>"
+syn match htmlArg contained "\<\(aria-hidden\|aria-invalid\)\>"
+syn match htmlArg contained "\<\(aria-keyshortcuts\|aria-label\)\>"
+syn match htmlArg contained "\<\(aria-labelledby\|aria-level\|aria-live\)\>"
+syn match htmlArg contained "\<\(aria-modal\|aria-multiline\)\>"
+syn match htmlArg contained "\<\(aria-multiselectable\|aria-orientation\)\>"
+syn match htmlArg contained "\<\(aria-owns\|aria-placeholder\|aria-posinset\)\>"
+syn match htmlArg contained "\<\(aria-pressed\|aria-readonly\|aria-relevant\)\>"
+syn match htmlArg contained "\<\(aria-required\|aria-roledescription\)\>"
+syn match htmlArg contained "\<\(aria-rowcount\|aria-rowindex\|aria-rowspan\)\>"
+syn match htmlArg contained "\<\(aria-selected\|aria-setsize\|aria-sort\)\>"
+syn match htmlArg contained "\<\(aria-valuemax\|aria-valuemin\)\>"
+syn match htmlArg contained "\<\(aria-valuenow\|aria-valuetext\)\>"
+syn keyword htmlArg contained role
+
 " Netscape extensions
 syn keyword htmlTagName contained frame noframes frameset nobr blink
 syn keyword htmlTagName contained layer ilayer nolayer spacer
@@ -662,7 +662,7 @@ endif
 CFLAGS += -s
 endif

-LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lversion
+LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lnetapi32 -lversion
 GUIOBJ =  $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o
 CUIOBJ = $(OUTDIR)/iscygpty.o
 OBJ = \
@@ -88,7 +88,7 @@ LINK32=link.exe
 CPP_PROJ= /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c
 # ADD CPP /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c

-LINK32_FLAGS= oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib uuid.lib /nologo /machine:I386 /nodefaultlib
+LINK32_FLAGS= oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib netapi32.lib uuid.lib /nologo /machine:I386 /nodefaultlib
 # ADD LINK32  oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib uuid.lib /nologo /machine:I386 /nodefaultlib
 # SUBTRACT LINK32 /incremental:yes

@@ -489,10 +489,11 @@ NETBEANS_LIB	= WSock32.lib

 # need advapi32.lib for GetUserName()
 # need shell32.lib for ExtractIcon()
+# need netapi32.lib for NetUserEnum()
 # gdi32.lib and comdlg32.lib for printing support
 # ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
 CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
-          comdlg32.lib ole32.lib uuid.lib /machine:$(CPU)
+          comdlg32.lib ole32.lib netapi32.lib uuid.lib /machine:$(CPU)
 !if "$(DELAYLOAD)" == "yes"
 CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
 !endif
@@ -801,7 +802,7 @@ GUI_OBJ = \
 	$(OUTDIR)\os_w32exe.obj
 GUI_LIB = \
 	gdi32.lib version.lib $(IME_LIB) \
-	winspool.lib comctl32.lib advapi32.lib shell32.lib \
+	winspool.lib comctl32.lib advapi32.lib shell32.lib netapi32.lib \
 	/machine:$(CPU)
 !else
 SUBSYSTEM = console
@@ -123,6 +123,9 @@ static void f_cosh(typval_T *argvars, typval_T *rettv);
 static void f_count(typval_T *argvars, typval_T *rettv);
 static void f_cscope_connection(typval_T *argvars, typval_T *rettv);
 static void f_cursor(typval_T *argsvars, typval_T *rettv);
+#ifdef WIN3264
+static void f_debugbreak(typval_T *argvars, typval_T *rettv);
+#endif
 static void f_deepcopy(typval_T *argvars, typval_T *rettv);
 static void f_delete(typval_T *argvars, typval_T *rettv);
 static void f_deletebufline(typval_T *argvars, typval_T *rettv);
@@ -577,6 +580,9 @@ static struct fst
    {"count",		2, 4, f_count},
    {"cscope_connection",0,3, f_cscope_connection},
    {"cursor",		1, 3, f_cursor},
+#ifdef WIN3264
+    {"debugbreak",	1, 1, f_debugbreak},
+#endif
    {"deepcopy",	1, 2, f_deepcopy},
    {"delete",		1, 2, f_delete},
    {"deletebufline",	2, 3, f_deletebufline},
@@ -2761,6 +2767,33 @@ f_cursor(typval_T *argvars, typval_T *rettv)
    rettv->vval.v_number = 0;
 }

+#ifdef WIN3264
+/*
+ * "debugbreak()" function
+ */
+    static void
+f_debugbreak(typval_T *argvars, typval_T *rettv)
+{
+    int		pid;
+
+    rettv->vval.v_number = FAIL;
+    pid = (int)get_tv_number(&argvars[0]);
+    if (pid == 0)
+	EMSG(_(e_invarg));
+    else
+    {
+	HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, 0, pid);
+
+	if (hProcess != NULL)
+	{
+	    DebugBreakProcess(hProcess);
+	    CloseHandle(hProcess);
+	    rettv->vval.v_number = OK;
+	}
+    }
+}
+#endif
+
 /*
 * "deepcopy()" function
 */
@@ -8217,6 +8217,9 @@ ex_splitview(exarg_T *eap)
 #ifdef FEAT_BROWSE
    int		browse_flag = cmdmod.browse;
 #endif
+    int		use_tab = eap->cmdidx == CMD_tabedit
+		       || eap->cmdidx == CMD_tabfind
+		       || eap->cmdidx == CMD_tabnew;

 #ifdef FEAT_GUI
    need_mouse_correct = TRUE;
@@ -8265,7 +8268,9 @@ ex_splitview(exarg_T *eap)
 	}
 	else
 	{
-	    fname = do_browse(0, (char_u *)_("Edit File in new window"),
+	    fname = do_browse(0, (char_u *)(use_tab
+			? _("Edit File in new tab page")
+			: _("Edit File in new window")),
 					  eap->arg, NULL, NULL, NULL, curbuf);
 	    if (fname == NULL)
 		goto theend;
@@ -8278,9 +8283,7 @@ ex_splitview(exarg_T *eap)
    /*
     * Either open new tab page or split the window.
     */
-    if (eap->cmdidx == CMD_tabedit
-	    || eap->cmdidx == CMD_tabfind
-	    || eap->cmdidx == CMD_tabnew)
+    if (use_tab)
    {
 	if (win_new_tabpage(cmdmod.tab != 0 ? cmdmod.tab
 			 : eap->addr_count == 0 ? 0
@@ -371,6 +371,11 @@ EXTERN int	highlight_stltermnc[9];		/* On top of user */
 #  endif
 # endif
 #endif
+#ifdef FEAT_TERMINAL
+		// When TRUE skip calling terminal_loop() once.  Used when
+		// typing ':' at the more prompt.
+EXTERN int	skip_term_loop INIT(= FALSE);
+#endif
 #ifdef FEAT_GUI
 EXTERN char_u	*use_gvimrc INIT(= NULL);	/* "-U" cmdline argument */
 #endif
@@ -2821,7 +2821,7 @@ gui_mch_find_dialog(exarg_T *eap)
 	}

 	set_window_title(s_findrep_hwnd,
-			       _("Find string (use '\\\\' to find  a '\\')"));
+			       _("Find string (use '\\\\' to find a '\\')"));
 	(void)SetFocus(s_findrep_hwnd);

 	s_findrep_is_find = TRUE;
@@ -2856,7 +2856,7 @@ gui_mch_replace_dialog(exarg_T *eap)
 	}

 	set_window_title(s_findrep_hwnd,
-			    _("Find & Replace (use '\\\\' to find  a '\\')"));
+			    _("Find & Replace (use '\\\\' to find a '\\')"));
 	(void)SetFocus(s_findrep_hwnd);

 	s_findrep_is_find = FALSE;
@@ -1408,7 +1408,8 @@ main_loop(
 #ifdef FEAT_TERMINAL
 	    if (term_use_loop()
 		    && oa.op_type == OP_NOP && oa.regname == NUL
-		    && !VIsual_active)
+		    && !VIsual_active
+		    && !skip_term_loop)
 	    {
 		/* If terminal_loop() returns OK we got a key that is handled
 		 * in Normal model.  With FAIL we first need to position the
@@ -1417,8 +1418,13 @@ main_loop(
 		    normal_cmd(&oa, TRUE);
 	    }
 	    else
+#endif
+	    {
+#ifdef FEAT_TERMINAL
+		skip_term_loop = FALSE;
 #endif
 		normal_cmd(&oa, TRUE);
+	    }
 	}

 #ifdef FEAT_GUI_MACVIM
@@ -3347,7 +3353,7 @@ usage(void)
 #endif

    mch_msg(longVersion);
-    mch_msg(_("\n\nusage:"));
+    mch_msg(_("\n\nUsage:"));
    for (i = 0; ; ++i)
    {
 	mch_msg(_(" vim [arguments] "));
@@ -3404,7 +3410,7 @@ usage(void)
    main_msg(_("-dev <device>\t\tUse <device> for I/O"));
 #endif
 #ifdef FEAT_ARABIC
-    main_msg(_("-A\t\t\tstart in Arabic mode"));
+    main_msg(_("-A\t\t\tStart in Arabic mode"));
 #endif
 #ifdef FEAT_RIGHTLEFT
    main_msg(_("-H\t\t\tStart in Hebrew mode"));
@@ -1223,6 +1223,9 @@ wait_return(int redraw)
 	    cmdline_row = msg_row;
 	skip_redraw = TRUE;	    /* skip redraw once */
 	do_redraw = FALSE;
+#ifdef FEAT_TERMINAL
+	skip_term_loop = TRUE;
+#endif
    }

    /*
@@ -2831,6 +2834,9 @@ do_more_prompt(int typed_char)
 		/* Since got_int is set all typeahead will be flushed, but we
 		 * want to keep this ':', remember that in a special way. */
 		typeahead_noflush(':');
+#ifdef FEAT_TERMINAL
+		skip_term_loop = TRUE;
+#endif
 		cmdline_row = Rows - 1;		/* put ':' on this line */
 		skip_redraw = TRUE;		/* skip redraw once */
 		need_wait_return = FALSE;	/* don't wait in main() */
@@ -14,6 +14,10 @@
 #include "vim.h"
 #include "version.h"

+#if defined(FEAT_CMDL_COMPL) && defined(WIN3264)
+# include <lm.h>
+#endif
+
 static char_u *vim_version_dir(char_u *vimdir);
 static char_u *remove_tail(char_u *p, char_u *pend, char_u *name);
 #if defined(FEAT_CMDL_COMPL)
@@ -4609,6 +4613,28 @@ init_users(void)
 	    }
 	endpwent();
    }
+# elif defined(WIN3264)
+    {
+	char_u*		user;
+	DWORD		nusers = 0, ntotal = 0, i;
+	PUSER_INFO_0	uinfo;
+
+	if (NetUserEnum(NULL, 0, 0, (LPBYTE *) &uinfo, MAX_PREFERRED_LENGTH,
+				       &nusers, &ntotal, NULL) == NERR_Success)
+	{
+	    for (i = 0; i < nusers; i++)
+	    {
+		if (ga_grow(&ga_users, 1) == FAIL)
+		    break;
+		user = utf16_to_enc(uinfo[i].usri0_name, NULL);
+		if (user == NULL)
+		    break;
+		((char_u **)(ga_users.ga_data))[ga_users.ga_len++] = user;
+	    }
+
+	    NetApiBufferFree(uinfo);
+	}
+    }
 # endif
 }

@@ -4371,6 +4371,7 @@ mch_call_shell_terminal(
    char_u	*tofree2 = NULL;
    int		retval = -1;
    buf_T	*buf;
+    job_T	*job;
    aco_save_T	aco;
    oparg_T	oa;		/* operator arguments */

@@ -4380,6 +4381,11 @@ mch_call_shell_terminal(
    init_job_options(&opt);
    ch_log(NULL, "starting terminal for system command '%s'", cmd);
    buf = term_start(NULL, argv, &opt, TERM_START_SYSTEM);
+    if (buf == NULL)
+	goto theend;
+
+    job = term_getjob(buf->b_term);
+    ++job->jv_refcount;

    /* Find a window to make "buf" curbuf. */
    aucmd_prepbuf(&aco, buf);
@@ -4397,9 +4403,11 @@ mch_call_shell_terminal(
 	else
 	    normal_cmd(&oa, TRUE);
    }
-    retval = 0;
+    retval = job->jv_exitval;
    ch_log(NULL, "system command finished");

+    job_unref(job);
+
    /* restore curwin/curbuf and a few other things */
    aucmd_restbuf(&aco);

@@ -4796,6 +4796,7 @@ mch_call_shell_terminal(
    long_u	cmdlen;
    int		retval = -1;
    buf_T	*buf;
+    job_T	*job;
    aco_save_T	aco;
    oparg_T	oa;		/* operator arguments */

@@ -4826,6 +4827,9 @@ mch_call_shell_terminal(
    if (buf == NULL)
 	return 255;

+    job = term_getjob(buf->b_term);
+    ++job->jv_refcount;
+
    /* Find a window to make "buf" curbuf. */
    aucmd_prepbuf(&aco, buf);

@@ -4842,9 +4846,11 @@ mch_call_shell_terminal(
 	else
 	    normal_cmd(&oa, TRUE);
    }
-    retval = 0;
+    retval = job->jv_exitval;
    ch_log(NULL, "system command finished");

+    job_unref(job);
+
    /* restore curwin/curbuf and a few other things */
    aucmd_restbuf(&aco);

@@ -49,8 +49,14 @@ We will use "xx.po" as an example here, replace "xx" with the name of your
 language.

 - Edit Makefile to add xx to LANGUAGES and xx.mo to MOFILES.
- Copy the header of an existing file, e.g., de.po, to xx.po.  Do not copy any
-  of the translated messages, delete everything after the "msgstr".
+- If you haven't done so already, run ./configure in the top vim directory
+  (i.e. go up two directories) and then come back here afterwards.
+- Execute these commands:
+  % make vim.pot
+  % msginit -l xx
+  % rm vim.pot
+  The first command will generate a vim.pot file which is used by msginit to
+  generate a correct xx.po file.  After that vim.pot is not needed.
 - The remaining work is like updating, see the next section.


@@ -2409,8 +2409,8 @@ msgstr "-f\t\t\tMoet nie 'newcli' gebruik om venster oop te maak nie"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <toestel>\t\tGebruik <toestel> vir I/O"

-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\tbegin in Arabiese modus"
+msgid "-A\t\t\tStart in Arabic mode"
+msgstr "-A\t\t\tBegin in Arabiese modus"

 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tBegin in Hebreeuse modus"
@@ -3021,7 +3021,7 @@ msgstr "-f\t\t\tNo obre una finestra nova amb newcli"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <dispositiu>\t\tUsa <dispositiu> per a l'E/S"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tComença en mode aràbic"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4797,8 +4797,8 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Memòria insuficient per a recórrer la branca!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr "No es pot obrir un fitxer temporal de logs, s'escriu a stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
+msgstr "No es pot obrir un fitxer temporal de logs, s'escriu a stderr... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5035,8 +5035,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: error en llegir el fitxer .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Llegint el fitxer d'afixos %s ..."
+msgid "Reading affix file %s..."
+msgstr "Llegint el fitxer d'afixos %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5166,8 +5166,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "el valor %s difereix de l'usat en un altre fitxer .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Llegint el fitxer de diccionari %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Llegint el fitxer de diccionari %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5194,8 +5194,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "S'ignora/en %d paraula/es amb caràcters no-ASCII a %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Llegint el fitxer de paraules %s ..."
+msgid "Reading word file %s..."
+msgstr "Llegint el fitxer de paraules %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5251,8 +5251,8 @@ msgid "Total number of words: %d"
 msgstr "Nombre total de paraules: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Escrivint el fitxer de suggeriments %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Escrivint el fitxer de suggeriments %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5272,8 +5272,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Atenció: s'ha especificat composició i NOBREAK alhora"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Escrivint el fitxer d'ortografia %s ..."
+msgid "Writing spell file %s..."
+msgstr "Escrivint el fitxer d'ortografia %s..."

 msgid "Done!"
 msgstr "Fet!"
@@ -3090,7 +3090,7 @@ msgstr "-f\t\t\tVerwende nicht newcli zum
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tVerwende <device> for I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tStart im Arabischen Modus"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4958,10 +4958,10 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Konnte nicht Speicher allokieren um Äste zu durchlaufen!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Konnte temporäre Datei zum Schreiben öffnen, zeige auf Standard "
-"Fehlerausgabe ... "
+"Fehlerausgabe... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5189,8 +5189,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Fehler beim Lesen der .sug Datei: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Lese Affix-Datei %s ..."
+msgid "Reading affix file %s..."
+msgstr "Lese Affix-Datei %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5329,8 +5329,8 @@ msgstr ""
 "verwendet wird"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Lese Wörterbuch-Datei %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Lese Wörterbuch-Datei %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5356,8 +5356,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "%d Wort(e) mit nicht-ASCII Zeichen ignoriert in %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Lese Wort-Datei %s ..."
+msgid "Reading word file %s..."
+msgstr "Lese Wort-Datei %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5413,8 +5413,8 @@ msgid "Total number of words: %d"
 msgstr "Gesamte Anzahl von Wörtern: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Schreibe Datei %s für Vorschläge ..."
+msgid "Writing suggestion file %s..."
+msgstr "Schreibe Datei %s für Vorschläge..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5434,8 +5434,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Achtung: Sowohl zusammengesetzte Wörter als auch NOBREAK angegeben"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Schreibe Rechtschreibwörterbuch %s ..."
+msgid "Writing spell file %s..."
+msgstr "Schreibe Rechtschreibwörterbuch %s..."

 msgid "Done!"
 msgstr "Fertig!"
@@ -3069,7 +3069,7 @@ msgstr "-f\t\t\tNe uzi newcli por malfermi fenestrojn"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <aparatdosiero>\t\tUzi <aparatdosiero>-n por eneligo"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tKomenci en araba reĝimo"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4915,10 +4915,10 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
-"stderr ..."
+"stderr..."

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5144,8 +5144,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: eraro dum legado de dosiero .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Legado de afiksa dosiero %s ..."
+msgid "Reading affix file %s..."
+msgstr "Legado de afiksa dosiero %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5280,8 +5280,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Valoro de %s malsamas ol tiu en alia dosiero .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Legado de vortardosiero %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Legado de vortardosiero %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5308,8 +5308,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "%d ignorita(j) vorto(j) kun neaskiaj signoj en %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Legado de dosiero de vortoj %s ..."
+msgid "Reading word file %s..."
+msgstr "Legado de dosiero de vortoj %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5365,8 +5365,8 @@ msgid "Total number of words: %d"
 msgstr "Totala nombro de vortoj: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Skribado de dosiero de sugesto %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Skribado de dosiero de sugesto %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5387,8 +5387,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Averto: ambaŭ NOBREAK kaj NOBREAK specifitaj"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Skribado de literuma dosiero %s ..."
+msgid "Writing spell file %s..."
+msgstr "Skribado de literuma dosiero %s..."

 msgid "Done!"
 msgstr "Farita!"
@@ -3962,7 +3962,7 @@ msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <dispositivo>\t\tUsar <dispositivo> para I/O"

 #: main.c:3104
-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tIniciar en modo árabe"

 #: main.c:3107
@@ -6414,7 +6414,7 @@ msgstr "Advertencia: la región %s no es compatible"

 #: spell.c:5307
 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "Leyendo el archivo de afijos \"%s\"..."

 #: spell.c:5355 spell.c:6699 spell.c:7278
@@ -6584,8 +6584,8 @@ msgstr "El valor %s difiere de los que se usa en otro archivo .aff"

 #: spell.c:6660
 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Leyendo el archivo de diccionario %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Leyendo el archivo de diccionario %s..."

 #: spell.c:6669
 #, c-format
@@ -6619,8 +6619,8 @@ msgstr "Ignorando %d palabra(s) con caracteres no-ASCII en %s"

 #: spell.c:7247
 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Leyendo archivo de palabras \"%s\" ..."
+msgid "Reading word file %s..."
+msgstr "Leyendo archivo de palabras \"%s\"..."

 #: spell.c:7297
 #, c-format
@@ -6691,8 +6691,8 @@ msgstr "Número total de palabras: %d"

 #: spell.c:9096
 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Escribiendo el archivo de sugerencias %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Escribiendo el archivo de sugerencias %s..."

 #: spell.c:9157 spell.c:9418
 #, c-format
@@ -6719,8 +6719,8 @@ msgstr "Advertencia: Se especificó \"compounding\" y NOBREAK"

 #: spell.c:9411
 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Escribiendo archivo de ortografía \"%s\" ..."
+msgid "Writing spell file %s..."
+msgstr "Escribiendo archivo de ortografía \"%s\"..."

 #: spell.c:9416
 msgid "Done!"
@@ -3033,7 +3033,7 @@ msgstr "-f\t\t\tÄlä käytä newcli:tä ikkunan avaamiseen"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <laite>\t\tKäytä <laitetta> IO:hon"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tkäynnistä arabia-tilassa"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4851,7 +4851,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Ei voitu allokoida muistia polkujen läpikäyntiin"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Ei voitu avata väliaikaislokitiedosta kirjoittamista varten, joten virheet "
 "näytetään vakiovirhevirrassa. "
@@ -5081,7 +5081,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "Luetaan affiksitiedostoa %s..."

 #, c-format
@@ -5218,7 +5218,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s-arvo eroaa toisessa .aff-tiedostossa olevasta"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "Luetaan sanakirjatiedostoa %s"

 #, c-format
@@ -5246,7 +5246,7 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ei-ASCII-merkkien takia ohitettuja sanoja %d kohteessa %s"

 #, c-format
-msgid "Reading word file %s ..."
+msgid "Reading word file %s..."
 msgstr "Luetaan sanatiedostoa %s..."

 #, c-format
@@ -5303,7 +5303,7 @@ msgid "Total number of words: %d"
 msgstr "Sanoja yhteensä: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "Kirjoitetaan ehdotustiedostoa %s..."

 #, c-format
@@ -5324,7 +5324,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Varoitus: sekä yhdyssanamuodostus että NOBREAK käytössä"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "Kirjoitetaan oikaisulukutiedostoa %s..."

 msgid "Done!"
@@ -3282,7 +3282,7 @@ msgstr "-f\t\tNe pas utiliser newcli pour l'ouverture des fen
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <périph>\tUtiliser <périphérique> pour les E/S"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\tDémarrer en mode arabe"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -5146,10 +5146,10 @@ msgstr ""
 "E878: (NFA) Impossible d'allouer la mémoire pour parcourir les branches !"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Impossible d'ouvrir le fichier de log temporaire en écriture, affichage sur "
-"stderr ... "
+"stderr... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5377,7 +5377,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Erreur lors de la lecture de fichier de suggestions : %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "Lecture du fichier d'affixes %s..."

 #, c-format
@@ -5517,7 +5517,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "La valeur de %s est différente de celle d'un autre fichier .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "Lecture du fichier orthographique %s..."

 #, c-format
@@ -5545,7 +5545,7 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "%d mot(s) ignoré(s) avec des caractères non-ASCII dans %s"

 #, c-format
-msgid "Reading word file %s ..."
+msgid "Reading word file %s..."
 msgstr "Lecture de la liste de mots %s..."

 #, c-format
@@ -5602,7 +5602,7 @@ msgid "Total number of words: %d"
 msgstr "Nombre total de mots : %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "Écriture du fichier de suggestions %s..."

 #, c-format
@@ -5624,7 +5624,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Alerte : la composition et NOBREAK sont tous les deux spécifiés"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "Écriture du fichier orthographique %s..."

 msgid "Done!"
@@ -3071,8 +3071,8 @@ msgstr "-f\t\t\tN
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <gléas>\t\tBain úsáid as <gléas> do I/A"

-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\ttosaigh sa mhód Araibise"
+msgid "-A\t\t\tStart in Arabic mode"
+msgstr "-A\t\t\tTosaigh sa mhód Araibise"

 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tTosaigh sa mhód Eabhraise"
@@ -4943,7 +4943,7 @@ msgstr ""
 "thrasnaíl!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Níorbh fhéidir logchomhad sealadach a oscailt le scríobh ann, á thaispeáint "
 "ar stderr..."
@@ -5178,7 +5178,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: earráid agus comhad .sug á léamh: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "Comhad foircinn %s á léamh..."

 #, c-format
@@ -5314,8 +5314,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Tá difear idir luach %s agus an luach i gcomhad .aff eile"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Foclóir %s á léamh ..."
+msgid "Reading dictionary file %s..."
+msgstr "Foclóir %s á léamh..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5342,8 +5342,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Rinneadh neamhshuim ar %d focal le carachtair neamh-ASCII i %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Comhad focail %s á léamh ..."
+msgid "Reading word file %s..."
+msgstr "Comhad focail %s á léamh..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5404,8 +5404,8 @@ msgid "Total number of words: %d"
 msgstr "Líon iomlán na bhfocal: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Comhad moltaí %s á scríobh ..."
+msgid "Writing suggestion file %s..."
+msgstr "Comhad moltaí %s á scríobh..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5425,8 +5425,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Rabhadh: sonraíodh comhfhocail agus NOBREAK araon"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Comhad litrithe %s á scríobh ..."
+msgid "Writing spell file %s..."
+msgstr "Comhad litrithe %s á scríobh..."

 msgid "Done!"
 msgstr "Críochnaithe!"
@@ -3069,7 +3069,7 @@ msgstr "-f\t\t\tNon usare newcli per aprire finestra"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <dispositivo>\t\tUsa <dispositivo> per I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tComincia in modalità Araba"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4901,9 +4901,9 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Non posso allocare memoria per il zigzag di ramo!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
-"Non posso aprire il file temporaneo per la scrittura, mostro su stderr ... "
+"Non posso aprire il file temporaneo per la scrittura, mostro su stderr... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5129,8 +5129,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Errore leggendo il file .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Lettura file affissi %s ..."
+msgid "Reading affix file %s..."
+msgstr "Lettura file affissi %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5265,8 +5265,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Il valore di %s è diverso da quello usato in un altro file .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Lettura file dizionario %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Lettura file dizionario %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5292,8 +5292,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "%d parole con caratteri non-ASCII ignorate in %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Lettura file parole %s ..."
+msgid "Reading word file %s..."
+msgstr "Lettura file parole %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5349,8 +5349,8 @@ msgid "Total number of words: %d"
 msgstr "Conteggio totale delle parole: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Scrivo file di suggerimenti %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Scrivo file di suggerimenti %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5370,8 +5370,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Avviso: specificati sia composizione sia NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Scrivo file ortografico %s ..."
+msgid "Writing spell file %s..."
+msgstr "Scrivo file ortografico %s..."

 msgid "Done!"
 msgstr "Fatto!"
@@ -3053,7 +3053,7 @@ msgstr "-f\t\t\t
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tI/Oに <device> を使用する"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tアラビア語モードで起動する"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4881,7 +4881,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準出力に"
 "出力します。"
@@ -5113,7 +5113,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "affix ファイル %s を読込中..."

 #, c-format
@@ -5250,7 +5250,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "値 %s は他の .aff ファイルで使用されたのと異なります"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "辞書ファイル %s をスキャン中..."

 #, c-format
@@ -5278,8 +5278,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "非ASCII文字を含む %d 個の単語を無視しました (%s 内)"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "標準入力から読込み中 %s ..."
+msgid "Reading word file %s..."
+msgstr "標準入力から読込み中 %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5335,7 +5335,7 @@ msgid "Total number of words: %d"
 msgstr "総単語数: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "修正候補ファイル \"%s\" を書込み中..."

 #, c-format
@@ -5357,7 +5357,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 複合フラグと NOBREAK が両方とも指定されました"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "スペルファイル %s を書込み中..."

 msgid "Done!"
@@ -3053,7 +3053,7 @@ msgstr "-f\t\t\tウィンドウを開くのに newcli を使用しない"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tI/Oに <device> を使用する"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tアラビア語モードで起動する"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4881,7 +4881,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準出力に"
 "出力します。"
@@ -5113,7 +5113,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "affix ファイル %s を読込中..."

 #, c-format
@@ -5250,7 +5250,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "値 %s は他の .aff ファイルで使用されたのと異なります"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "辞書ファイル %s をスキャン中..."

 #, c-format
@@ -5278,8 +5278,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "非ASCII文字を含む %d 個の単語を無視しました (%s 内)"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "標準入力から読込み中 %s ..."
+msgid "Reading word file %s..."
+msgstr "標準入力から読込み中 %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5335,7 +5335,7 @@ msgid "Total number of words: %d"
 msgstr "総単語数: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "修正候補ファイル \"%s\" を書込み中..."

 #, c-format
@@ -5357,7 +5357,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 複合フラグと NOBREAK が両方とも指定されました"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "スペルファイル %s を書込み中..."

 msgid "Done!"
@@ -3053,7 +3053,7 @@ msgstr "-f\t\t\t
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tI/Oに <device> を使用する"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tアラビア語モードで起動する"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4881,7 +4881,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) 現在横断中のブランチに十\分なメモリを割り当てられません!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "NFA正規表\現エンジン用のログファイルを書込用として開けません。ログは標準出力に"
 "出力します。"
@@ -5113,7 +5113,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "affix ファイル %s を読込中..."

 #, c-format
@@ -5250,7 +5250,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "値 %s は他の .aff ファイルで使用されたのと異なります"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "辞書ファイル %s をスキャン中..."

 #, c-format
@@ -5278,8 +5278,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "非ASCII文字を含む %d 個の単語を無視しました (%s 内)"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "標準入力から読込み中 %s ..."
+msgid "Reading word file %s..."
+msgstr "標準入力から読込み中 %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5335,7 +5335,7 @@ msgid "Total number of words: %d"
 msgstr "総単語数: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "修正候補ファイル \"%s\" を書込み中..."

 #, c-format
@@ -5357,7 +5357,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 複合フラグと NOBREAK が両方とも指定されました"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "スペルファイル %s を書込み中..."

 msgid "Done!"
@@ -3016,7 +3016,7 @@ msgstr "-f\t\t\t창을 열 때 newcli 사용하지 않음"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <장치>\t\tI/O에 <장치> 사용"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tArabic 모드로 시작"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4817,7 +4817,7 @@ msgstr "E879: (NFA 정규표현식) \\z(가 너무 많습니다"
 #~ msgstr ""

 #~ msgid ""
-#~ "Could not open temporary log file for writing, displaying on stderr ... "
+#~ "Could not open temporary log file for writing, displaying on stderr... "
 #~ msgstr ""

 #, c-format
@@ -5047,7 +5047,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: .sug 파일 읽기 에러: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "affix 파일 %s 읽는 중"

 #, c-format
@@ -5183,7 +5183,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s 값이 다른 .aff 파일에서 사용된 것과 다릅니다"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "사전 파일 %s 읽는 중 ..."

 #, c-format
@@ -5211,7 +5211,7 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "무시된 %d개의 아스키문자열이 아닌 단어가 %s에 있습니다"

 #, c-format
-msgid "Reading word file %s ..."
+msgid "Reading word file %s..."
 msgstr "단어 파일 %s 읽는 중 ..."

 #, c-format
@@ -5272,7 +5272,7 @@ msgid "Total number of words: %d"
 msgstr "총 단어 수: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "%s 제안 파일을 쓰는 중 ..."

 #, c-format
@@ -5293,7 +5293,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "경고: compound와 NOBREAK 둘 다 명시됨"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "spell 파일 %s 쓰는 중 ..."

 msgid "Done!"
@@ -3016,7 +3016,7 @@ msgstr "-f\t\t\tâ
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <장치>\t\tI/O에 <장치> 사용"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tArabic 모드로 시작"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4817,7 +4817,7 @@ msgstr "E879: (NFA
 #~ msgstr ""

 #~ msgid ""
-#~ "Could not open temporary log file for writing, displaying on stderr ... "
+#~ "Could not open temporary log file for writing, displaying on stderr... "
 #~ msgstr ""

 #, c-format
@@ -5047,7 +5047,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: .sug 파일 읽기 에러: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "affix 파일 %s 읽는 중"

 #, c-format
@@ -5183,7 +5183,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s 값이 다른 .aff 파일에서 사용된 것과 다릅니다"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "사전 파일 %s 읽는 중 ..."

 #, c-format
@@ -5211,7 +5211,7 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "무시된 %d개의 아스키문자열이 아닌 단어가 %s에 있습니다"

 #, c-format
-msgid "Reading word file %s ..."
+msgid "Reading word file %s..."
 msgstr "단어 파일 %s 읽는 중 ..."

 #, c-format
@@ -5272,8 +5272,8 @@ msgid "Total number of words: %d"
 msgstr "총 단어 수: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "%s 제안 파일을 쓰는 중 ..."
+msgid "Writing suggestion file %s..."
+msgstr "%s 제안 파일을 쓰는 중..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5293,8 +5293,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "경고: compound와 NOBREAK 둘 다 명시됨"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "spell 파일 %s 쓰는 중 ..."
+msgid "Writing spell file %s..."
+msgstr "spell 파일 %s 쓰는 중..."

 msgid "Done!"
 msgstr "끝!"
@@ -2920,7 +2920,7 @@ msgstr "-f\t\t\tIkke bruk newcli for
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <enhet>\t\tBruk <enhet> for I/U"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tStart i arabisk modus"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4771,8 +4771,8 @@ msgid "Warning: region %s not supported"
 msgstr "Advarsel: Region %s ikke støttet"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Leser affiksfil %s ..."
+msgid "Reading affix file %s..."
+msgstr "Leser affiksfil %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -4900,8 +4900,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s-verdi er forskjellig fra det som er bruk i en annen .aff-fil"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Leser ordlistefil %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Leser ordlistefil %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -4928,8 +4928,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ignorerte %d ord med ikke-ASCII-tegn i %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Leser ordfil %s ..."
+msgid "Reading word file %s..."
+msgstr "Leser ordfil %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4987,8 +4987,8 @@ msgid "Total number of words: %d"
 msgstr "Totalt antall ord: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Skriver forslagsfil %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Skriver forslagsfil %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5008,8 +5008,8 @@ msgstr "E755: Ugyldig region i %s"
 #~ msgstr ""

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Lagrer stavefil %s ..."
+msgid "Writing spell file %s..."
+msgstr "Lagrer stavefil %s..."

 msgid "Done!"
 msgstr "Ferdig!"
@@ -2990,7 +2990,7 @@ msgstr "-f\t\t\tGebruik geen newcli om venster te openen"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tGebruik <device> voor in- en uitvoer"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tIn Arabische modus starten"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4369,7 +4369,7 @@ msgstr ""
 #~ msgstr ""

 #, c-format
-#~ msgid "Reading affix file %s ..."
+#~ msgid "Reading affix file %s..."
 #~ msgstr ""

 #, c-format
@@ -4493,7 +4493,7 @@ msgstr ""
 #~ msgstr ""

 #, c-format
-#~ msgid "Reading dictionary file %s ..."
+#~ msgid "Reading dictionary file %s..."
 #~ msgstr ""

 #, c-format
@@ -4521,7 +4521,7 @@ msgstr ""
 #~ msgstr ""

 #, c-format
-#~ msgid "Reading word file %s ..."
+#~ msgid "Reading word file %s..."
 #~ msgstr ""

 #, c-format
@@ -4579,7 +4579,7 @@ msgstr ""
 #~ msgstr ""

 #, c-format
-#~ msgid "Writing suggestion file %s ..."
+#~ msgid "Writing suggestion file %s..."
 #~ msgstr ""

 #, c-format
@@ -4600,7 +4600,7 @@ msgstr ""
 #~ msgstr ""

 #, c-format
-#~ msgid "Writing spell file %s ..."
+#~ msgid "Writing spell file %s..."
 #~ msgstr ""

 #~ msgid "Done!"
@@ -2920,7 +2920,7 @@ msgstr "-f\t\t\tIkke bruk newcli for
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <enhet>\t\tBruk <enhet> for I/U"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tStart i arabisk modus"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4771,8 +4771,8 @@ msgid "Warning: region %s not supported"
 msgstr "Advarsel: Region %s ikke støttet"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Leser affiksfil %s ..."
+msgid "Reading affix file %s..."
+msgstr "Leser affiksfil %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -4900,8 +4900,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s-verdi er forskjellig fra det som er bruk i en annen .aff-fil"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Leser ordlistefil %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Leser ordlistefil %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -4928,8 +4928,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ignorerte %d ord med ikke-ASCII-tegn i %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Leser ordfil %s ..."
+msgid "Reading word file %s..."
+msgstr "Leser ordfil %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4987,8 +4987,8 @@ msgid "Total number of words: %d"
 msgstr "Totalt antall ord: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Skriver forslagsfil %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Skriver forslagsfil %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5008,8 +5008,8 @@ msgstr "E755: Ugyldig region i %s"
 #~ msgstr ""

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Lagrer stavefil %s ..."
+msgid "Writing spell file %s..."
+msgstr "Lagrer stavefil %s..."

 msgid "Done!"
 msgstr "Ferdig!"
@@ -3049,7 +3049,7 @@ msgstr "-f\t\t\tNie stosuj newcli do otwierania okien"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tUżywaj <device> do I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\trozpocznij w trybie arabskim"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4865,7 +4865,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Nie można przydzielić pamięci do przejścia przez gałęzie!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr "Nie można otworzyć do zapisu tymczasowego pliku, pokazuję na stderr... "

 #, c-format
@@ -5056,8 +5056,8 @@ msgid "Warning: region %s not supported"
 msgstr "Ostrzeżenie: region %s nie jest wspierany"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Czytam plik afiksów %s ..."
+msgid "Reading affix file %s..."
+msgstr "Czytam plik afiksów %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5192,8 +5192,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Wartość %s różni się od tej użytej w innym pliku .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Czytam plik słownika %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Czytam plik słownika %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5223,8 +5223,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Zignorowałem %d słów ze znakami nie ASCII w %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Odczytuję plik wyrazów %s ..."
+msgid "Reading word file %s..."
+msgstr "Odczytuję plik wyrazów %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5284,8 +5284,8 @@ msgid "Total number of words: %d"
 msgstr "Całkowita liczba słów: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Zapisuję plik sugestii %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Zapisuję plik sugestii %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5305,8 +5305,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Ostrzeżenie: określono zarówno złożenia jak i NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Zapisuję plik sprawdzania pisowni %s ..."
+msgid "Writing spell file %s..."
+msgstr "Zapisuję plik sprawdzania pisowni %s..."

 msgid "Done!"
 msgstr "Zrobione!"
@@ -3049,7 +3049,7 @@ msgstr "-f\t\t\tNie stosuj newcli do otwierania okien"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tU¿ywaj <device> do I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\trozpocznij w trybie arabskim"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4865,7 +4865,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Nie mo¿na przydzieliæ pamiêci do przejœcia przez ga³êzie!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr "Nie mo¿na otworzyæ do zapisu tymczasowego pliku, pokazujê na stderr... "

 #, c-format
@@ -5056,8 +5056,8 @@ msgid "Warning: region %s not supported"
 msgstr "Ostrze¿enie: region %s nie jest wspierany"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Czytam plik afiksów %s ..."
+msgid "Reading affix file %s..."
+msgstr "Czytam plik afiksów %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5192,8 +5192,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Wartoœæ %s ró¿ni siê od tej u¿ytej w innym pliku .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Czytam plik s³ownika %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Czytam plik s³ownika %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5223,8 +5223,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII w %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Odczytujê plik wyrazów %s ..."
+msgid "Reading word file %s..."
+msgstr "Odczytujê plik wyrazów %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5284,8 +5284,8 @@ msgid "Total number of words: %d"
 msgstr "Ca³kowita liczba s³ów: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Zapisujê plik sugestii %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Zapisujê plik sugestii %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5305,8 +5305,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Ostrze¿enie: okreœlono zarówno z³o¿enia jak i NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Zapisujê plik sprawdzania pisowni %s ..."
+msgid "Writing spell file %s..."
+msgstr "Zapisujê plik sprawdzania pisowni %s..."

 msgid "Done!"
 msgstr "Zrobione!"
@@ -3049,7 +3049,7 @@ msgstr "-f\t\t\tNie stosuj newcli do otwierania okien"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tU¿ywaj <device> do I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\trozpocznij w trybie arabskim"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4865,7 +4865,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Nie mo¿na przydzieliæ pamiêci do przej¶cia przez ga³êzie!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr "Nie mo¿na otworzyæ do zapisu tymczasowego pliku, pokazujê na stderr... "

 #, c-format
@@ -5056,8 +5056,8 @@ msgid "Warning: region %s not supported"
 msgstr "Ostrze¿enie: region %s nie jest wspierany"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Czytam plik afiksów %s ..."
+msgid "Reading affix file %s..."
+msgstr "Czytam plik afiksów %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5192,8 +5192,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Warto¶æ %s ró¿ni siê od tej u¿ytej w innym pliku .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Czytam plik s³ownika %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Czytam plik s³ownika %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5223,8 +5223,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII w %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Odczytujê plik wyrazów %s ..."
+msgid "Reading word file %s..."
+msgstr "Odczytujê plik wyrazów %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5284,8 +5284,8 @@ msgid "Total number of words: %d"
 msgstr "Ca³kowita liczba s³ów: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Zapisujê plik sugestii %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Zapisujê plik sugestii %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5305,8 +5305,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Ostrze¿enie: okre¶lono zarówno z³o¿enia jak i NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Zapisujê plik sprawdzania pisowni %s ..."
+msgid "Writing spell file %s..."
+msgstr "Zapisujê plik sprawdzania pisowni %s..."

 msgid "Done!"
 msgstr "Zrobione!"
@@ -3032,7 +3032,7 @@ msgstr "-f\t\t\tNão usar newcli para abrir janela"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <dispositivo>\tUsar <dispositivo> para E/S"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tiniciar no modo Árabe"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4859,9 +4859,9 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) memória não pôde ser alocada para percorrer os ramos!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
-"Arquivo de log temporário não pôde ser gravado, mostrando no stderr ... "
+"Arquivo de log temporário não pôde ser gravado, mostrando no stderr... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5096,7 +5096,7 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: erro ao ler o arquivo .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "Lendo arquivo de afixos %s..."

 #, c-format
@@ -5234,8 +5234,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "O valor de %s é diferente daquele usado em outro arquivo .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Lendo arquivo-dicionário %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Lendo arquivo-dicionário %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5262,8 +5262,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Foram ignoradas %d palavra(s) com caracteres não-ASCII em %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Lendo arquivo de palavras %s ..."
+msgid "Reading word file %s..."
+msgstr "Lendo arquivo de palavras %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5319,8 +5319,8 @@ msgid "Total number of words: %d"
 msgstr "Número total de palavras: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Gravando arquivo de sugestões %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Gravando arquivo de sugestões %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5340,8 +5340,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Aviso: tanto composição quanto NOBREAK foram especificados"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Gravando arquivo de verificação ortográfica %s ..."
+msgid "Writing spell file %s..."
+msgstr "Gravando arquivo de verificação ortográfica %s..."

 msgid "Done!"
 msgstr "Concluído!"
@@ -3089,7 +3089,7 @@ msgstr "-f\t\t\t
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <устройство>\t\tИспользовать для I/O указанное <устройство>"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tЗапуск в Арабском режиме"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4941,7 +4941,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (НКА) невозможно выделить память для прохода ветви!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Невозможно открыть файл временного журнала для записи, вывод на stderr..."

@@ -5173,8 +5173,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Ошибка при чтении файла .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "×òåíèå ôàéëà àôôèêñîâ %s ..."
+msgid "Reading affix file %s..."
+msgstr "×òåíèå ôàéëà àôôèêñîâ %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5310,8 +5310,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s имеет другое значение, чем в файле .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "×òåíèå ôàéëà ñëîâàðÿ %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "×òåíèå ôàéëà ñëîâàðÿ %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5338,8 +5338,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Пропущено %d слов с не ASCII символами в %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "×òåíèå ôàéëà ñëîâ %s ..."
+msgid "Reading word file %s..."
+msgstr "×òåíèå ôàéëà ñëîâ %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5395,7 +5395,7 @@ msgid "Total number of words: %d"
 msgstr "Общее количество слов: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "Запись файла предложения исправлений правописания %s"

 #, c-format
@@ -5417,8 +5417,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Предупреждение: оба составные и указано NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Çàïèñü ôàéëà ïðàâîïèñàíèÿ %s ..."
+msgid "Writing spell file %s..."
+msgstr "Çàïèñü ôàéëà ïðàâîïèñàíèÿ %s..."

 msgid "Done!"
 msgstr "Завершено!"
@@ -3089,7 +3089,7 @@ msgstr "-f\t\t\tНе использовать newcli для открытия о
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <устройство>\t\tИспользовать для I/O указанное <устройство>"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tЗапуск в Арабском режиме"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4941,7 +4941,7 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (НКА) невозможно выделить память для прохода ветви!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Невозможно открыть файл временного журнала для записи, вывод на stderr..."

@@ -5173,8 +5173,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Ошибка при чтении файла .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Чтение файла аффиксов %s ..."
+msgid "Reading affix file %s..."
+msgstr "Чтение файла аффиксов %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5310,8 +5310,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s имеет другое значение, чем в файле .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Чтение файла словаря %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Чтение файла словаря %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5338,8 +5338,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Пропущено %d слов с не ASCII символами в %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Чтение файла слов %s ..."
+msgid "Reading word file %s..."
+msgstr "Чтение файла слов %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5395,7 +5395,7 @@ msgid "Total number of words: %d"
 msgstr "Общее количество слов: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "Запись файла предложения исправлений правописания %s"

 #, c-format
@@ -5417,8 +5417,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Предупреждение: оба составные и указано NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Запись файла правописания %s ..."
+msgid "Writing spell file %s..."
+msgstr "Запись файла правописания %s..."

 msgid "Done!"
 msgstr "Завершено!"
@@ -2718,7 +2718,7 @@ msgstr "-f\t\t\tNebude pou
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <zariadenie>\t\tPouži� <zariadenie> pre I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tspusti v Arabic móde"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4539,8 +4539,8 @@ msgid "Warning: region %s not supported"
 msgstr "Varovanie: región %s nie je podporovaný"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Naèítavam súbor s príponami %s ..."
+msgid "Reading affix file %s..."
+msgstr "Naèítavam súbor s príponami %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -4653,8 +4653,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Hodnota %s sa odlišuje od hodnoty použitej v inom .aff súbore"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Naèítavam slovník %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Naèítavam slovník %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -4681,8 +4681,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ignorovaných %d slov s nepísmennými znakmi v %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Naèítavam súbor so slovami %s ..."
+msgid "Reading word file %s..."
+msgstr "Naèítavam súbor so slovami %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4734,8 +4734,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Varovanie: špecifikované spájanie a nezalamovanie"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Ukládám slovníkový súbor %s ..."
+msgid "Writing spell file %s..."
+msgstr "Ukládám slovníkový súbor %s..."

 msgid "Done!"
 msgstr "Hotovo!"
@@ -2718,7 +2718,7 @@ msgstr "-f\t\t\tNebude pou
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <zariadenie>\t\tPou¾i» <zariadenie> pre I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tspusti v Arabic móde"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4539,8 +4539,8 @@ msgid "Warning: region %s not supported"
 msgstr "Varovanie: región %s nie je podporovaný"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Naèítavam súbor s príponami %s ..."
+msgid "Reading affix file %s..."
+msgstr "Naèítavam súbor s príponami %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -4653,8 +4653,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Hodnota %s sa odli¹uje od hodnoty pou¾itej v inom .aff súbore"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Naèítavam slovník %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Naèítavam slovník %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -4681,8 +4681,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ignorovaných %d slov s nepísmennými znakmi v %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Naèítavam súbor so slovami %s ..."
+msgid "Reading word file %s..."
+msgstr "Naèítavam súbor so slovami %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4734,8 +4734,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Varovanie: ¹pecifikované spájanie a nezalamovanie"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Ukládám slovníkový súbor %s ..."
+msgid "Writing spell file %s..."
+msgstr "Ukládám slovníkový súbor %s..."

 msgid "Done!"
 msgstr "Hotovo!"
@@ -3075,7 +3075,7 @@ msgstr "-f\t\t\tНемој да користиш нов cli да отвориш
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <уређај>\t\tКористи <уређај> за У/И"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tПокрени у Арапском режиму"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4908,10 +4908,10 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Није могла да се алоцира меморија за обилазак грана!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Привремена лог датотека није могла да се отвори за упис, приказује се на "
-"stderr ... "
+"stderr... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5141,8 +5141,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: грешка приликом читања .sug датотеке: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Читање датотеке наставака %s ..."
+msgid "Reading affix file %s..."
+msgstr "Читање датотеке наставака %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5280,8 +5280,8 @@ msgstr ""
 "%s вредност се разликује од онога што је коришћено у другој .aff датотеци"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Читање датотеке речника %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Читање датотеке речника %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5308,8 +5308,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Игнорисана/о %d реч(и) са не-ASCII карактерима у %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Читање датотеке речи %s ..."
+msgid "Reading word file %s..."
+msgstr "Читање датотеке речи %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5365,8 +5365,8 @@ msgid "Total number of words: %d"
 msgstr "Укупан број речи: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Уписивање датотеке предлога %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Уписивање датотеке предлога %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5387,8 +5387,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Упозорење: наведени су и слагање и NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Уписивање правописне датотеке %s ..."
+msgid "Writing spell file %s..."
+msgstr "Уписивање правописне датотеке %s..."

 msgid "Done!"
 msgstr "Завршено!"
@@ -2897,8 +2897,8 @@ msgstr "-f\t\t\tAnv
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <enhet>\t\tAnvänd <enhet> för I/O"

-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\tstarta i arabiskt läge"
+msgid "-A\t\t\tStart in Arabic mode"
+msgstr "-A\t\t\tStarta i arabiskt läge"

 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tStarta i hebreiskt läge"
@@ -4753,8 +4753,8 @@ msgid "Warning: region %s not supported"
 msgstr "Varning: region %s stöds inte"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Läser affix-fil %s ..."
+msgid "Reading affix file %s..."
+msgstr "Läser affix-fil %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -4883,8 +4883,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s värde skiljer sig från vad som används i en annan .aff-fil."

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Läser ordboksfil %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Läser ordboksfil %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -4911,8 +4911,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ignorerade %d ord med icke-ASCII tecken i %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Läser ordfil %s ..."
+msgid "Reading word file %s..."
+msgstr "Läser ordfil %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4969,8 +4969,8 @@ msgid "Total number of words: %d"
 msgstr "Totalt antal ord: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Skriver förslagsfil %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Skriver förslagsfil %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -4990,8 +4990,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Varning: både sammansättning och NOBREAK specifierad"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Skriver stavningsfil %s ..."
+msgid "Writing spell file %s..."
+msgstr "Skriver stavningsfil %s..."

 msgid "Done!"
 msgstr "Klar!"
@@ -3125,7 +3125,7 @@ msgstr "-f\t\t\t
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <ïðèñòð³é>\t\t\tÂèêîðèñòîâóâàòè <ïðèñòð³é> äëÿ ââîäó/âèâîäó"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tÇàïóñòèòè â ðåæèì³ àðàáñüêî¿ ìîâè"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -5032,10 +5032,10 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Íå âäàëîñÿ îòðèìàòè ïàì’ÿòü äëÿ îáõîäó ã³ëîê!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Íå âäàëîñÿ â³äêðèòè òèì÷àñîâèé ôàéë æóðíàëó äëÿ çàïèñó, ïîêàçóºòüñÿ íà "
-"stderr ... "
+"stderr... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5271,8 +5271,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Ïîìèëêà ÷èòàííÿ ôàéëó .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "×èòàºòüñÿ ôàéë àô³êñ³â %s ..."
+msgid "Reading affix file %s..."
+msgstr "×èòàºòüñÿ ôàéë àô³êñ³â %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5408,8 +5408,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Çíà÷åííÿ %s â³äð³çíÿºòüñÿ â³ä òîãî, ùî âæèòî ó ³íøîìó ôàéë³ .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Ç÷èòóºòüñÿ ñëîâíèêîâèé ôàéë %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Ç÷èòóºòüñÿ ñëîâíèêîâèé ôàéë %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5436,8 +5436,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ïðîïóùåíî %d ñë³â(~) ³ç íå-ASCII ñèìâîëàìè ó %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "×èòàºòüñÿ ôàéë ñë³â %s ..."
+msgid "Reading word file %s..."
+msgstr "×èòàºòüñÿ ôàéë ñë³â %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5497,8 +5497,8 @@ msgid "Total number of words: %d"
 msgstr "Ïîâíà ê³ëüê³ñòü ñë³â: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Çàïèñóºòüñÿ ôàéë ïðèïóùåíü %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Çàïèñóºòüñÿ ôàéë ïðèïóùåíü %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5518,8 +5518,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Çàñòåðåæåííÿ: çàçíà÷åíî îáèäâà `ñêëàäí³ ñëîâà' ³ NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Çàïèñóºòüñÿ ôàéë îðôîãðàô³¿ %s ..."
+msgid "Writing spell file %s..."
+msgstr "Çàïèñóºòüñÿ ôàéë îðôîãðàô³¿ %s..."

 msgid "Done!"
 msgstr "Çðîáëåíî!"
@@ -3125,7 +3125,7 @@ msgstr "-f\t\t\tНе використовувати newcli для відкрит
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <пристрій>\t\t\tВикористовувати <пристрій> для вводу/виводу"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tЗапустити в режимі арабської мови"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -5032,10 +5032,10 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Не вдалося отримати пам’ять для обходу гілок!"

 msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
+"Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
 "Не вдалося відкрити тимчасовий файл журналу для запису, показується на "
-"stderr ... "
+"stderr... "

 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -5271,8 +5271,8 @@ msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Помилка читання файлу .sug: %s"

 #, c-format
-msgid "Reading affix file %s ..."
-msgstr "Читається файл афіксів %s ..."
+msgid "Reading affix file %s..."
+msgstr "Читається файл афіксів %s..."

 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
@@ -5408,8 +5408,8 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "Значення %s відрізняється від того, що вжито у іншому файлі .aff"

 #, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Зчитується словниковий файл %s ..."
+msgid "Reading dictionary file %s..."
+msgstr "Зчитується словниковий файл %s..."

 #, c-format
 msgid "E760: No word count in %s"
@@ -5436,8 +5436,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Пропущено %d слів(~) із не-ASCII символами у %s"

 #, c-format
-msgid "Reading word file %s ..."
-msgstr "Читається файл слів %s ..."
+msgid "Reading word file %s..."
+msgstr "Читається файл слів %s..."

 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -5497,8 +5497,8 @@ msgid "Total number of words: %d"
 msgstr "Повна кількість слів: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Записується файл припущень %s ..."
+msgid "Writing suggestion file %s..."
+msgstr "Записується файл припущень %s..."

 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
@@ -5518,8 +5518,8 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Застереження: зазначено обидва `складні слова' і NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
-msgstr "Записується файл орфографії %s ..."
+msgid "Writing spell file %s..."
+msgstr "Записується файл орфографії %s..."

 msgid "Done!"
 msgstr "Зроблено!"
@@ -2436,7 +2436,7 @@ msgstr "-f\t\t\tKhông sử dụng newcli để mở cửa sổ"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <thiết bị>\t\tSử dụng <thiết bị> cho I/O"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\tKhởi động vào chế độ Ả Rập"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -2828,7 +2828,7 @@ msgstr "-f\t\t\t不使用 newcli 来打开窗口"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\t使用 <device> 进行输入输出"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\t以 Arabic 模式启动"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4667,7 +4667,7 @@ msgid "Warning: region %s not supported"
 msgstr "警告: 区域 %s 不支持"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "读取附加文件 %s ……"

 #, c-format
@@ -4795,7 +4795,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s 的值与另一个 .aff 文件中使用的值不相同"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "读取字典文件 %s ……"

 #, c-format
@@ -4823,7 +4823,7 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "忽略了含有非 ASCII 字符的 %d 个单词，在 %s 中"

 #, c-format
-msgid "Reading word file %s ..."
+msgid "Reading word file %s..."
 msgstr "读取单词文件 %s ……"

 #, c-format
@@ -4881,7 +4881,7 @@ msgid "Total number of words: %d"
 msgstr "单词总数: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "写入建议文件 %s ……"

 #, c-format
@@ -4902,7 +4902,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 同时指定了 compounding 和 NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "写入拼写文件 %s ……"

 msgid "Done!"
@@ -2828,7 +2828,7 @@ msgstr "-f\t\t\t
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\t使用 <device> 进行输入输出"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\t以 Arabic 模式启动"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4667,7 +4667,7 @@ msgid "Warning: region %s not supported"
 msgstr "警告: 区域 %s 不支持"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "读取附加文件 %s ……"

 #, c-format
@@ -4795,7 +4795,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s 的值与另一个 .aff 文件中使用的值不相同"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "读取字典文件 %s ……"

 #, c-format
@@ -4823,7 +4823,7 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "忽略了含有非 ASCII 字符的 %d 个单词，在 %s 中"

 #, c-format
-msgid "Reading word file %s ..."
+msgid "Reading word file %s..."
 msgstr "读取单词文件 %s ……"

 #, c-format
@@ -4881,7 +4881,7 @@ msgid "Total number of words: %d"
 msgstr "单词总数: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "写入建议文件 %s ……"

 #, c-format
@@ -4902,7 +4902,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 同时指定了 compounding 和 NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "写入拼写文件 %s ……"

 msgid "Done!"
@@ -2829,7 +2829,7 @@ msgstr "-f\t\t\t
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\t使用 <device> 进行输入输出"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\t以 Arabic 模式启动"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -4667,7 +4667,7 @@ msgid "Warning: region %s not supported"
 msgstr "警告: 区域 %s 不支持"

 #, c-format
-msgid "Reading affix file %s ..."
+msgid "Reading affix file %s..."
 msgstr "读取附加文件 %s ……"

 #, c-format
@@ -4795,7 +4795,7 @@ msgid "%s value differs from what is used in another .aff file"
 msgstr "%s 的值与另一个 .aff 文件中使用的值不相同"

 #, c-format
-msgid "Reading dictionary file %s ..."
+msgid "Reading dictionary file %s..."
 msgstr "读取字典文件 %s ……"

 #, c-format
@@ -4823,7 +4823,7 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "忽略了含有非 ASCII 字符的 %d 个单词，在 %s 中"

 #, c-format
-msgid "Reading word file %s ..."
+msgid "Reading word file %s..."
 msgstr "读取单词文件 %s ……"

 #, c-format
@@ -4881,7 +4881,7 @@ msgid "Total number of words: %d"
 msgstr "单词总数: %d"

 #, c-format
-msgid "Writing suggestion file %s ..."
+msgid "Writing suggestion file %s..."
 msgstr "写入建议文件 %s ……"

 #, c-format
@@ -4902,7 +4902,7 @@ msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 同时指定了 compounding 和 NOBREAK"

 #, c-format
-msgid "Writing spell file %s ..."
+msgid "Writing spell file %s..."
 msgstr "写入拼写文件 %s ……"

 msgid "Done!"
@@ -2439,7 +2439,7 @@ msgstr "-f\t\t\t不使用 newcli 來開啟視窗"
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\t使用 <device> 做輸出入"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\t啟動為 Arabic 模式"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -2432,7 +2432,7 @@ msgstr "-f\t\t\t
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\t使用 <device> 做輸出入"

-msgid "-A\t\t\tstart in Arabic mode"
+msgid "-A\t\t\tStart in Arabic mode"
 msgstr "-A\t\t\t啟動為 Arabic 模式"

 msgid "-H\t\t\tStart in Hebrew mode"
@@ -55,5 +55,6 @@ void f_term_setkill(typval_T *argvars, typval_T *rettv);
 void f_term_start(typval_T *argvars, typval_T *rettv);
 void f_term_wait(typval_T *argvars, typval_T *rettv);
 void term_send_eof(channel_T *ch);
+job_T *term_getjob(term_T *term);
 int terminal_enabled(void);
 /* vim: set ft=c : */
@@ -6348,9 +6348,11 @@ ex_cexpr(exarg_T *eap)
 	    if (au_name != NULL)
 		apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 						curbuf->b_fname, TRUE, curbuf);
-	    if (res > 0 && (eap->cmdidx == CMD_cexpr ||
-						eap->cmdidx == CMD_lexpr))
-		qf_jump(qi, 0, 0, eap->forceit);  /* display first error */
+	    if (res > 0 && (eap->cmdidx == CMD_cexpr
+						   || eap->cmdidx == CMD_lexpr)
+		    && qi == GET_LOC_LIST(curwin))
+		// Jump to the first error if autocmds didn't free the list.
+		qf_jump(qi, 0, 0, eap->forceit);
 	}
 	else
 	    EMSG(_("E777: String or List expected"));
@@ -2672,6 +2672,7 @@ nfa_set_code(int c)

 #ifdef ENABLE_LOG
 static FILE *log_fd;
+static char_u e_log_open_failed[] = N_("Could not open temporary log file for writing, displaying on stderr... ");

 /*
 * Print the postfix notation of the current regexp.
@@ -2687,7 +2688,7 @@ nfa_postfix_dump(char_u *expr, int retval)
    {
 	fprintf(f, "\n-------------------------\n");
 	if (retval == FAIL)
-	    fprintf(f, ">>> NFA engine failed ... \n");
+	    fprintf(f, ">>> NFA engine failed... \n");
 	else if (retval == OK)
 	    fprintf(f, ">>> NFA engine succeeded !\n");
 	fprintf(f, "Regexp: \"%s\"\nPostfix notation (char): \"", expr);
@@ -5270,7 +5271,7 @@ recursive_regmatch(
    }
    else
    {
-	EMSG(_("Could not open temporary log file for writing, displaying on stderr ... "));
+	EMSG(_(e_log_open_failed));
 	log_fd = stderr;
    }
 #endif
@@ -5620,7 +5621,7 @@ nfa_regmatch(
    }
    else
    {
-	EMSG(_("Could not open temporary log file for writing, displaying on stderr ... "));
+	EMSG(_(e_log_open_failed));
 	log_fd = stderr;
    }
 #endif
@@ -5704,7 +5705,7 @@ nfa_regmatch(
 #ifdef ENABLE_LOG
 	fprintf(log_fd, "------------------------------------------\n");
 	fprintf(log_fd, ">>> Reginput is \"%s\"\n", reginput);
-	fprintf(log_fd, ">>> Advanced one character ... Current char is %c (code %d) \n", curc, (int)curc);
+	fprintf(log_fd, ">>> Advanced one character... Current char is %c (code %d) \n", curc, (int)curc);
 	fprintf(log_fd, ">>> Thislist has %d states available: ", thislist->n);
 	{
 	    int i;
@@ -5757,7 +5758,7 @@ nfa_regmatch(
 		else
 		    col = (int)(t->subs.norm.list.line[0].start - regline);
 		nfa_set_code(t->state->c);
-		fprintf(log_fd, "(%d) char %d %s (start col %d)%s ... \n",
+		fprintf(log_fd, "(%d) char %d %s (start col %d)%s... \n",
 			abs(t->state->id), (int)t->state->c, code, col,
 			pim_info(&t->pim));
 	    }
@@ -7282,7 +7283,7 @@ nfa_regcomp(char_u *expr, int re_flags)

 	if (f != NULL)
 	{
-	    fprintf(f, "\n*****************************\n\n\n\n\tCompiling regexp \"%s\" ... hold on !\n", expr);
+	    fprintf(f, "\n*****************************\n\n\n\n\tCompiling regexp \"%s\"... hold on !\n", expr);
 	    fclose(f);
 	}
    }
@@ -2716,10 +2716,11 @@ showmatch(
 }

 /*
- * findsent(dir, count) - Find the start of the next sentence in direction
- * "dir" Sentences are supposed to end in ".", "!" or "?" followed by white
- * space or a line break. Also stop at an empty line.
- * Return OK if the next sentence was found.
+ * Find the start of the next sentence, searching in the direction specified
+ * by the "dir" argument.  The cursor is positioned on the start of the next
+ * sentence when found.  If the next sentence is found, return OK.  Return FAIL
+ * otherwise.  See ":h sentence" for the precise definition of a "sentence"
+ * text object.
 */
    int
 findsent(int dir, long count)
@@ -2767,26 +2768,25 @@ findsent(int dir, long count)
 	else if (dir == BACKWARD)
 	    decl(&pos);

-	/* go back to the previous non-blank char */
+	// go back to the previous non-white non-punctuation character
 	found_dot = FALSE;
-	while ((c = gchar_pos(&pos)) == ' ' || c == '\t' ||
-	     (dir == BACKWARD && vim_strchr((char_u *)".!?)]\"'", c) != NULL))
+	while (c = gchar_pos(&pos), VIM_ISWHITE(c)
+				|| vim_strchr((char_u *)".!?)]\"'", c) != NULL)
 	{
-	    if (vim_strchr((char_u *)".!?", c) != NULL)
-	    {
-		/* Only skip over a '.', '!' and '?' once. */
-		if (found_dot)
-		    break;
-		found_dot = TRUE;
-	    }
-	    if (decl(&pos) == -1)
+	    tpos = pos;
+	    if (decl(&tpos) == -1 || (LINEEMPTY(tpos.lnum) && dir == FORWARD))
 		break;
-	    /* when going forward: Stop in front of empty line */
-	    if (LINEEMPTY(pos.lnum) && dir == FORWARD)
-	    {
-		incl(&pos);
-		goto found;
-	    }
+
+	    if (found_dot)
+		break;
+	    if (vim_strchr((char_u *) ".!?", c) != NULL)
+		found_dot = TRUE;
+
+	    if (vim_strchr((char_u *) ")]\"'", c) != NULL
+		&& vim_strchr((char_u *) ".!?)]\"'", gchar_pos(&tpos)) == NULL)
+		break;
+
+	    decl(&pos);
 	}

 	/* remember the line where the search started */
@@ -2241,7 +2241,7 @@ spell_read_aff(spellinfo_T *spin, char_u *fname)
 	return NULL;
    }

-    vim_snprintf((char *)IObuff, IOSIZE, _("Reading affix file %s ..."), fname);
+    vim_snprintf((char *)IObuff, IOSIZE, _("Reading affix file %s..."), fname);
    spell_message(spin, IObuff);

    /* Only do REP lines when not done in another .aff file already. */
@@ -3569,7 +3569,7 @@ spell_read_dic(spellinfo_T *spin, char_u *fname, afffile_T *affile)
    hash_init(&ht);

    vim_snprintf((char *)IObuff, IOSIZE,
-				  _("Reading dictionary file %s ..."), fname);
+				  _("Reading dictionary file %s..."), fname);
    spell_message(spin, IObuff);

    /* start with a message for the first line */
@@ -4149,7 +4149,7 @@ spell_read_wordfile(spellinfo_T *spin, char_u *fname)
 	return FAIL;
    }

-    vim_snprintf((char *)IObuff, IOSIZE, _("Reading word file %s ..."), fname);
+    vim_snprintf((char *)IObuff, IOSIZE, _("Reading word file %s..."), fname);
    spell_message(spin, IObuff);

    /*
@@ -5865,7 +5865,7 @@ sug_write(spellinfo_T *spin, char_u *fname)
    }

    vim_snprintf((char *)IObuff, IOSIZE,
-				  _("Writing suggestion file %s ..."), fname);
+				  _("Writing suggestion file %s..."), fname);
    spell_message(spin, IObuff);

    /*
@@ -6150,7 +6150,7 @@ mkspell(
 	     * Write the info in the spell file.
 	     */
 	    vim_snprintf((char *)IObuff, IOSIZE,
-				      _("Writing spell file %s ..."), wfname);
+				      _("Writing spell file %s..."), wfname);
 	    spell_message(&spin, IObuff);

 	    error = write_vim_spell(&spin, wfname) == FAIL;
@@ -973,11 +973,13 @@ write_to_term(buf_T *buffer, char_u *msg, channel_T *channel)
     * contents, thus no screen update is needed. */
    if (!term->tl_normal_mode)
    {
-	/* TODO: only update once in a while. */
+	// Don't use update_screen() when editing the command line, it gets
+	// cleared.
+	// TODO: only update once in a while.
 	ch_log(term->tl_job->jv_channel, "updating screen");
-	if (buffer == curbuf)
+	if (buffer == curbuf && (State & CMDLINE) == 0)
 	{
-	    update_screen(0);
+	    update_screen(VALID_NO_UPDATE);
 	    /* update_screen() can be slow, check the terminal wasn't closed
 	     * already */
 	    if (buffer == curbuf && curbuf->b_term != NULL)
@@ -5339,6 +5341,12 @@ term_send_eof(channel_T *ch)
 	}
 }

+    job_T *
+term_getjob(term_T *term)
+{
+    return term != NULL ? term->tl_job : NULL;
+}
+
 # if defined(WIN3264) || defined(PROTO)

 /**************************************
@@ -1,6 +1,5 @@
 " Tests for editing the command line.

-
 func Test_complete_tab()
  call writefile(['testfile'], 'Xtestfile')
  call feedkeys(":e Xtest\t\r", "tx")
@@ -392,6 +391,50 @@ func Test_cmdline_complete_user_cmd()
  delcommand Foo
 endfunc

+func Test_cmdline_complete_user_names()
+  if has('unix') && executable('whoami')
+    let whoami = systemlist('whoami')[0]
+    let first_letter = whoami[0]
+    if len(first_letter) > 0
+      " Trying completion of  :e ~x  where x is the first letter of
+      " the user name should complete to at least the user name.
+      call feedkeys(':e ~' . first_letter . "\<c-a>\<c-B>\"\<cr>", 'tx')
+      call assert_match('^"e \~.*\<' . whoami . '\>', @:)
+    endif
+  endif
+  if has('win32')
+    " Just in case: check that the system has an Administrator account.
+    let names = system('net user')
+    if names =~ 'Administrator'
+      " Trying completion of  :e ~A  should complete to Administrator.
+      call feedkeys(':e ~A' . "\<c-a>\<c-B>\"\<cr>", 'tx')
+      call assert_match('^"e \~Administrator', @:)
+    endif
+  endif
+endfunc
+
+funct Test_cmdline_complete_languages()
+  let lang = substitute(execute('language messages'), '.*"\(.*\)"$', '\1', '')
+
+  call feedkeys(":language \<c-a>\<c-b>\"\<cr>", 'tx')
+  call assert_match('^"language .*\<ctype\>.*\<messages\>.*\<time\>', @:)
+
+  if has('unix')
+    " TODO: these tests don't work on Windows. lang appears to be 'C'
+    " but C does not appear in the completion. Why?
+    call assert_match('^"language .*\<' . lang . '\>', @:)
+
+    call feedkeys(":language messages \<c-a>\<c-b>\"\<cr>", 'tx')
+    call assert_match('^"language .*\<' . lang . '\>', @:)
+
+    call feedkeys(":language ctype \<c-a>\<c-b>\"\<cr>", 'tx')
+    call assert_match('^"language .*\<' . lang . '\>', @:)
+
+    call feedkeys(":language time \<c-a>\<c-b>\"\<cr>", 'tx')
+    call assert_match('^"language .*\<' . lang . '\>', @:)
+  endif
+endfunc
+
 func Test_cmdline_write_alternatefile()
  new
  call setline('.', ['one', 'two'])
@@ -948,3 +948,39 @@ func Test_reg_executing_and_recording()
  delfunc s:save_reg_stat
  unlet s:reg_stat
 endfunc
+
+func Test_libcall_libcallnr()
+  if !has('libcall')
+    return
+  endif
+
+  if has('win32')
+    let libc = 'msvcrt.dll'
+  elseif has('mac')
+    let libc = 'libSystem.B.dylib'
+  else
+    " On Unix, libc.so can be in various places.
+    " Interestingly, using an empty string for the 1st argument of libcall
+    " allows to call functions from libc which is not documented.
+    let libc = ''
+  endif
+
+  if has('win32')
+    call assert_equal($USERPROFILE, libcall(libc, 'getenv', 'USERPROFILE'))
+  else
+    call assert_equal($HOME, libcall(libc, 'getenv', 'HOME'))
+  endif
+
+  " If function returns NULL, libcall() should return an empty string.
+  call assert_equal('', libcall(libc, 'getenv', 'X_ENV_DOES_NOT_EXIT'))
+
+  " Test libcallnr() with string and integer argument.
+  call assert_equal(4, libcallnr(libc, 'strlen', 'abcd'))
+  call assert_equal(char2nr('A'), libcallnr(libc, 'toupper', char2nr('a')))
+
+  call assert_fails("call libcall(libc, 'Xdoesnotexist_', '')", 'E364:')
+  call assert_fails("call libcallnr(libc, 'Xdoesnotexist_', '')", 'E364:')
+
+  call assert_fails("call libcall('Xdoesnotexist_', 'getenv', 'HOME')", 'E364:')
+  call assert_fails("call libcallnr('Xdoesnotexist_', 'strlen', 'abcd')", 'E364:')
+endfunc
@@ -24,6 +24,8 @@ func WriteScript(name)
  call writefile([
 	\ 'func TextEntered(text)',
 	\ '  if a:text == "exit"',
+	\ '    " Reset &modified to allow the buffer to be closed.',
+	\ '    set nomodified',
 	\ '    stopinsert',
 	\ '    close',
 	\ '  else',
@@ -3362,3 +3362,14 @@ func Test_lbuffer_with_bwipe()
    au!
  augroup END
 endfunc
+
+func Test_setloclist_in_aucmd()
+  " This was using freed memory.
+  augroup nasty
+    au * * call setloclist(0, [], 'f')
+  augroup END
+  lexpr "x"
+  augroup nasty
+    au!
+  augroup END
+endfunc
@@ -522,29 +522,6 @@ func Test_terminal_env()
  exe buf . 'bwipe'
 endfunc

-" must be last, we can't go back from GUI to terminal
-func Test_zz_terminal_in_gui()
-  if !CanRunGui()
-    return
-  endif
-
-  " Ignore the "failed to create input context" error.
-  call test_ignore_error('E285:')
-
-  gui -f
-
-  call assert_equal(1, winnr('$'))
-  let buf = Run_shell_in_terminal({'term_finish': 'close'})
-  call Stop_shell_in_terminal(buf)
-  call term_wait(buf)
-
-  " closing window wipes out the terminal buffer a with finished job
-  call WaitForAssert({-> assert_equal(1, winnr('$'))})
-  call assert_equal("", bufname(buf))
-
-  unlet g:job
-endfunc
-
 func Test_terminal_list_args()
  let buf = term_start([&shell, &shellcmdflag, 'echo "123"'])
  call assert_fails(buf . 'bwipe', 'E517')
@@ -1520,8 +1497,9 @@ func Test_terminal_out_err()

  let outfile = 'Xtermstdout'
  let buf = term_start(['./Xechoerrout.sh'], {'out_io': 'file', 'out_name': outfile})
-  call WaitForAssert({-> assert_inrange(1, 2, len(readfile(outfile)))})
-  call assert_equal("this is standard out", readfile(outfile)[0])
+
+  call WaitFor({-> !empty(readfile(outfile)) && !empty(term_getline(buf, 1))})
+  call assert_equal(['this is standard out'], readfile(outfile))
  call assert_equal('this is standard error', term_getline(buf, 1))

  call WaitForAssert({-> assert_equal('dead', job_status(term_getjob(buf)))})
@@ -1556,3 +1534,58 @@ func Test_terminwinscroll()

  exe buf . 'bwipe!'
 endfunc
+
+" must be nearly the last, we can't go back from GUI to terminal
+func Test_zz1_terminal_in_gui()
+  if !CanRunGui()
+    return
+  endif
+
+  " Ignore the "failed to create input context" error.
+  call test_ignore_error('E285:')
+
+  gui -f
+
+  call assert_equal(1, winnr('$'))
+  let buf = Run_shell_in_terminal({'term_finish': 'close'})
+  call Stop_shell_in_terminal(buf)
+  call term_wait(buf)
+
+  " closing window wipes out the terminal buffer a with finished job
+  call WaitForAssert({-> assert_equal(1, winnr('$'))})
+  call assert_equal("", bufname(buf))
+
+  unlet g:job
+endfunc
+
+func Test_zz2_terminal_guioptions_bang()
+  if !has('gui_running')
+    return
+  endif
+  set guioptions+=!
+
+  let filename = 'Xtestscript'
+  if has('win32')
+    let filename .= '.bat'
+    let prefix = ''
+    let contents = ['@echo off', 'exit %1']
+  else
+    let filename .= '.sh'
+    let prefix = './'
+    let contents = ['#!/bin/sh', 'exit $1']
+  endif
+  call writefile(contents, filename)
+  call setfperm(filename, 'rwxrwx---')
+
+  " Check if v:shell_error is equal to the exit status.
+  let exitval = 0
+  execute printf(':!%s%s %d', prefix, filename, exitval)
+  call assert_equal(exitval, v:shell_error)
+
+  let exitval = 9
+  execute printf(':!%s%s %d', prefix, filename, exitval)
+  call assert_equal(exitval, v:shell_error)
+
+  set guioptions&
+  call delete(filename)
+endfunc
@@ -165,3 +165,78 @@ x
  norm it
  q!
 endfunc
+
+func Test_sentence()
+  enew!
+  call setline(1, 'A sentence.  A sentence?  A sentence!')
+
+  normal yis
+  call assert_equal('A sentence.', @")
+  normal yas
+  call assert_equal('A sentence.  ', @")
+
+  normal )
+
+  normal yis
+  call assert_equal('A sentence?', @")
+  normal yas
+  call assert_equal('A sentence?  ', @")
+
+  normal )
+
+  normal yis
+  call assert_equal('A sentence!', @")
+  normal yas
+  call assert_equal('  A sentence!', @")
+
+  normal 0
+  normal 2yis
+  call assert_equal('A sentence.  ', @")
+  normal 3yis
+  call assert_equal('A sentence.  A sentence?', @")
+  normal 2yas
+  call assert_equal('A sentence.  A sentence?  ', @")
+
+  %delete _
+endfunc
+
+func Test_sentence_with_quotes()
+  enew!
+  call setline(1, 'A "sentence."  A sentence.')
+
+  normal yis
+  call assert_equal('A "sentence."', @")
+  normal yas
+  call assert_equal('A "sentence."  ', @")
+
+  normal )
+
+  normal yis
+  call assert_equal('A sentence.', @")
+  normal yas
+  call assert_equal('  A sentence.', @")
+
+  %delete _
+endfunc
+
+func! Test_sentence_with_cursor_on_delimiter()
+  enew!
+  call setline(1, "A '([sentence.])'  A sentence.")
+
+  normal! 15|yis
+  call assert_equal("A '([sentence.])'", @")
+  normal! 15|yas
+  call assert_equal("A '([sentence.])'  ", @")
+
+  normal! 16|yis
+  call assert_equal("A '([sentence.])'", @")
+  normal! 16|yas
+  call assert_equal("A '([sentence.])'  ", @")
+
+  normal! 17|yis
+  call assert_equal("A '([sentence.])'", @")
+  normal! 17|yas
+  call assert_equal("A '([sentence.])'  ", @")
+
+  %delete _
+endfunc
@@ -3539,7 +3539,9 @@ bufIsChanged(buf_T *buf)
    int
 bufIsChangedNotTerm(buf_T *buf)
 {
-    return !bt_dontwrite(buf)
+    // In a "prompt" buffer we do respect 'modified', so that we can control
+    // closing the window by setting or resetting that option.
+    return (!bt_dontwrite(buf) || bt_prompt(buf))
 	&& (buf->b_changed || file_ff_differs(buf, TRUE));
 }

@@ -776,6 +776,52 @@ static char *(features[]) =

 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    95,
+/**/
+    94,
+/**/
+    93,
+/**/
+    92,
+/**/
+    91,
+/**/
+    90,
+/**/
+    89,
+/**/
+    88,
+/**/
+    87,
+/**/
+    86,
+/**/
+    85,
+/**/
+    84,
+/**/
+    83,
+/**/
+    82,
+/**/
+    81,
+/**/
+    80,
+/**/
+    79,
+/**/
+    78,
+/**/
+    77,
+/**/
+    76,
+/**/
+    75,
+/**/
+    74,
+/**/
+    73,
 /**/
    72,
 /**/