diff options
-rw-r--r-- | runtime/compiler/dart.vim | 26 | ||||
-rw-r--r-- | runtime/compiler/dart2js.vim | 28 | ||||
-rw-r--r-- | runtime/compiler/dart2native.vim | 28 | ||||
-rw-r--r-- | runtime/compiler/dartanalyser.vim | 23 | ||||
-rw-r--r-- | runtime/compiler/dartdevc.vim | 28 | ||||
-rw-r--r-- | runtime/compiler/dartdoc.vim | 26 | ||||
-rw-r--r-- | runtime/compiler/dartfmt.vim | 25 | ||||
-rw-r--r-- | runtime/compiler/javac.vim | 15 | ||||
-rw-r--r-- | runtime/compiler/rhino.vim | 30 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 12 | ||||
-rw-r--r-- | runtime/doc/map.txt | 65 | ||||
-rw-r--r-- | runtime/doc/message.txt | 2 | ||||
-rw-r--r-- | runtime/doc/options.txt | 2 | ||||
-rw-r--r-- | runtime/doc/pattern.txt | 22 | ||||
-rw-r--r-- | runtime/doc/usr_03.txt | 17 | ||||
-rw-r--r-- | runtime/doc/usr_41.txt | 48 | ||||
-rw-r--r-- | runtime/ftplugin/spec.vim | 8 | ||||
-rw-r--r-- | runtime/indent/json.vim | 22 | ||||
-rw-r--r-- | runtime/keymap/french-azerty.vim | 81 | ||||
-rw-r--r-- | runtime/keymap/german-qwertz.vim | 76 | ||||
-rw-r--r-- | runtime/keymap/turkish-f.vim | 1 | ||||
-rw-r--r-- | src/nvim/po/tr.po | 541 |
22 files changed, 977 insertions, 149 deletions
diff --git a/runtime/compiler/dart.vim b/runtime/compiler/dart.vim new file mode 100644 index 0000000000..f9ebfe1b27 --- /dev/null +++ b/runtime/compiler/dart.vim @@ -0,0 +1,26 @@ +" Vim compiler file +" Compiler: Dart VM +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 May 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "dart" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet makeprg=dart +CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m, + \%CTry\ %.%#, + \%Z\ %#^%\\+, + \%C%.%#, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/dart2js.vim b/runtime/compiler/dart2js.vim new file mode 100644 index 0000000000..b6a4e4d530 --- /dev/null +++ b/runtime/compiler/dart2js.vim @@ -0,0 +1,28 @@ +" Vim compiler file +" Compiler: Dart to JavaScript Compiler +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 May 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "dart2js" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet makeprg=dart2js +CompilerSet errorformat=%E%f:%l:%c:, + \%-GError:\ Compilation\ failed., + \%CError:\ %m, + \%Z\ %#^%\\+, + \%C%.%#, + \%trror:\ %m, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/dart2native.vim b/runtime/compiler/dart2native.vim new file mode 100644 index 0000000000..51bdab0cc3 --- /dev/null +++ b/runtime/compiler/dart2native.vim @@ -0,0 +1,28 @@ +" Vim compiler file +" Compiler: Dart to Native Compiler +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 May 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "dart2native" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet makeprg=dart2native +CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m, + \%CTry\ %.%#, + \%Z\ %#^%\\+, + \%Z%$, + \%C%.%#, + \%E%f:\ %trror:\ %m, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/dartanalyser.vim b/runtime/compiler/dartanalyser.vim new file mode 100644 index 0000000000..e691d80b61 --- /dev/null +++ b/runtime/compiler/dartanalyser.vim @@ -0,0 +1,23 @@ +" Vim compiler file +" Compiler: Dart Analyzer +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 May 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "dartanalyzer" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet makeprg=dartanalyzer\ --format\ machine +CompilerSet errorformat=%t%\\w%\\+\|%\\w%\\+\|%\\w%\\+\|%f\|%l\|%c\|%\\d%\\+\|%m, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/dartdevc.vim b/runtime/compiler/dartdevc.vim new file mode 100644 index 0000000000..e8d1988ed6 --- /dev/null +++ b/runtime/compiler/dartdevc.vim @@ -0,0 +1,28 @@ +" Vim compiler file +" Compiler: Dart Development Compiler +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 May 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "dartdevc" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet makeprg=dartdevc +CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m, + \%CTry\ %.%#, + \%Z\ %#^%\\+, + \%Z%$, + \%C%.%#, + \%E%f:\ %trror:\ %m, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/dartdoc.vim b/runtime/compiler/dartdoc.vim new file mode 100644 index 0000000000..26b38d8dd4 --- /dev/null +++ b/runtime/compiler/dartdoc.vim @@ -0,0 +1,26 @@ +" Vim compiler file +" Compiler: Dart Documentation Generator +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 May 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "dartdoc" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet makeprg=dartdoc +CompilerSet errorformat=\ \ %tarning:\ %m, + \\ \ %trror:\ %m, + \%+EGeneration\ failed:\ %m, + \%+ISuccess!\ Docs\ generated\ into\ %f, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/dartfmt.vim b/runtime/compiler/dartfmt.vim new file mode 100644 index 0000000000..2e4ab02ad3 --- /dev/null +++ b/runtime/compiler/dartfmt.vim @@ -0,0 +1,25 @@ +" Vim compiler file +" Compiler: Dart Formatter +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 May 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "dartfmt" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +CompilerSet makeprg=dartfmt +CompilerSet errorformat=%Eline\ %l\\,\ column\ %c\ of\ %f:\ %m, + \%Z\ %\\{3}│\ %\\+^%\\+, + \%C%.%#, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/javac.vim b/runtime/compiler/javac.vim index a50bdca8f2..8507efd67c 100644 --- a/runtime/compiler/javac.vim +++ b/runtime/compiler/javac.vim @@ -1,7 +1,7 @@ " Vim compiler file -" Compiler: javac +" Compiler: Java Development Kit Compiler " Maintainer: Doug Kearns <dougkearns@gmail.com> -" Last Change: 2004 Nov 27 +" Last Change: 2019 Oct 21 if exists("current_compiler") finish @@ -12,6 +12,15 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal command -nargs=* CompilerSet setlocal <args> endif +let s:cpo_save = &cpo +set cpo&vim + CompilerSet makeprg=javac +CompilerSet errorformat=%E%f:%l:\ error:\ %m, + \%W%f:%l:\ warning:\ %m, + \%-Z%p^, + \%-C%.%#, + \%-G%.%# -CompilerSet errorformat=%E%f:%l:\ %m,%-Z%p^,%-C%.%#,%-G%.%# +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/compiler/rhino.vim b/runtime/compiler/rhino.vim new file mode 100644 index 0000000000..30f3dd3252 --- /dev/null +++ b/runtime/compiler/rhino.vim @@ -0,0 +1,30 @@ +" Vim compiler file +" Compiler: Rhino Shell (JavaScript in Java) +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 Jul 10 + +if exists("current_compiler") + finish +endif +let current_compiler = "rhino" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +" CompilerSet makeprg=java\ -jar\ lib/rhino-X.X.XX.jar\ -w\ -strict + +CompilerSet makeprg=rhino +CompilerSet errorformat=%-Gjs:\ %.%#Compilation\ produced%.%#, + \%Ejs:\ \"%f\"\\,\ line\ %l:\ %m, + \%Ejs:\ uncaught\ JavaScript\ runtime\ exception:\ %m, + \%Wjs:\ warning:\ \"%f\"\\,\ line\ %l:\ %m, + \%Zjs:\ %p^, + \%Cjs:\ %.%#, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index ba2b3d567c..0c5bf0b2d8 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -75,8 +75,9 @@ base, use |str2nr()|. *TRUE* *FALSE* *Boolean* For boolean operators Numbers are used. Zero is FALSE, non-zero is TRUE. -You can also use |v:false| and |v:true|. When TRUE is returned from a -function it is the Number one, FALSE is the number zero. +You can also use |v:false| and |v:true|. +When TRUE is returned from a function it is the Number one, FALSE is the +number zero. Note that in the command: > :if "foo" @@ -2818,7 +2819,7 @@ bufnr([{expr} [, {create}]]) the ":ls" command. For the use of {expr}, see |bufname()| above. If the buffer doesn't exist, -1 is returned. Or, if the - {create} argument is present and not zero, a new, unlisted, + {create} argument is present and TRUE, a new, unlisted, buffer is created and its number is returned. bufnr("$") is the last buffer: > :let last_buffer = bufnr("$") @@ -8161,7 +8162,7 @@ str2list({expr} [, {utf8}]) *str2list()* < |list2str()| does the opposite. When {utf8} is omitted or zero, the current 'encoding' is used. - With {utf8} set to 1, always treat the String as utf-8 + With {utf8} set to TRUE, always treat the String as utf-8 characters. With utf-8 composing characters are handled properly: > str2list("á") returns [97, 769] @@ -9136,7 +9137,8 @@ win_screenpos({nr}) *win_screenpos()* Return the screen position of window {nr} as a list with two numbers: [row, col]. The first window always has position [1, 1], unless there is a tabline, then it is [2, 1]. - {nr} can be the window number or the |window-ID|. + {nr} can be the window number or the |window-ID|. Use zero + for the current window. Return [0, 0] if the window cannot be found in the current tabpage. diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 82c54925fd..9c72412179 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -180,7 +180,7 @@ Note that this works when the <nowait> mapping fully matches and is found before any partial matches. This works when: - There is only one matching buffer-local mapping, since these are always found before global mappings. -- There is another buffer-local mapping that partly matches, but it is was +- There is another buffer-local mapping that partly matches, but it is defined earlier (last defined mapping is found first). *:map-<silent>* *:map-silent* @@ -283,15 +283,8 @@ Here is an example that inserts a list number that increases: > CTRL-L inserts the next number, CTRL-R resets the count. CTRL-R returns an empty string, so that nothing is inserted. -Note that there are some tricks to make special keys work and escape CSI bytes -in the text. The |:map| command also does this, thus you must avoid that it -is done twice. This does not work: > - :imap <expr> <F3> "<Char-0x611B>" -Because the <Char- sequence is escaped for being a |:imap| argument and then -again for using <expr>. This does work: > - :imap <expr> <F3> "\u611B" -Using 0x80 as a single byte before other text does not work, it will be seen -as a special key. +Note that using 0x80 as a single byte before other text does not work, it will +be seen as a special key. *<Cmd>* *:map-cmd* The <Cmd> pseudokey begins a "command mapping", which executes the command @@ -814,35 +807,47 @@ g@{motion} Call the function set by the 'operatorfunc' option. Here is an example that counts the number of spaces with <F4>: > - nmap <silent> <F4> :set opfunc=CountSpaces<CR>g@ - vmap <silent> <F4> :<C-U>call CountSpaces(visualmode(), 1)<CR> + nnoremap <expr> <F4> CountSpaces() + xnoremap <expr> <F4> CountSpaces() + " doubling <F4> works on a line + nnoremap <expr> <F4><F4> CountSpaces() .. '_' - function! CountSpaces(type, ...) - let sel_save = &selection - let &selection = "inclusive" - let reg_save = @@ - - if a:0 " Invoked from Visual mode, use gv command. - silent exe "normal! gvy" - elseif a:type == 'line' - silent exe "normal! '[V']y" - else - silent exe "normal! `[v`]y" + function CountSpaces(type = '') abort + if a:type == '' + set opfunc=CountSpaces + return 'g@' endif - echomsg strlen(substitute(@@, '[^ ]', '', 'g')) - - let &selection = sel_save - let @@ = reg_save + let sel_save = &selection + let reg_save = getreginfo('"') + let cb_save = &clipboard + let visual_marks_save = [getpos("'<"), getpos("'>")] + + try + set clipboard= selection=inclusive + let commands = #{line: "'[V']y", char: "`[v`]y", block: "`[\<c-v>`]y"} + silent exe 'noautocmd keepjumps normal! ' .. get(commands, a:type, '') + echom getreg('"')->count(' ') + finally + call setreg('"', reg_save) + call setpos("'<", visual_marks_save[0]) + call setpos("'>", visual_marks_save[1]) + let &clipboard = cb_save + let &selection = sel_save + endtry endfunction +An <expr> mapping is used to be able to fetch any prefixed count and register. +This also avoids using a command line, which would trigger CmdlineEnter and +CmdlineLeave autocommands. + Note that the 'selection' option is temporarily set to "inclusive" to be able to yank exactly the right text by using Visual mode from the '[ to the '] mark. -Also note that there is a separate mapping for Visual mode. It removes the -"'<,'>" range that ":" inserts in Visual mode and invokes the function with -visualmode() and an extra argument. +Also note that the 'clipboard' option is temporarily emptied to avoid +clobbering the `"*` or `"+` registers, if its value contains the item `unnamed` +or `unnamedplus`. ============================================================================== 2. Abbreviations *abbreviations* *Abbreviations* diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 85e11634fc..4df53a561e 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -68,7 +68,7 @@ Or view a list of recent messages with: > See `:messages` above. LIST OF MESSAGES - *E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317* + *E222* *E228* *E232* *E293* *E298* *E304* *E317* *E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322* *E323* *E341* *E473* *E570* *E685* *E292* > Add to read buffer diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 79dcea510c..a7ad94db6d 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5256,7 +5256,7 @@ A jump table for the options with a short description can be found at |Q_op|. of this option). For MS-Windows the default is ">%s 2>&1". The output is directly saved in a file and not echoed to the screen. - For Unix the default it "| tee". The stdout of the compiler is saved + For Unix the default is "| tee". The stdout of the compiler is saved in a file and echoed to the screen. If the 'shell' option is "csh" or "tcsh" after initializations, the default becomes "|& tee". If the 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta", diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 92147ecbce..406068982e 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -787,11 +787,12 @@ An ordinary atom can be: ^beep( the start of the C function "beep" (probably). */\^* -\^ Matches literal '^'. Can be used at any position in the pattern. +\^ Matches literal '^'. Can be used at any position in the pattern, but + not inside []. */\_^* \_^ Matches start-of-line. |/zero-width| Can be used at any position in - the pattern. + the pattern, but not inside []. Example matches ~ \_s*\_^foo white space and blank lines and then "foo" at start-of-line @@ -802,12 +803,13 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): |/zero-width| */\$* -\$ Matches literal '$'. Can be used at any position in the pattern. +\$ Matches literal '$'. Can be used at any position in the pattern, but + not inside []. */\_$* \_$ Matches end-of-line. |/zero-width| Can be used at any position in the - pattern. Note that "a\_$b" never matches, since "b" cannot match an - end-of-line. Use "a\nb" instead |/\n|. + pattern, but not inside []. Note that "a\_$b" never matches, since + "b" cannot match an end-of-line. Use "a\nb" instead |/\n|. Example matches ~ foo\_$\_s* "foo" at end-of-line and following white space and blank lines @@ -830,8 +832,9 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): |/zero-width| */\zs* -\zs Matches at any position, and sets the start of the match there: The - next char is the first char of the whole match. |/zero-width| +\zs Matches at any position, but not inside [], and sets the start of the + match there: The next char is the first char of the whole match. + |/zero-width| Example: > /^\s*\zsif < matches an "if" at the start of a line, ignoring white space. @@ -842,8 +845,9 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): This cannot be followed by a multi. *E888* */\ze* -\ze Matches at any position, and sets the end of the match there: The - previous char is the last char of the whole match. |/zero-width| +\ze Matches at any position, but not inside [], and sets the end of the + match there: The previous char is the last char of the whole match. + |/zero-width| Can be used multiple times, the last one encountered in a matching branch is used. Example: "end\ze\(if\|for\)" matches the "end" in "endif" and diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt index b1b04f95c7..d42701b698 100644 --- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -30,10 +30,11 @@ Table of contents: |usr_toc.txt| To move the cursor forward one word, use the "w" command. Like most Vim commands, you can use a numeric prefix to move past multiple words. For -example, "3w" moves three words. This figure shows how it works: +example, "3w" moves three words. This figure shows how it works (starting at +the position marked with "x"): This is a line with example text ~ - --->-->->-----------------> + x-->-->->-----------------> w w w 3w Notice that "w" moves to the start of the next word if it already is at the @@ -41,15 +42,15 @@ start of a word. The "b" command moves backward to the start of the previous word: This is a line with example text ~ - <----<--<-<---------<--- + <----<--<-<---------<--x b b b 2b b There is also the "e" command that moves to the next end of a word and "ge", which moves to the previous end of a word: This is a line with example text ~ - <- <--- -----> ----> - ge ge e e + <----<----x---->------------> + 2ge ge e we If you are at the last word of a line, the "w" command will take you to the first word in the next line. Thus you can use this to move through a @@ -82,12 +83,12 @@ an <End> key it will do the same thing. The "^" command moves to the first non-blank character of the line. The "0" command (zero) moves to the very first character of the line, and the <Home> -key does the same thing. In a picture: +key does the same thing. In a picture ("." indicates a space): ^ - <------------ + <-----------x .....This is a line with example text ~ - <----------------- ---------------> + <----------------x x--------------> 0 $ (the "....." indicates blanks here) diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 80c0592c7c..9505ac7909 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -327,9 +327,9 @@ Grouping is done with parentheses. No surprises here. Example: > :echo (10 + 5) * 2 < 30 ~ -Strings can be concatenated with ".". Example: > +Strings can be concatenated with ".." (see |expr6|). Example: > - :echo "foo" . "bar" + :echo "foo" .. "bar" < foobar ~ When the ":echo" command gets multiple arguments, it separates them with a @@ -496,9 +496,9 @@ So far the commands in the script were executed by Vim directly. The very powerful way to build commands and execute them. An example is to jump to a tag, which is contained in a variable: > - :execute "tag " . tag_name + :execute "tag " .. tag_name -The "." is used to concatenate the string "tag " with the value of variable +The ".." is used to concatenate the string "tag " with the value of variable "tag_name". Suppose "tag_name" has the value "get_cmd", then the command that will be executed is: > @@ -514,7 +514,7 @@ This jumps to the first line and formats all lines with the "=" operator. To make ":normal" work with an expression, combine ":execute" with it. Example: > - :execute "normal " . normal_commands + :execute "normal " .. normal_commands The variable "normal_commands" must contain the Normal mode commands. Make sure that the argument for ":normal" is a complete command. Otherwise @@ -531,12 +531,12 @@ If you don't want to execute a string but evaluate it to get its expression value, you can use the eval() function: > :let optname = "path" - :let optval = eval('&' . optname) + :let optval = eval('&' .. optname) A "&" character is prepended to "path", thus the argument to eval() is "&path". The result will then be the value of the 'path' option. The same thing can be done with: > - :exe 'let optval = &' . optname + :exe 'let optval = &' .. optname ============================================================================== *41.6* Using functions @@ -1136,7 +1136,7 @@ Example: > : let n = n + len(split(getline(lnum))) : let lnum = lnum + 1 : endwhile - : echo "found " . n . " words" + : echo "found " .. n .. " words" :endfunction You can call this function with: > @@ -1149,7 +1149,7 @@ It will be executed once and echo the number of words. range, with the cursor in that line. Example: > :function Number() - : echo "line " . line(".") . " contains: " . getline(".") + : echo "line " .. line(".") .. " contains: " .. getline(".") :endfunction If you call this function with: > @@ -1173,11 +1173,11 @@ so on. The variable "a:0" contains the number of extra arguments. :function Show(start, ...) : echohl Title - : echo "start is " . a:start + : echo "start is " .. a:start : echohl None : let index = 1 : while index <= a:0 - : echo " Arg " . index . " is " . a:{index} + : echo " Arg " .. index .. " is " .. a:{index} : let index = index + 1 : endwhile : echo "" @@ -1585,10 +1585,10 @@ Another useful mechanism is the ":finally" command: > :let tmp = tempname() :try - : exe ".,$write " . tmp - : exe "!filter " . tmp + : exe ".,$write " .. tmp + : exe "!filter " .. tmp : .,$delete - : exe "$read " . tmp + : exe "$read " .. tmp :finally : call delete(tmp) :endtry @@ -1939,8 +1939,8 @@ prepending it with "s:". We will define a function that adds a new typing correction: > 30 function s:Add(from, correct) - 31 let to = input("type the correction for " . a:from . ": ") - 32 exe ":iabbrev " . a:from . " " . to + 31 let to = input("type the correction for " .. a:from .. ": ") + 32 exe ":iabbrev " .. a:from .. " " .. to .. 36 endfunction @@ -2045,7 +2045,7 @@ a few lines to count the number of corrections: > 30 function s:Add(from, correct) .. 34 let s:count = s:count + 1 - 35 echo s:count . " corrections now" + 35 echo s:count .. " corrections now" 36 endfunction First s:count is initialized to 4 in the script itself. When later the @@ -2088,11 +2088,11 @@ Here is the resulting complete example: > 28 noremap <SID>Add :call <SID>Add(expand("<cword>"), 1)<CR> 29 30 function s:Add(from, correct) - 31 let to = input("type the correction for " . a:from . ": ") - 32 exe ":iabbrev " . a:from . " " . to + 31 let to = input("type the correction for " .. a:from .. ": ") + 32 exe ":iabbrev " .. a:from .. " " .. to 33 if a:correct | exe "normal viws\<C-R>\" \b\e" | endif 34 let s:count = s:count + 1 - 35 echo s:count . " corrections now" + 35 echo s:count .. " corrections now" 36 endfunction 37 38 if !exists(":Correct") @@ -2340,7 +2340,7 @@ should be undone. Set the b:undo_ftplugin variable to the commands that will undo the settings in your filetype plugin. Example: > let b:undo_ftplugin = "setlocal fo< com< tw< commentstring<" - \ . "| unlet b:match_ignorecase b:match_words b:match_skip" + \ .. "| unlet b:match_ignorecase b:match_words b:match_skip" Using ":setlocal" with "<" after the option name resets the option to its global value. That is mostly the best way to reset the option value. @@ -2461,17 +2461,17 @@ The following example shows how it's done: > map <F19> :call BufNetWrite('something')<CR> let s:did_load = 1 - exe 'au FuncUndefined BufNet* source ' . expand('<sfile>') + exe 'au FuncUndefined BufNet* source ' .. expand('<sfile>') finish endif function BufNetRead(...) - echo 'BufNetRead(' . string(a:000) . ')' + echo 'BufNetRead(' .. string(a:000) .. ')' " read functionality here endfunction function BufNetWrite(...) - echo 'BufNetWrite(' . string(a:000) . ')' + echo 'BufNetWrite(' .. string(a:000) .. ')' " write functionality here endfunction diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim index 2a961f8244..2b33bc81aa 100644 --- a/runtime/ftplugin/spec.vim +++ b/runtime/ftplugin/spec.vim @@ -183,12 +183,10 @@ if !exists("*s:ParseRpmVars") endif let varname = strpart(a:str, start+2, end-(start+2)) execute a:strline - let definestr = "^[ \t]*%(?:global|define)[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$" + let definestr = "^[ \t]*%\\(define\\|global\\)[ \t]\\+".varname."[ \t]\\+\\(.*\\)$" let linenum = search(definestr, "bW") - if (linenum != -1) - let ret = ret . substitute(getline(linenum), definestr, "\\1", "") - else - let ret = ret . strpart(str, start, end+1-start) + if (linenum != 0) + let ret = ret . substitute(getline(linenum), definestr, "\\2", "") endif endwhile return ret diff --git a/runtime/indent/json.vim b/runtime/indent/json.vim index b66a03d81b..c649e37013 100644 --- a/runtime/indent/json.vim +++ b/runtime/indent/json.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: JSON " Mantainer: Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json -" Last Change: 2017 Jun 13 +" Last Change: 2020 Aug 30 " https://github.com/jakar/vim-json/commit/20b650e22aa750c4ab6a66aa646bdd95d7cd548a#diff-e81fc111b2052e306d126bd9989f7b7c " Original Author: Rogerz Zhang <rogerz.zhang at gmail.com> http://github.com/rogerz/vim-json " Acknowledgement: Based off of vim-javascript maintained by Darrick Wiebe @@ -19,7 +19,7 @@ let b:did_indent = 1 setlocal nosmartindent " Now, set up our indentation expression and keys that trigger it. -setlocal indentexpr=GetJSONIndent() +setlocal indentexpr=GetJSONIndent(v:lnum) setlocal indentkeys=0{,0},0),0[,0],!^F,o,O,e " Only define the function once. @@ -86,26 +86,28 @@ endfunction " 3. GetJSONIndent Function {{{1 " ========================= -function GetJSONIndent() +function GetJSONIndent(...) " 3.1. Setup {{{2 " ---------- + " For the current line, use the first argument if given, else v:lnum + let clnum = a:0 ? a:1 : v:lnum - " Set up variables for restoring position in file. Could use v:lnum here. + " Set up variables for restoring position in file. Could use clnum here. let vcol = col('.') " 3.2. Work on the current line {{{2 " ----------------------------- " Get the current line. - let line = getline(v:lnum) + let line = getline(clnum) let ind = -1 " If we got a closing bracket on an empty line, find its match and indent " according to it. let col = matchend(line, '^\s*[]}]') - if col > 0 && !s:IsInString(v:lnum, col) - call cursor(v:lnum, col) + if col > 0 && !s:IsInString(clnum, col) + call cursor(clnum, col) let bs = strpart('{}[]', stridx('}]', line[col - 1]) * 2, 2) let pairstart = escape(bs[0], '[') @@ -122,14 +124,14 @@ function GetJSONIndent() endif " If we are in a multi-line string, don't do anything to it. - if s:IsInString(v:lnum, matchend(line, '^\s*') + 1) + if s:IsInString(clnum, matchend(line, '^\s*') + 1) return indent('.') endif " 3.3. Work on the previous line. {{{2 " ------------------------------- - let lnum = prevnonblank(v:lnum - 1) + let lnum = prevnonblank(clnum - 1) if lnum == 0 return 0 @@ -151,7 +153,7 @@ function GetJSONIndent() if counts[0] == '1' || counts[1] == '1' || counts[2] == '1' return ind + shiftwidth() else - call cursor(v:lnum, vcol) + call cursor(clnum, vcol) end endif diff --git a/runtime/keymap/french-azerty.vim b/runtime/keymap/french-azerty.vim new file mode 100644 index 0000000000..b0fd758e97 --- /dev/null +++ b/runtime/keymap/french-azerty.vim @@ -0,0 +1,81 @@ +" Vim Keymap file for French standard keyboard layout (without AltGr keys as +" they don't work reliably in all version of vim) + +" Maintainer: Yerlan Sergaziyev <yerlaser@outlook.com> +" Last Changed: 2020-07-18 + +scriptencoding utf-8 + +let b:keymap_name = "fr" + +loadkeymap +1 & ASCII AMPERSAND +2 é LATIN SMALL LETTER E WITH ACUTE +3 " ASCII DOUBLE QUOTES +4 ' ASCII SINGLE QUOTE +5 ( ASCII LEFT PARENTHESIS +6 - ASCII MINUS +7 è LATIN SMALL LETTER E WITH GRAVE +8 _ ASCII UNDERSCORE +9 ç LATIN SMALL LETTER C WITH CEDILLA +0 à LATIN SMALL LETTER A WITH GRAVE +- ) ASCII RIGHT PARENTHESIS +! 1 ASCII DIGIT 1 +@ 2 ASCII DIGIT 2 +# 3 ASCII DIGIT 3 +$ 4 ASCII DIGIT 4 +% 5 ASCII DIGIT 5 +^ 6 ASCII DIGIT 6 +& 7 ASCII DIGIT 7 +* 8 ASCII DIGIT 8 +( 9 ASCII DIGIT 9 +) 0 ASCII DIGIT 0 +_ ° DEGREE SIGN +q a LATIN SMALL LETTER A +a q LATIN SMALL LETTER Q +z w LATIN SMALL LETTER W +w z LATIN SMALL LETTER Z +Q A LATIN CAPITAL LETTER A +A Q LATIN CAPITAL LETTER Q +Z W LATIN CAPITAL LETTER W +W Z LATIN CAPITAL LETTER Z +[[ ^ ASCII CIRCUMFLEX +[q â LATIN SMALL LETTER A WITH CIRCUMFLEX +[e ê LATIN SMALL LETTER E WITH CIRCUMFLEX +[u û LATIN SMALL LETTER U WITH CIRCUMFLEX +[i î LATIN SMALL LETTER I WITH CIRCUMFLEX +[o ô LATIN SMALL LETTER O WITH CIRCUMFLEX +[Q Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX +[E Ê LATIN CAPITAL LETTER E WITH CIRCUMFLEX +[U Û LATIN CAPITAL LETTER U WITH CIRCUMFLEX +[I Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX +[O Ô LATIN CAPITAL LETTER O WITH CIRCUMFLEX +{{ ¨ UMLAUT +{q ä LATIN SMALL LETTER A WITH UMLAUT +{e ë LATIN SMALL LETTER E WITH UMLAUT +{y ÿ LATIN SMALL LETTER Y WITH UMLAUT +{u ü LATIN SMALL LETTER U WITH UMLAUT +{i ï LATIN SMALL LETTER I WITH UMLAUT +{o ö LATIN SMALL LETTER O WITH UMLAUT +{Q Ä LATIN CAPITAL LETTER A WITH UMLAUT +{E Ë LATIN CAPITAL LETTER E WITH UMLAUT +{Y Ÿ LATIN CAPITAL LETTER Y WITH UMLAUT +{U Ü LATIN CAPITAL LETTER U WITH UMLAUT +{I Ï LATIN CAPITAL LETTER I WITH UMLAUT +{O Ö LATIN CAPITAL LETTER O WITH UMLAUT +] $ ASCII GRAVE +} £ POUND SIGN +; m LATIN SMALL LETTER M +: M LATIN CAPITAL LETTER M +' ù LATIN SMALL LETTER U WITH GRAVE +\" % ASCII PERCENT +\\ * ASCII ASTERISK +| µ GREEK LETTER MU +m , ASCII COMMA +M ? ASCII QUESTION MARK +, ; ASCII SEMICOLON +< . ASCII DOT +. : ASCII COLON +> / ASCII SLASH +/ ! ASCII EXCLAMATION MARK +? § SECTION SIGN diff --git a/runtime/keymap/german-qwertz.vim b/runtime/keymap/german-qwertz.vim new file mode 100644 index 0000000000..c2ccb1bfe2 --- /dev/null +++ b/runtime/keymap/german-qwertz.vim @@ -0,0 +1,76 @@ +" Vim Keymap file for German standard keyboard layout (without AltGr keys as +" they don't work reliably in all version of vim) + +" Maintainer: Yerlan Sergaziyev <yerlaser@outlook.com> +" Last Changed: 2020-07-18 + +scriptencoding utf-8 + +let b:keymap_name = "de" + +loadkeymap +`` ^ ASCII CIRCUMFLEX +`e ê LATIN SMALL LETTER E WITH CIRCUMFLEX +`u û LATIN SMALL LETTER U WITH CIRCUMFLEX +`i î LATIN SMALL LETTER I WITH CIRCUMFLEX +`o ô LATIN SMALL LETTER O WITH CIRCUMFLEX +`a â LATIN SMALL LETTER A WITH CIRCUMFLEX +`E Ê LATIN CAPITAL LETTER E WITH CIRCUMFLEX +`U Û LATIN CAPITAL LETTER U WITH CIRCUMFLEX +`I Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX +`O Ô LATIN CAPITAL LETTER O WITH CIRCUMFLEX +`A Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX +- ß LATIN SMALL LETTER SZ +== ´ ASCII ACUTE ACCENT +=e é LATIN SMALL LETTER E WITH ACUTE +=u ú LATIN SMALL LETTER U WITH ACUTE +=i í LATIN SMALL LETTER I WITH ACUTE +=o ó LATIN SMALL LETTER O WITH ACUTE +=a á LATIN SMALL LETTER A WITH ACUTE +=z ý LATIN SMALL LETTER Y WITH ACUTE +=E É LATIN CAPITAL LETTER E WITH ACUTE +=U Ú LATIN CAPITAL LETTER U WITH ACUTE +=I Í LATIN CAPITAL LETTER I WITH ACUTE +=O Ó LATIN CAPITAL LETTER O WITH ACUTE +=A Á LATIN CAPITAL LETTER A WITH ACUTE +=Z Ý LATIN CAPITAL LETTER Y WITH ACUTE +=S ẞ LATIN CAPITAL LETTER SZ +++ ` ASCII GRAVE ++e è LATIN SMALL LETTER E WITH GRAVE ++u ù LATIN SMALL LETTER U WITH GRAVE ++i ì LATIN SMALL LETTER I WITH GRAVE ++o ò LATIN SMALL LETTER O WITH GRAVE ++a à LATIN SMALL LETTER A WITH GRAVE ++E È LATIN CAPITAL LETTER E WITH GRAVE ++U Ù LATIN CAPITAL LETTER U WITH GRAVE ++I Ì LATIN CAPITAL LETTER I WITH GRAVE ++O Ò LATIN CAPITAL LETTER O WITH GRAVE ++A À LATIN CAPITAL LETTER A WITH GRAVE +y z LATIN SMALL LETTER Z +[ ü LATIN SMALL LETTER U WITH UMLAUT +] + ASCII PLUS +\\ # ASCII NUMBER SIGN +; ö LATIN SMALL LETTER O WITH UMLAUT +' ä LATIN SMALL LETTER A WITH UMLAUT +z y LATIN SMALL LETTER Y +/ - ASCII MINUS +~ ° DEGREE SIGN +@ " ASCII DOUBLE QUOTES +# § SECTION SIGN +^ & ASCII AMPERSAND +& / ASCII SLASH +* ( ASCII LEFT PARENTHESIS +( ) ASCII RIGHT PARENTHESIS +) = ASCII EQUAL SIGN +_ ? ASCII QUESTION MARK ++ ` ASCII GRAVE +Y Z LATIN CAPITAL LETTER Z +{ Ü LATIN CAPITAL LETTER U WITH UMLAUT +} * ASCII ASTERISK +| ' ASCII SINGLE QUOTE +: Ö LATIN CAPITAL LETTER O WITH UMLAUT +\" Ä LATIN CAPITAL LETTER A WITH UMLAUT +Z Y LATIN CAPITAL LETTER Y +< ; ASCII SEMICOLON +> : ASCII COLON +? _ ASCII UNDERSCORE diff --git a/runtime/keymap/turkish-f.vim b/runtime/keymap/turkish-f.vim index 95472cf0b2..f03c5eb3e2 100644 --- a/runtime/keymap/turkish-f.vim +++ b/runtime/keymap/turkish-f.vim @@ -110,3 +110,4 @@ n z LATIN SMALL LETTER Z ˙ ₺ TURKISH LIRA SIGN ¬ £ POUND SIGN … ¥ YEN SIGN +« ` GRAVE ACCENT diff --git a/src/nvim/po/tr.po b/src/nvim/po/tr.po index 30b4e8ce6b..bf3386d025 100644 --- a/src/nvim/po/tr.po +++ b/src/nvim/po/tr.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Vim Turkish Localization Project\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-22 22:11+0300\n" -"PO-Revision-Date: 2020-08-22 22:50+0300\n" +"Report-Msgid-Bugs-To: Emir SARI <bitigchi@me.com>\n" +"POT-Creation-Date: 2020-09-04 18:43+0300\n" +"PO-Revision-Date: 2020-09-04 21:30+0300\n" "Last-Translator: Emir SARI <bitigchi@me.com>\n" "Language-Team: Turkish <https://github.com/bitigchi/vim>\n" "Language: tr\n" @@ -176,14 +176,15 @@ msgstr "E88: İlk arabellekten öncesine gidilemez" #, c-format msgid "E89: No write since last change for buffer %d (add ! to override)" msgstr "" -"E89: %d numaralı arabellek son değişiklikten sonra yazılmadı (geçersiz kılmak " -"için ! ekleyin)" +"E89: %d numaralı arabellek son değişiklikten sonra yazılmadı (geçersiz " +"kılmak için ! ekleyin)" msgid "E948: Job still running (add ! to end the job)" msgstr "E948: İş hâlâ sürüyor (bitirmek için ! ekleyin)" msgid "E37: No write since last change (add ! to override)" -msgstr "E37: Son değişiklikten sonra yazılmadı (geçersiz kılmak için ! ekleyin)" +msgstr "" +"E37: Son değişiklikten sonra yazılmadı (geçersiz kılmak için ! ekleyin)" msgid "E948: Job still running" msgstr "E948: İş hâlâ sürüyor" @@ -1127,15 +1128,15 @@ msgstr "Geriye dönük erim verildi, takas edilebilir" msgid "E494: Use w or w>>" msgstr "E494: w veya w>> kullanın" +msgid "E943: Command table needs to be updated, run 'make cmdidxs'" +msgstr "" +"E943: Komut tablosunun güncellenmesi gerekiyor, 'make cmdidxs' çalıştırın" + msgid "" "INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX" msgstr "" "DAHİLİ: EX_DFLALL; ADDR_NONE, ADDR_UNSIGNED veya ADDR_QUICKFIX ile birlikte " -"kullanılamıyor" - -msgid "E943: Command table needs to be updated, run 'make cmdidxs'" -msgstr "" -"E943: Komut tablosunun güncellenmesi gerekiyor, 'make cmdidxs' çalıştırın" +"kullanılamaz" msgid "E319: Sorry, the command is not available in this version" msgstr "E319: Üzgünüm, komut bu sürümde mevcut değil" @@ -1186,8 +1187,8 @@ msgstr "Dosya iliştir" msgid "E747: Cannot change directory, buffer is modified (add ! to override)" msgstr "" -"E747: Dizin değiştirilemiyor, arabellek değiştirilmiş (geçersiz kılmak için ! " -"ekleyin)" +"E747: Dizin değiştirilemiyor, arabellek değiştirilmiş (geçersiz kılmak " +"için ! ekleyin)" msgid "E186: No previous directory" msgstr "E186: Öncesinde dizin yok" @@ -1533,10 +1534,10 @@ msgid "E321: Could not reload \"%s\"" msgstr "E321: \"%s\" yeniden yüklenemedi" msgid "E219: Missing {." -msgstr "E219: Eksik {." +msgstr "E219: { eksik." msgid "E220: Missing }." -msgstr "E220: Eksik }." +msgstr "E220: } eksik." msgid "<empty>" msgstr "<boş>" @@ -1823,7 +1824,7 @@ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version." msgstr "E243: \"-%s\" değişkeni desteklenmiyor; OLE sürümünü kullanın." msgid "E988: GUI cannot be used. Cannot execute gvim.exe." -msgstr "E988: Grafik arabirim kullanılamıyor. gvim.exe çalıştırılamadı." +msgstr "E988: Grafik arabirim kullanılamaz. gvim.exe çalıştırılamadı." msgid "E672: Unable to open window inside MDI application" msgstr "E672: MDI uygulaması içinde pencere açılamıyor" @@ -1917,7 +1918,7 @@ msgid "Size:" msgstr "Büyüklük:" msgid "E550: Missing colon" -msgstr "E550: Eksik iki nokta" +msgstr "E550: İki nokta eksik" msgid "E551: Illegal component" msgstr "E551: Geçersiz bileşen" @@ -2606,7 +2607,7 @@ msgstr "flatten() değişkeni" #, c-format msgid "E696: Missing comma in List: %s" -msgstr "E696: Listede eksik virgül: %s" +msgstr "E696: Listede virgül eksik: %s" msgid "sort() argument" msgstr "sort() değişkeni" @@ -2672,7 +2673,7 @@ msgid "netbeans is not supported with this GUI\n" msgstr "NetBeans bu grafik arabirimde desteklenmiyor\n" msgid "'-nb' cannot be used: not enabled at compile time\n" -msgstr "'-nb' kullanılamıyor: derleme sırasında etkinleştirilmemiş\n" +msgstr "'-nb' kullanılamaz: Derleme sırasında etkinleştirilmemiş\n" msgid "This Vim was not compiled with the diff feature." msgstr "Bu Vim karşılaştırma özelliği ile derlenmemiş" @@ -3773,7 +3774,7 @@ msgid "Calling shell to execute: \"%s\"" msgstr "Çalıştırmak için çağrılan kabuk: \"%s\"" msgid "E545: Missing colon" -msgstr "E545: Eksik iki nokta" +msgstr "E545: İki nokta eksik" msgid "E546: Illegal mode" msgstr "E546: İzin verilmeyen kip" @@ -4021,17 +4022,17 @@ msgid "E950: Cannot convert between %s and %s" msgstr "E950: %s ve %s arasında dönüştürme yapılamıyor" msgid "E524: Missing colon" -msgstr "E524: Eksik iki nokta" +msgstr "E524: İki nokta eksik" msgid "E525: Zero length string" msgstr "E525: Sıfır uzunlukta dizi" #, c-format msgid "E526: Missing number after <%s>" -msgstr "E526: <%s> sonrasında eksik sayı" +msgstr "E526: <%s> sonrasında sayı eksik" msgid "E527: Missing comma" -msgstr "E527: Eksik virgül" +msgstr "E527: Virgül eksik" msgid "E528: Must specify a ' value" msgstr "E528: Bir ' değeri belirtmeli" @@ -4328,7 +4329,7 @@ msgid "E373: Unexpected %%%c in format string" msgstr "E373: Biçimlendirme dizisinde beklenmeyen %%%c" msgid "E374: Missing ] in format string" -msgstr "E374: Biçimlendirme dizisinde eksik ]" +msgstr "E374: Biçimlendirme dizisinde ] eksik" #, c-format msgid "E375: Unsupported %%%c in format string" @@ -4403,7 +4404,7 @@ msgstr "E369: %s%%[] içinde geçersiz öge" #, c-format msgid "E769: Missing ] after %s[" -msgstr "E769: %s[ sonrasında eksik ]" +msgstr "E769: %s[ sonrasında ] eksik" msgid "E944: Reverse range in character class" msgstr "E944: Karakter sınıfında geriye dönük erim" @@ -4431,14 +4432,14 @@ msgstr "E67: \\z1 - \\z9'a burada izin verilmiyor" #, c-format msgid "E69: Missing ] after %s%%[" -msgstr "E69: %s%%[ sonrasında eksik ]" +msgstr "E69: %s%%[ sonrasında ] eksik" #, c-format msgid "E70: Empty %s%%[]" msgstr "E70: Boş %s%%[]" msgid "E956: Cannot use pattern recursively" -msgstr "E956: Dizgi özyineli olarak kullanılamıyor" +msgstr "E956: Dizgi özyineli olarak kullanılamaz" #, c-format msgid "E654: missing delimiter after search pattern: %s" @@ -4848,7 +4849,7 @@ msgid "E885: Not possible to change sign %s" msgstr "E885: %s işaretini değiştirmek olanaklı değil" msgid "E159: Missing sign number" -msgstr "E159: Eksik işaret numarası" +msgstr "E159: İşaret numarası eksik" #, c-format msgid "E157: Invalid sign ID: %d" @@ -4862,7 +4863,7 @@ msgid "E160: Unknown sign command: %s" msgstr "E160: Bilinmeyen işaret komutu: %s" msgid "E156: Missing sign name" -msgstr "E156: Eksik işaret adı" +msgstr "E156: İşaret adı eksik" msgid " (NOT FOUND)" msgstr " (BULUNAMADI)" @@ -5047,7 +5048,7 @@ msgstr "%s içinde %d. satırda yinelenen veya tanınmayan öge: %s" #, c-format msgid "Missing FOL/LOW/UPP line in %s" -msgstr "%s içinde eksik FOL/LOW/UPP satırı" +msgstr "%s içinde FOL/LOW/UPP satırı eksik" msgid "COMPOUNDSYLMAX used without SYLLABLE" msgstr "COMPOUNDSYLMAX, SYLLABLE olmadan kullanılmış" @@ -5063,7 +5064,7 @@ msgstr "Çok fazla ertelenen önek ve/veya bileşik bayrak" #, c-format msgid "Missing SOFO%s line in %s" -msgstr "%s içinde eksik SOFO%s satırı" +msgstr "%s içinde SOFO%s satırı eksik" #, c-format msgid "Both SAL and SOFO lines in %s" @@ -5155,7 +5156,7 @@ msgstr "E845: Yetersiz bellek, sözcük listesi tam olmayacak" #, c-format msgid "Compressed %s: %ld of %ld nodes; %ld (%ld%%) remaining" -msgstr "%s sıkıştırılıyor: %ld/%ld uç sıkıştırıldı; %ld (%ld%%) kalan" +msgstr "%s sıkıştırılıyor: %ld/%ld uç sıkıştırıldı; %ld (%%%ld) kalan" msgid "Reading back spell file..." msgstr "Yazım dosyası yeniden okunuyor..." @@ -5350,7 +5351,7 @@ msgstr "E847: Çok fazla sözdizim kuralı" #, c-format msgid "E789: Missing ']': %s" -msgstr "E789: Eksik ']': %s" +msgstr "E789: ']' eksik: %s" #, c-format msgid "E890: trailing char after ']': %s]%s" @@ -5358,7 +5359,7 @@ msgstr "E890: ']' sonrası fazladan karakter: %s]%s" #, c-format msgid "E398: Missing '=': %s" -msgstr "E398: Eksik '=': %s" +msgstr "E398: '=' eksik: %s" #, c-format msgid "E399: Not enough arguments: syntax region %s" @@ -5387,7 +5388,7 @@ msgstr "E404: İzin verilmeyen değişkenler: %s" #, c-format msgid "E405: Missing equal sign: %s" -msgstr "E405: Eksik eşittir imi: %s" +msgstr "E405: Eşittir imi eksik: %s" #, c-format msgid "E406: Empty argument: %s" @@ -5724,11 +5725,11 @@ msgstr "" #, c-format msgid "E114: Missing quote: %s" -msgstr "E114: Eksik alıntı: %s" +msgstr "E114: Tırnak imi eksik: %s" #, c-format msgid "E115: Missing quote: %s" -msgstr "E115: Eksik alıntı: %s" +msgstr "E115: Tırnak imi eksik: %s" msgid "new shell started\n" msgstr "yeni kabuk başlatıldı\n" @@ -5805,7 +5806,7 @@ msgid "E824: Incompatible undo file: %s" msgstr "E824: Uyumsuz geri al dosyası: %s" msgid "File contents changed, cannot use undo info" -msgstr "Dosya içeriği değişmiş, geri alma bilgisi kullanılamıyor" +msgstr "Dosya içeriği değişmiş, geri alma bilgisi kullanılamaz" #, c-format msgid "Finished reading undo file %s" @@ -5987,7 +5988,7 @@ msgstr "E699: Çok fazla değişken" #, c-format msgid "E276: Cannot use function as a method: %s" -msgstr "E276: İşlev bir yöntem olarak kullanılamıyor: %s" +msgstr "E276: İşlev bir yöntem olarak kullanılamaz: %s" #, c-format msgid "E120: Using <SID> not in a script context: %s" @@ -6468,7 +6469,7 @@ msgstr "" "# Atlama listesi (önce en yeniler):\n" msgid "Missing '>'" -msgstr "Eksik '>'" +msgstr "'>' eksik" msgid "Illegal starting char" msgstr "İzin verilmeyen başlangıç karakteri" @@ -6599,6 +6600,412 @@ msgstr "gvimext.dll hatası" msgid "Path length too long!" msgstr "Yol çok uzun!" +#, c-format +msgid "E121: Undefined variable: %s" +msgstr "E121: Tanımlanmamış değişken: %s" + +#, c-format +msgid "E121: Undefined variable: %c:%s" +msgstr "E121: Tanımlanmamış değişken: %c:%s" + +msgid "E476: Invalid command" +msgstr "E476: Geçersiz komut" + +#, c-format +msgid "E476: Invalid command: %s" +msgstr "E476: Geçersiz komut: %s" + +msgid "E719: cannot slice a Dictionary" +msgstr "E719: Bir Sözlük dilimlenemiyor" + +msgid "E909: Cannot index a special variable" +msgstr "E909: Özel bir değişken dizinlenemiyor" + +#, c-format +msgid "E1100: Missing :let: %s" +msgstr "E1100: :let eksik: %s" + +#, c-format +msgid "E1001: variable not found: %s" +msgstr "E1001: Değişken bulunamadı: %s" + +#, c-format +msgid "E1002: Syntax error at %s" +msgstr "E1002: %s konumunda sözdizim hatası" + +msgid "E1003: Missing return value" +msgstr "E1003: Dönüş değeri eksik" + +#, c-format +msgid "E1004: white space required before and after '%s'" +msgstr "E1004: '%s' öncesinde ve sonrasında boşluk gerekiyor" + +msgid "E1005: Too many argument types" +msgstr "E1005: Çok fazla değişken türü" + +#, c-format +msgid "E1006: %s is used as an argument" +msgstr "E1006: %s bir değişken olarak kullanılıyor" + +msgid "E1007: mandatory argument after optional argument" +msgstr "E1007: İsteğe bağlı değişken sonrasında zorunlu değişken" + +msgid "E1008: Missing <type>" +msgstr "E1008: <tür> eksik" + +msgid "E1009: Missing > after type" +msgstr "E1009: Tür sonrasında > eksik" + +#, c-format +msgid "E1010: Type not recognized: %s" +msgstr "E1010: Tür tanımlanamadı: %s" + +#, c-format +msgid "E1011: name too long: %s" +msgstr "E1011: Ad çok uzun: %s" + +#, c-format +msgid "E1012: type mismatch, expected %s but got %s" +msgstr "E1012: Tür uyumsuzluğu, %s bekleniyordu, ancak %s alındı" + +#, c-format +msgid "E1013: argument %d: type mismatch, expected %s but got %s" +msgstr "E1013: %d değişkeni: Tür uyumsuzluğu, %s bekleniyordu, ancak %s alındı" + +#, c-format +msgid "E1014: Invalid key: %s" +msgstr "E1014: Geçersiz anahtar: %s" + +#, c-format +msgid "E1015: Name expected: %s" +msgstr "E1015: Ad bekleniyordu: %s" + +#, c-format +msgid "E1016: Cannot declare a %s variable: %s" +msgstr "E1016: Bir %s değişkeni tanımlanamıyor: %s" + +#, c-format +msgid "E1016: Cannot declare an environment variable: %s" +msgstr "E1016: Bir ortam değişkeni tanımlanamıyor: %s" + +#, c-format +msgid "E1017: Variable already declared: %s" +msgstr "E1017: Değişken halihazırda tanımlanmış: %s" + +#, c-format +msgid "E1018: Cannot assign to a constant: %s" +msgstr "E1018: Bir sabite atanamıyor: %s" + +msgid "E1019: Can only concatenate to string" +msgstr "E1019: Yalnızca bir diziye birleştirilebilir" + +#, c-format +msgid "E1020: cannot use an operator on a new variable: %s" +msgstr "E1020: Yeni bir değişken üzerinde bir işleç kullanılamaz: %s" + +msgid "E1021: const requires a value" +msgstr "E1021: Sabit, bir değer gerektiriyor" + +msgid "E1022: type or initialization required" +msgstr "E1022: Tür veya ilklendirme gerekiyor" + +#, c-format +msgid "E1023: Using a Number as a Bool: %d" +msgstr "E1023: Bir Sayı, bir Bool yerine kullanılıyor: %d" + +msgid "E1024: Using a Number as a String" +msgstr "E1024: Bir Sayı, bir Dizi yerine kullanılıyor" + +msgid "E1025: using } outside of a block scope" +msgstr "E1025: } bir blok kapsamı dışında kullanılıyor" + +msgid "E1026: Missing }" +msgstr "E1026: } eksik" + +msgid "E1027: Missing return statement" +msgstr "E1027: Dönüş ifadesi eksik" + +msgid "E1028: compile_def_function failed" +msgstr "E1028: compile_def_function başarısız" + +#, c-format +msgid "E1029: Expected %s but got %s" +msgstr "E1029: %s bekleniyordu ancak %s alındı" + +msgid "E1030: Using a String as a Number" +msgstr "E1030: Bir Dizi, bir Sayı yerine kullanılıyor" + +msgid "E1031: Cannot use void value" +msgstr "E1031: Boş değer kullanılamaz" + +msgid "E1032: missing :catch or :finally" +msgstr "E1032: :catch veya :finally eksik" + +msgid "E1033: catch unreachable after catch-all" +msgstr "E1033: catch-all sonrası catch ulaşılamıyor" + +#, c-format +msgid "E1034: Cannot use reserved name %s" +msgstr "E1034: Ayrılmış ad %s kullanılamaz" + +msgid "E1035: % requires number arguments" +msgstr "E1035: %, sayı değişkenler gerektiriyor" + +#, c-format +msgid "E1036: %c requires number or float arguments" +msgstr "E1036: %c, sayı veya kayan noktalı değer değişkenler gerektiriyor" + +#, c-format +msgid "E1037: Cannot use \"%s\" with %s" +msgstr "E1037: \"%s\", %s ile birlikte kullanılamaz" + +msgid "E1038: vim9script can only be used in a script" +msgstr "E1038: vim9script yalnızca bir betikte kullanılabilir" + +msgid "E1039: vim9script must be the first command in a script" +msgstr "E1039: vim9script bir betikteki ilk komut olmalıdır" + +msgid "E1040: Cannot use :scriptversion after :vim9script" +msgstr "E1040: :vim9script sonrası :scriptversion kullanılamaz" + +#, c-format +msgid "E1041: Redefining script item %s" +msgstr "E1041: Betik ögesi %s yeniden tanımlanıyor" + +msgid "E1042: export can only be used in vim9script" +msgstr "E1042: Dışa aktarma yalnızca vim9script içinde kullanılabilir" + +msgid "E1043: Invalid command after :export" +msgstr "E1043: :export sonrası geçersiz komut" + +msgid "E1044: export with invalid argument" +msgstr "E1044: Geçersiz değişkenle dışa aktarım" + +msgid "E1045: Missing \"as\" after *" +msgstr "E1045: * sonrası \"as\" eksik" + +msgid "E1046: Missing comma in import" +msgstr "E1046: İçe aktarımda virgül eksik" + +msgid "E1047: syntax error in import" +msgstr "E1047: İçe aktarımda sözdizim hatası" + +#, c-format +msgid "E1048: Item not found in script: %s" +msgstr "E1048: Betikte öge bulunamadı: %s" + +#, c-format +msgid "E1049: Item not exported in script: %s" +msgstr "E1049: Betikte öge dışa aktarılmadı: %s" + +msgid "E1050: Colon required before a range" +msgstr "E1050: Bir erim öncesi iki nokta gerekiyor" + +msgid "E1051: wrong argument type for +" +msgstr "E1051: + için hatalı değişken türü" + +#, c-format +msgid "E1052: Cannot declare an option: %s" +msgstr "E1052: Bir seçenek tanımlanamıyor: %s" + +#, c-format +msgid "E1053: Could not import \"%s\"" +msgstr "E1053: \"%s\" içe aktarılamadı" + +#, c-format +msgid "E1054: Variable already declared in the script: %s" +msgstr "E1054: Betikte değişken halihazırda tanımlanmış: %s" + +msgid "E1055: Missing name after ..." +msgstr "E1055: ... sonraki ad eksik" + +#, c-format +msgid "E1056: expected a type: %s" +msgstr "E1056: Bir tür bekleniyordu: %s" + +msgid "E1057: Missing :enddef" +msgstr "E1057: :enddef eksik" + +msgid "E1058: function nesting too deep" +msgstr "E1058: İşlev çok iç içe geçmiş" + +#, c-format +msgid "E1059: No white space allowed before colon: %s" +msgstr "E1059: İki nokta öncesinde boşluğa izin verilmiyor: %s" + +#, c-format +msgid "E1060: expected dot after name: %s" +msgstr "E1060: Ad sonrası nokta bekleniyordu: %s" + +#, c-format +msgid "E1061: Cannot find function %s" +msgstr "E1061: %s işlevi bulunamıyor" + +msgid "E1062: Cannot index a Number" +msgstr "E1062: Bir Sayı dizinlenemiyor" + +msgid "E1063: type mismatch for v: variable" +msgstr "E1063: v: değişkeni için tür uyumsuzluğu" + +#, c-format +msgid "E1066: Cannot declare a register: %s" +msgstr "E1066: Bir yazmaç tanımlanamıyor: %s" + +#, c-format +msgid "E1067: Separator mismatch: %s" +msgstr "E1067: Ayırıcı uyumsuzluğu: %s" + +#, c-format +msgid "E1068: No white space allowed before '%s'" +msgstr "E1068: '%s' önce boşluğa izin verilmiyor" + +#, c-format +msgid "E1069: white space required after '%s'" +msgstr "E1069: '%s' sonrası boşluğa izin verilmiyor" + +msgid "E1070: Missing \"from\"" +msgstr "E1070: \"from\" eksik" + +msgid "E1071: Invalid string after \"from\"" +msgstr "E1071: \"from\" sonrası geçersiz dizi" + +#, c-format +msgid "E1072: Cannot compare %s with %s" +msgstr "E1072: %s, %s ile karşılaştırılamıyor" + +#, c-format +msgid "E1073: name already defined: %s" +msgstr "E1073: Ad halihazırda tanımlanmış: %s" + +msgid "E1074: no white space allowed after dot" +msgstr "E1074: Nokta sonrası boşluğa izin verilmiyor" + +#, c-format +msgid "E1075: Namespace not supported: %s" +msgstr "E1075: Ad alanı desteklenmiyor: %s" + +msgid "E1076: This Vim is not compiled with float support" +msgstr "E1076: Bu Vim kayan noktalı değer desteği ile derlenmemiş" + +#, c-format +msgid "E1077: Missing argument type for %s" +msgstr "E1077: %s için değişken türü eksik" + +#, c-format +msgid "E1081: Cannot unlet %s" +msgstr "E1081: %s sabitten değişkene çevrilemiyor" + +#, c-format +msgid "E1082: Cannot use a namespaced variable: %s" +msgstr "E1082: Ad alanına alınmış bir değişken kullanılamaz: %s" + +msgid "E1083: missing backtick" +msgstr "E1083: Ters eğik kesme imi eksik" + +#, c-format +msgid "E1084: Cannot delete Vim9 script function %s" +msgstr "E1084: Vim9 betik işlevi %s silinemiyor" + +#, c-format +msgid "E1085: Not a callable type: %s" +msgstr "E1085: Çağrılabilir bir tür değil: %s" + +msgid "E1086: Cannot use :function inside :def" +msgstr "E1086: :def içinde :function kullanılamaz" + +msgid "E1087: cannot use an index when declaring a variable" +msgstr "E1087: Bir değişken tanımlarken bir indeks kullanılamaz" + +#, c-format +msgid "E1089: unknown variable: %s" +msgstr "E1089: Bilinmeyen değişken: %s" + +#, c-format +msgid "E1090: Cannot assign to argument %s" +msgstr "E1090: %s değişkenine atanamıyor" + +#, c-format +msgid "E1091: Function is not compiled: %s" +msgstr "E1091: İşlev derlenmemiş: %s" + +msgid "E1092: Cannot use a list for a declaration" +msgstr "E1092: Tanımlama için bir liste kullanılamaz" + +#, c-format +msgid "E1093: Expected %d items but got %d" +msgstr "E1093: %d öge bekleniyordu, ancak %d alındı" + +msgid "E1094: import can only be used in a script" +msgstr "E1094: İçe aktarım yalnızca bir betikte kullanılabilir" + +msgid "E1095: Unreachable code after :return" +msgstr "E1095: :return sonrası ulaşılamayan kod" + +msgid "E1096: Returning a value in a function without a return type" +msgstr "E1096: Dönüş türü olmayan bir işlevde bir değer döndürülüyor" + +msgid "E1097: line incomplete" +msgstr "E1097: Satır tamamlanmamış" + +#, c-format +msgid "E1099: Unknown error while executing %s" +msgstr "E1099: %s çalıştırılırken bilinmeyen hata" + +#, c-format +msgid "E1101: Cannot declare a script variable in a function: %s" +msgstr "E1101: Bir işlevde bir betik değişkeni tanımlanamıyor: %s" + +#, c-format +msgid "E1102: lambda function not found: %s" +msgstr "E1102: Lambda işlevi bulunamadı: %s" + +msgid "E1103: Dictionary not set" +msgstr "E1103: Sözlük ayarlanmamış" + +msgid "E1104: Missing >" +msgstr "E1104: > eksik" + +#, c-format +msgid "E1105: Cannot convert %s to string" +msgstr "E1105: %s bir diziye dönüştürülemiyor" + +msgid "E1106: one argument too many" +msgstr "E1106: Bir değişken fazladan" + +#, c-format +msgid "E1106: %d arguments too many" +msgstr "E1106: %d değişken fazladan" + +msgid "E1107: String, List, Dict or Blob required" +msgstr "E1107: Dizi, Liste, Sözlük veya İkili Nesne gerekiyor" + +#, c-format +msgid "E1108: Item not found: %s" +msgstr "E1108: Öge bulunamadı: %s" + +#, c-format +msgid "E1109: List item %d is not a List" +msgstr "E1109: Liste ögesi %d bir Liste değil" + +#, c-format +msgid "E1110: List item %d does not contain 3 numbers" +msgstr "E1110: Liste ögesi %d 3 sayı içermiyor" + +#, c-format +msgid "E1111: List item %d range invalid" +msgstr "E1111: Liste ögesi %d erimi geçersiz" + +#, c-format +msgid "E1112: List item %d cell width invalid" +msgstr "E1112: Liste ögesi %d hücre genişliği geçersiz" + +#, c-format +msgid "E1113: Overlapping ranges for 0x%lx" +msgstr "E1113: 0x%lx için üst üste binen erimler" + +msgid "E1114: Only values of 0x100 and higher supported" +msgstr "E1114: Yalnızca 0x100 ve daha yüksek değerler destekleniyor" + msgid "--No lines in buffer--" msgstr "--Arabellek içinde satır yok--" @@ -6620,7 +7027,7 @@ msgstr "" "verilmiyor" msgid "E171: Missing :endif" -msgstr "E171: Eksik :endif" +msgstr "E171: :endif eksik" msgid "E603: :catch without :try" msgstr "E603: :try olmadan :catch" @@ -6632,16 +7039,16 @@ msgid "E607: multiple :finally" msgstr "E607: Birden fazla :finally" msgid "E600: Missing :endtry" -msgstr "E600: Eksik :endtry" +msgstr "E600: :endtry eksik" msgid "E602: :endtry without :try" msgstr "E602: :try olmadan :endtry" msgid "E170: Missing :endwhile" -msgstr "E170: Eksik :endwhile" +msgstr "E170: :endwhile eksik" msgid "E170: Missing :endfor" -msgstr "E170: Eksik :endfor" +msgstr "E170: :endfor eksik" msgid "E588: :endwhile without :while" msgstr "E588: :while olmadan :endwhile" @@ -6743,16 +7150,16 @@ msgid "E477: No ! allowed" msgstr "E477: ! imine izin verilmiyor" msgid "E25: GUI cannot be used: Not enabled at compile time" -msgstr "E25: Grafik arabirim kullanılamıyor: Derlenirken etkinleştirilmemiş" +msgstr "E25: Grafik arabirim kullanılamaz: Derlenirken etkinleştirilmemiş" msgid "E26: Hebrew cannot be used: Not enabled at compile time\n" -msgstr "E26: İbranca kullanılamıyor: Derlenirken etkinleştirilmemiş\n" +msgstr "E26: İbranca kullanılamaz: Derlenirken etkinleştirilmemiş\n" msgid "E27: Farsi support has been removed\n" msgstr "E27: Farsça desteği kaldırıldı\n" msgid "E800: Arabic cannot be used: Not enabled at compile time\n" -msgstr "E800: Arapça kullanılamıyor: Derlenirken etkinleştirilmemiş\n" +msgstr "E800: Arapça kullanılamaz: Derlenirken etkinleştirilmemiş\n" #, c-format msgid "E28: No such highlight group name: %s" @@ -6878,7 +7285,7 @@ msgid "E928: String required" msgstr "E928: Dizi gerekiyor" msgid "E713: Cannot use empty key for Dictionary" -msgstr "E713: Sözlük için boş anahtar kullanılamıyor" +msgstr "E713: Sözlük için boş anahtar kullanılamaz" msgid "E715: Dictionary required" msgstr "E715: Sözlük gerekiyor" @@ -7027,14 +7434,14 @@ msgstr "E81: <SID> bir betik bağlamında kullanılmıyor" #, c-format msgid "E107: Missing parentheses: %s" -msgstr "E107: Eksik ayraç: %s" +msgstr "E107: Ayraç eksik: %s" msgid "E110: Missing ')'" msgstr "E110: ')' eksik" #, c-format msgid "E720: Missing colon in Dictionary: %s" -msgstr "E720: Sözlükte eksik iki nokta: %s" +msgstr "E720: Sözlükte iki nokta eksik: %s" #, c-format msgid "E721: Duplicate key in Dictionary: \"%s\"" @@ -7042,11 +7449,11 @@ msgstr "E721: Sözlükte yinelenmiş anahtar: \"%s\"" #, c-format msgid "E722: Missing comma in Dictionary: %s" -msgstr "E722: Sözlükte eksik virgül: %s" +msgstr "E722: Sözlükte virgül eksik: %s" #, c-format msgid "E723: Missing end of Dictionary '}': %s" -msgstr "E723: '}' sözlük sonu eksik: %s" +msgstr "E723: Sözlük sonu '}' eksik: %s" msgid "E449: Invalid expression received" msgstr "E449: Geçersiz ifade alındı" @@ -7114,7 +7521,7 @@ msgid "E117: Unknown function: %s" msgstr "E117: Bilinmeyen işlev: %s" msgid "E111: Missing ']'" -msgstr "E111: Eksik ']'" +msgstr "E111: ']' eksik" msgid "E581: :else without :if" msgstr "E581: :if olmadan :else" @@ -7470,3 +7877,31 @@ msgstr "Metin;düzenleyici;" msgid "Vim" msgstr "Vim" + +msgid "" +"\" Each \"set\" line shows the current value of an option (on the left)." +msgstr "" +"\" Her \"set\" satırı bir seçeneğin geçerli değerini gösterir (solda)." + +msgid "\" Hit <Enter> on a \"set\" line to execute it." +msgstr "\" Değiştirmek için bir \"set\" satırında <Enter>'a basın." + +msgid "\" A boolean option will be toggled." +msgstr "\" Bir Boole değeri işletilecektir." + +msgid "" +"\" For other options you can edit the value before hitting " +"<Enter>." +msgstr "" +"\" Diğer seçenekler için <Enter>'a basmadan önce değeri düzenleyebilirsiniz." + +msgid "\" Hit <Enter> on a help line to open a help window on this option." +msgstr "\" Bir seçeneğin yardım penceresini açmak için bir yardım satırının " +"üzerinde <Enter>'a basın." + +msgid "\" Hit <Enter> on an index line to jump there." +msgstr "\" Bir seçeneğe atlamak için indeks satırının üzerinde <Enter>'a basın." + +msgid "\" Hit <Space> on a \"set\" line to refresh it." +msgstr "" +"\" Bir seçeneği yenilemek için bir \"set\" satırının üzerinde <Boşluk>'a basın." |