IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4888 from jamessan/vim-13d5aee

Browse Source 
vim-patch:13d5aee,705ada1,298b440,5e9b2fa,7c764f7,681baaf,cbebd48
This commit is contained in:
Justin M. Keyes 2016-06-07 10:32:28 -04:00
commit 8849c209cc
29 changed files with 1240 additions and 675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1067
runtime/autoload/csscomplete.vim
View File

File diff suppressed because it is too large Load Diff

35
runtime/autoload/sqlcomplete.vim
View File

@ -1,8 +1,8 @@
" Vim OMNI completion script for SQL " Vim OMNI completion script for SQL
" Language: SQL " Language: SQL
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com> " Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
" Version: 15.0 " Version: 16.0
" Last Change: 2013 May 13 " Last Change: 2015 Dec 29
" Homepage: http://www.vim.org/scripts/script.php?script_id=1572 " Homepage: http://www.vim.org/scripts/script.php?script_id=1572
" Usage: For detailed help " Usage: For detailed help
" ":help sql.txt" " ":help sql.txt"
@ -16,6 +16,12 @@
" look backwards to a FROM clause and find the first table " look backwards to a FROM clause and find the first table
" and complete it. " and complete it.
" "
" Version 16.0 (Dec 2015)
" - NF: If reseting the cache and table, procedure or view completion
" had been used via dbext, have dbext delete or recreate the
" dictionary so that new objects are picked up for the
" next completion.
"
" Version 15.0 (May 2013) " Version 15.0 (May 2013)
" - NF: Changed the SQL precached syntax items, omni_sql_precache_syntax_groups, " - NF: Changed the SQL precached syntax items, omni_sql_precache_syntax_groups,
" to use regular expressions to pick up extended syntax group names. " to use regular expressions to pick up extended syntax group names.
@ -103,7 +109,7 @@ endif
if exists('g:loaded_sql_completion') if exists('g:loaded_sql_completion')
finish finish
endif endif
let g:loaded_sql_completion = 150 let g:loaded_sql_completion = 160
let s:keepcpo= &cpo let s:keepcpo= &cpo
set cpo&vim set cpo&vim
@ -459,6 +465,29 @@ function! sqlcomplete#Complete(findstart, base)
let s:tbl_cols = [] let s:tbl_cols = []
let s:syn_list = [] let s:syn_list = []
let s:syn_value = [] let s:syn_value = []
if s:sql_file_table != ""
if g:loaded_dbext >= 2300
call DB_DictionaryDelete("table")
else
DBCompleteTables!
endif
endif
if s:sql_file_procedure != ""
if g:loaded_dbext >= 2300
call DB_DictionaryDelete("procedure")
else
DBCompleteProcedures!
endif
endif
if s:sql_file_view != ""
if g:loaded_dbext >= 2300
call DB_DictionaryDelete("view")
else
DBCompleteViews!
endif
endif
let s:sql_file_table = "" let s:sql_file_table = ""
let s:sql_file_procedure = "" let s:sql_file_procedure = ""
let s:sql_file_view = "" let s:sql_file_view = ""

2
runtime/doc/change.txt
View File

@ -1,4 +1,4 @@
*change.txt* For Vim version 7.4. Last change: 2016 Jan 02 *change.txt* For Vim version 7.4. Last change: 2016 Jan 31
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

2
runtime/doc/develop.txt
View File

@ -1,4 +1,4 @@
*develop.txt* For Vim version 7.4. Last change: 2014 Mar 27 *develop.txt* For Vim version 7.4. Last change: 2016 Jan 31
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

2
runtime/doc/editing.txt
View File

@ -1,4 +1,4 @@
*editing.txt* For Vim version 7.4. Last change: 2016 Jan 17 *editing.txt* For Vim version 7.4. Last change: 2016 Feb 01
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

13
runtime/doc/eval.txt
View File

@ -1,4 +1,4 @@
*eval.txt* For Vim version 7.4. Last change: 2016 Jan 16 *eval.txt* For Vim version 7.4. Last change: 2016 Feb 04
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -100,6 +100,9 @@ When mixing Number and Float the Number is converted to Float. Otherwise
there is no automatic conversion of Float. You can use str2float() for String there is no automatic conversion of Float. You can use str2float() for String
to Float, printf() for Float to String and float2nr() for Float to Number. to Float, printf() for Float to String and float2nr() for Float to Number.
*E891* *E892* *E893* *E894*
When expecting a Float a Number can also be used, but nothing else.
*E706* *sticky-type-checking* *E706* *sticky-type-checking*
You will get an error if you try to change the type of a variable. You need You will get an error if you try to change the type of a variable. You need
to |:unlet| it first to avoid this error. String and Number are considered to |:unlet| it first to avoid this error. String and Number are considered
@ -3665,7 +3668,8 @@ getftype({fname}) *getftype()*
getftype("/home") getftype("/home")
< Note that a type such as "link" will only be returned on < Note that a type such as "link" will only be returned on
systems that support it. On some systems only "dir" and systems that support it. On some systems only "dir" and
"file" are returned. "file" are returned. On MS-Windows a symbolic link to a
directory returns "dir" instead of "link".
*getline()* *getline()*
getline({lnum} [, {end}]) getline({lnum} [, {end}])
@ -6207,6 +6211,9 @@ sort({list} [, {func} [, {dict}]]) *sort()* *E702*
sorted numerical. This is like 'n' but a string containing sorted numerical. This is like 'n' but a string containing
digits will be used as the number they represent. digits will be used as the number they represent.
When {func} is given and it is 'f' then all items will be
sorted numerical. All values must be a Number or a Float.
When {func} is a |Funcref| or a function name, this function When {func} is a |Funcref| or a function name, this function
is called to compare items. The function is invoked with two is called to compare items. The function is invoked with two
items as argument and must return zero if they are equal, 1 or items as argument and must return zero if they are equal, 1 or
@ -7287,7 +7294,7 @@ dialog_gui Compiled with GUI dialog support.
digraphs Compiled with support for digraphs. digraphs Compiled with support for digraphs.
eval Compiled with expression evaluation support. Always eval Compiled with expression evaluation support. Always
true, of course! true, of course!
ex_extra Compiled with extra Ex commands |+ex_extra|. ex_extra |+ex_extra|, always true now
extra_search Compiled with support for |'incsearch'| and extra_search Compiled with support for |'incsearch'| and
|'hlsearch'| |'hlsearch'|
farsi Compiled with Farsi support |farsi|. farsi Compiled with Farsi support |farsi|.

8
runtime/doc/index.txt
View File

@ -1,4 +1,4 @@
*index.txt* For Vim version 7.4. Last change: 2016 Jan 10 *index.txt* For Vim version 7.4. Last change: 2016 Jan 19
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -1515,14 +1515,14 @@ tag command action ~
|:tabdo| :tabdo execute command in each tab page |:tabdo| :tabdo execute command in each tab page
|:tabedit| :tabe[dit] edit a file in a new tab page |:tabedit| :tabe[dit] edit a file in a new tab page
|:tabfind| :tabf[ind] find file in 'path', edit it in a new tab page |:tabfind| :tabf[ind] find file in 'path', edit it in a new tab page
|:tabfirst| :tabfir[st] got to first tab page |:tabfirst| :tabfir[st] go to first tab page
|:tablast| :tabl[ast] got to last tab page |:tablast| :tabl[ast] go to last tab page
|:tabmove| :tabm[ove] move tab page to other position |:tabmove| :tabm[ove] move tab page to other position
|:tabnew| :tabnew edit a file in a new tab page |:tabnew| :tabnew edit a file in a new tab page
|:tabnext| :tabn[ext] go to next tab page |:tabnext| :tabn[ext] go to next tab page
|:tabonly| :tabo[nly] close all tab pages except the current one |:tabonly| :tabo[nly] close all tab pages except the current one
|:tabprevious| :tabp[revious] go to previous tab page |:tabprevious| :tabp[revious] go to previous tab page
|:tabrewind| :tabr[ewind] got to first tab page |:tabrewind| :tabr[ewind] go to first tab page
|:tabs| :tabs list the tab pages and what they contain |:tabs| :tabs list the tab pages and what they contain
|:tab| :tab create new tab when opening new window |:tab| :tab create new tab when opening new window
|:tag| :ta[g] jump to tag |:tag| :ta[g] jump to tag

2
runtime/doc/insert.txt
View File

@ -1,4 +1,4 @@
*insert.txt* For Vim version 7.4. Last change: 2015 Sep 15 *insert.txt* For Vim version 7.4. Last change: 2016 Jan 31
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

4
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 7.4. Last change: 2016 Jan 19 *options.txt* For Vim version 7.4. Last change: 2016 Feb 01
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -5957,7 +5957,7 @@ A jump table for the options with a short description can be found at |Q_op|.
The option consists of printf style '%' items interspersed with The option consists of printf style '%' items interspersed with
normal text. Each status line item is of the form: normal text. Each status line item is of the form:
%-0{minwid}.{maxwid}{item} %-0{minwid}.{maxwid}{item}
All fields except the {item} is optional. A single percent sign can All fields except the {item} are optional. A single percent sign can
be given as "%%". Up to 80 items can be specified. *E541* be given as "%%". Up to 80 items can be specified. *E541*
When the option starts with "%!" then it is used as an expression, When the option starts with "%!" then it is used as an expression,

2
runtime/doc/quickfix.txt
View File

@ -1,4 +1,4 @@
*quickfix.txt* For Vim version 7.4. Last change: 2015 Sep 08 *quickfix.txt* For Vim version 7.4. Last change: 2016 Jan 21
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

4
runtime/doc/syntax.txt
View File

@ -1,4 +1,4 @@
*syntax.txt* For Vim version 7.4. Last change: 2016 Jan 19 *syntax.txt* For Vim version 7.4. Last change: 2016 Jan 28
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -3442,7 +3442,7 @@ SYNTAX ISKEYWORD SETTING *:syn-iskeyword*
If no argument is given, the current value will be output. If no argument is given, the current value will be output.
Setting this option influences what |/\k| matches in syntax patterns Setting this option influences what |/\k| matches in syntax patterns
and also determines where |:syn-keywords| will be checked for a new and also determines where |:syn-keyword| will be checked for a new
match. match.
It is recommended when writing syntax files, to use this command It is recommended when writing syntax files, to use this command

2
runtime/doc/usr_41.txt
View File

@ -1,4 +1,4 @@
*usr_41.txt* For Vim version 7.4. Last change: 2015 Nov 30 *usr_41.txt* For Vim version 7.4. Last change: 2016 Feb 02
VIM USER MANUAL - by Bram Moolenaar VIM USER MANUAL - by Bram Moolenaar

5
runtime/doc/various.txt
View File

@ -1,4 +1,4 @@
*various.txt* For Vim version 7.4. Last change: 2016 Jan 10 *various.txt* For Vim version 7.4. Last change: 2016 Jan 31
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -319,8 +319,7 @@ N *+dialog_con* Support for |:confirm| with console dialog.
N *+dialog_con_gui* Support for |:confirm| with GUI and console dialog. N *+dialog_con_gui* Support for |:confirm| with GUI and console dialog.
N *+digraphs* |digraphs| *E196* N *+digraphs* |digraphs| *E196*
N *+eval* expression evaluation |eval.txt| N *+eval* expression evaluation |eval.txt|
N *+ex_extra* Vim's extra Ex commands: |:center|, |:left|, N *+ex_extra* always on now, used to be for Vim's extra Ex commands
|:normal|, |:retab| and |:right|
N *+extra_search* |'hlsearch'| and |'incsearch'| options. N *+extra_search* |'hlsearch'| and |'incsearch'| options.
B *+farsi* |farsi| language B *+farsi* |farsi| language
N *+file_in_path* |gf|, |CTRL-W_f| and |<cfile>| N *+file_in_path* |gf|, |CTRL-W_f| and |<cfile>|

6
runtime/doc/windows.txt
View File

@ -1,4 +1,4 @@
*windows.txt* For Vim version 7.4. Last change: 2015 Nov 14 *windows.txt* For Vim version 7.4. Last change: 2016 Feb 01
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -707,8 +707,8 @@ can also get to them with the buffer list commands, like ":bnext".
*:bufdo* *:bufdo*
:[range]bufdo[!] {cmd} Execute {cmd} in each buffer in the buffer list or if :[range]bufdo[!] {cmd} Execute {cmd} in each buffer in the buffer list or if
[range] is given only for buffers for which their [range] is given only for buffers for which their
buffer name is in the [range]. It works like doing buffer number is in the [range]. It works like doing
this: > this: >
:bfirst :bfirst
:{cmd} :{cmd}
:bnext :bnext

30
runtime/indent/fortran.vim
View File

@ -1,11 +1,11 @@
" Vim indent file " Vim indent file
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77) " Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
" Version: 0.42 " Version: 0.44
" Last Change: 2015 Nov. 30 " Last Change: 2016 Jan. 26
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/> " Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
" Usage: For instructions, do :help fortran-indent from Vim " Usage: For instructions, do :help fortran-indent from Vim
" Credits: " Credits:
" Useful suggestions were made by: Albert Oliver Serra. " Useful suggestions were made by: Albert Oliver Serra and Takuya Fujiwara.
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists("b:did_indent") if exists("b:did_indent")
@ -92,10 +92,10 @@ function FortranGetIndent(lnum)
"Indent do loops only if they are all guaranteed to be of do/end do type "Indent do loops only if they are all guaranteed to be of do/end do type
if exists("b:fortran_do_enddo") || exists("g:fortran_do_enddo") if exists("b:fortran_do_enddo") || exists("g:fortran_do_enddo")
if prevstat =~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*do\>' if prevstat =~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*do\>'
let ind = ind + &sw let ind = ind + shiftwidth()
endif endif
if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*end\s*do\>' if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*end\s*do\>'
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
endif endif
@ -105,14 +105,14 @@ function FortranGetIndent(lnum)
\ ||prevstat=~? '^\s*\(type\|interface\|associate\|enum\)\>' \ ||prevstat=~? '^\s*\(type\|interface\|associate\|enum\)\>'
\ ||prevstat=~?'^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*\(forall\|where\|block\)\>' \ ||prevstat=~?'^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*\(forall\|where\|block\)\>'
\ ||prevstat=~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*if\>' \ ||prevstat=~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*if\>'
let ind = ind + &sw let ind = ind + shiftwidth()
" Remove unwanted indent after logical and arithmetic ifs " Remove unwanted indent after logical and arithmetic ifs
if prevstat =~? '\<if\>' && prevstat !~? '\<then\>' if prevstat =~? '\<if\>' && prevstat !~? '\<then\>'
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
" Remove unwanted indent after type( statements " Remove unwanted indent after type( statements
if prevstat =~? '^\s*type\s*(' if prevstat =~? '^\s*type\s*('
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
endif endif
@ -125,12 +125,12 @@ function FortranGetIndent(lnum)
\ ||prevstat =~? '^\s*'.prefix.'subroutine\>' \ ||prevstat =~? '^\s*'.prefix.'subroutine\>'
\ ||prevstat =~? '^\s*'.prefix.type.'function\>' \ ||prevstat =~? '^\s*'.prefix.type.'function\>'
\ ||prevstat =~? '^\s*'.type.prefix.'function\>' \ ||prevstat =~? '^\s*'.type.prefix.'function\>'
let ind = ind + &sw let ind = ind + shiftwidth()
endif endif
if getline(v:lnum) =~? '^\s*contains\>' if getline(v:lnum) =~? '^\s*contains\>'
\ ||getline(v:lnum)=~? '^\s*end\s*' \ ||getline(v:lnum)=~? '^\s*end\s*'
\ .'\(function\|subroutine\|module\|program\)\>' \ .'\(function\|subroutine\|module\|program\)\>'
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
endif endif
@ -141,23 +141,23 @@ function FortranGetIndent(lnum)
\. '\(else\|else\s*if\|else\s*where\|case\|' \. '\(else\|else\s*if\|else\s*where\|case\|'
\. 'end\s*\(if\|where\|select\|interface\|' \. 'end\s*\(if\|where\|select\|interface\|'
\. 'type\|forall\|associate\|enum\|block\)\)\>' \. 'type\|forall\|associate\|enum\|block\)\)\>'
let ind = ind - &sw let ind = ind - shiftwidth()
" Fix indent for case statement immediately after select " Fix indent for case statement immediately after select
if prevstat =~? '\<select\s\+\(case\|type\)\>' if prevstat =~? '\<select\s\+\(case\|type\)\>'
let ind = ind + &sw let ind = ind + shiftwidth()
endif endif
endif endif
"First continuation line "First continuation line
if prevstat =~ '&\s*$' && prev2stat !~ '&\s*$' if prevstat =~ '&\s*$' && prev2stat !~ '&\s*$'
let ind = ind + &sw let ind = ind + shiftwidth()
endif endif
if prevstat =~ '&\s*$' && prevstat =~ '\<else\s*if\>' if prevstat =~ '&\s*$' && prevstat =~ '\<else\s*if\>'
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
"Line after last continuation line "Line after last continuation line
if prevstat !~ '&\s*$' && prev2stat =~ '&\s*$' && prevstat !~? '\<then\>' if prevstat !~ '&\s*$' && prev2stat =~ '&\s*$' && prevstat !~? '\<then\>'
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
return ind return ind

60
runtime/indent/php.vim
View File

@ -3,8 +3,8 @@
" Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr> " Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr>
" URL: http://www.2072productions.com/vim/indent/php.vim " URL: http://www.2072productions.com/vim/indent/php.vim
" Home: https://github.com/2072/PHP-Indenting-for-VIm " Home: https://github.com/2072/PHP-Indenting-for-VIm
" Last Change: 2014 November 26th " Last Change: 2015 September 8th
" Version: 1.57 " Version: 1.60
" "
" "
" Type :help php-indent for available options " Type :help php-indent for available options
@ -50,16 +50,25 @@ let b:did_indent = 1
let g:php_sync_method = 0 let g:php_sync_method = 0
if exists('*shiftwidth')
function! s:sw()
return shiftwidth()
endfunction
else
function! s:sw()
return &shiftwidth
endfunction
endif
if exists("PHP_default_indenting") if exists("PHP_default_indenting")
let b:PHP_default_indenting = PHP_default_indenting * &sw let b:PHP_default_indenting = PHP_default_indenting * s:sw()
else else
let b:PHP_default_indenting = 0 let b:PHP_default_indenting = 0
endif endif
if exists("PHP_outdentSLComments") if exists("PHP_outdentSLComments")
let b:PHP_outdentSLComments = PHP_outdentSLComments * &sw let b:PHP_outdentSLComments = PHP_outdentSLComments * s:sw()
else else
let b:PHP_outdentSLComments = 0 let b:PHP_outdentSLComments = 0
endif endif
@ -124,7 +133,7 @@ endif
if exists("*GetPhpIndent") if exists("*GetPhpIndent")
call ResetPhpOptions() call ResetPhpOptions()
finish " XXX -- comment this line for easy dev finish
endif endif
@ -135,7 +144,7 @@ let s:functionDecl = '\<function\>\%(\s\+'.s:PHP_validVariable.'\)\=\s*(.*'
let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$' let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$'
let s:terminated = '\%(\%(;\%(\s*\%(?>\|}\)\)\=\|<<<''\=\a\w*''\=$\|^\s*}\|^\s*'.s:PHP_validVariable.':\)'.s:endline.'\)\|^[^''"`]*[''"`]$' let s:terminated = '\%(\%(;\%(\s*\%(?>\|}\)\)\=\|<<<\s*[''"]\=\a\w*[''"]\=$\|^\s*}\|^\s*'.s:PHP_validVariable.':\)'.s:endline.'\)\|^[^''"`]*[''"`]$'
let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!' let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!'
@ -200,7 +209,7 @@ function! GetLastRealCodeLNum(startline) " {{{
elseif lastline =~? '^\a\w*;\=$' && lastline !~? s:notPhpHereDoc elseif lastline =~? '^\a\w*;\=$' && lastline !~? s:notPhpHereDoc
let tofind=substitute( lastline, '\(\a\w*\);\=', '<<<''\\=\1''\\=$', '') let tofind=substitute( lastline, '\(\a\w*\);\=', '<<<\\s*[''"]\\=\1[''"]\\=$', '')
while getline(lnum) !~? tofind && lnum > 1 while getline(lnum) !~? tofind && lnum > 1
let lnum = lnum - 1 let lnum = lnum - 1
endwhile endwhile
@ -314,7 +323,7 @@ function! FindTheSwitchIndent (lnum) " {{{
let test = GetLastRealCodeLNum(a:lnum - 1) let test = GetLastRealCodeLNum(a:lnum - 1)
if test <= 1 if test <= 1
return indent(1) - &sw * b:PHP_vintage_case_default_indent return indent(1) - s:sw() * b:PHP_vintage_case_default_indent
end end
while getline(test) =~ '^\s*}' && test > 1 while getline(test) =~ '^\s*}' && test > 1
@ -328,7 +337,7 @@ function! FindTheSwitchIndent (lnum) " {{{
if getline(test) =~# '^\s*switch\>' if getline(test) =~# '^\s*switch\>'
return indent(test) return indent(test)
elseif getline(test) =~# s:defaultORcase elseif getline(test) =~# s:defaultORcase
return indent(test) - &sw * b:PHP_vintage_case_default_indent return indent(test) - s:sw() * b:PHP_vintage_case_default_indent
else else
return FindTheSwitchIndent(test) return FindTheSwitchIndent(test)
endif endif
@ -401,7 +410,7 @@ function! GetPhpIndent()
endif endif
if b:PHP_default_indenting if b:PHP_default_indenting
let b:PHP_default_indenting = g:PHP_default_indenting * &sw let b:PHP_default_indenting = g:PHP_default_indenting * s:sw()
endif endif
let cline = getline(v:lnum) let cline = getline(v:lnum)
@ -439,6 +448,7 @@ function! GetPhpIndent()
if !b:InPHPcode_checked " {{{ One time check if !b:InPHPcode_checked " {{{ One time check
let b:InPHPcode_checked = 1 let b:InPHPcode_checked = 1
let b:UserIsTypingComment = 0
let synname = "" let synname = ""
if cline !~ '<?.*?>' if cline !~ '<?.*?>'
@ -447,8 +457,7 @@ function! GetPhpIndent()
if synname!="" if synname!=""
if synname == "SpecStringEntrails" if synname == "SpecStringEntrails"
let b:InPHPcode = -1 " thumb down let b:InPHPcode = -1
let b:UserIsTypingComment = 0
let b:InPHPcode_tofind = "" let b:InPHPcode_tofind = ""
elseif synname != "phpHereDoc" && synname != "phpHereDocDelimiter" elseif synname != "phpHereDoc" && synname != "phpHereDocDelimiter"
let b:InPHPcode = 1 let b:InPHPcode = 1
@ -456,8 +465,7 @@ function! GetPhpIndent()
if synname =~# '^php\%(Doc\)\?Comment' if synname =~# '^php\%(Doc\)\?Comment'
let b:UserIsTypingComment = 1 let b:UserIsTypingComment = 1
else let b:InPHPcode_checked = 0
let b:UserIsTypingComment = 0
endif endif
if synname =~? '^javaScript' if synname =~? '^javaScript'
@ -466,18 +474,16 @@ function! GetPhpIndent()
else else
let b:InPHPcode = 0 let b:InPHPcode = 0
let b:UserIsTypingComment = 0
let lnum = v:lnum - 1 let lnum = v:lnum - 1
while getline(lnum) !~? '<<<''\=\a\w*''\=$' && lnum > 1 while getline(lnum) !~? '<<<\s*[''"]\=\a\w*[''"]\=$' && lnum > 1
let lnum = lnum - 1 let lnum = lnum - 1
endwhile endwhile
let b:InPHPcode_tofind = substitute( getline(lnum), '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '') let b:InPHPcode_tofind = substitute( getline(lnum), '^.*<<<\s*[''"]\=\(\a\w*\)[''"]\=$', '^\\s*\1;\\=$', '')
endif endif
else else
let b:InPHPcode = 0 let b:InPHPcode = 0
let b:UserIsTypingComment = 0
let b:InPHPcode_tofind = s:PHP_startindenttag let b:InPHPcode_tofind = s:PHP_startindenttag
endif endif
endif "!b:InPHPcode_checked }}} endif "!b:InPHPcode_checked }}}
@ -537,9 +543,9 @@ function! GetPhpIndent()
elseif last_line =~ '^[^''"`]\+[''"`]$' elseif last_line =~ '^[^''"`]\+[''"`]$'
let b:InPHPcode = -1 let b:InPHPcode = -1
let b:InPHPcode_tofind = substitute( last_line, '^.*\([''"`]\).*$', '^[^\1]*\1[;,]$', '') let b:InPHPcode_tofind = substitute( last_line, '^.*\([''"`]\).*$', '^[^\1]*\1[;,]$', '')
elseif last_line =~? '<<<''\=\a\w*''\=$' elseif last_line =~? '<<<\s*[''"]\=\a\w*[''"]\=$'
let b:InPHPcode = 0 let b:InPHPcode = 0
let b:InPHPcode_tofind = substitute( last_line, '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '') let b:InPHPcode_tofind = substitute( last_line, '^.*<<<\s*[''"]\=\(\a\w*\)[''"]\=$', '^\\s*\1;\\=$', '')
elseif !UserIsEditing && cline =~ '^\s*/\*\%(.*\*/\)\@!' && getline(v:lnum + 1) !~ '^\s*\*' elseif !UserIsEditing && cline =~ '^\s*/\*\%(.*\*/\)\@!' && getline(v:lnum + 1) !~ '^\s*\*'
let b:InPHPcode = 0 let b:InPHPcode = 0
@ -660,7 +666,7 @@ function! GetPhpIndent()
let b:PHP_CurrentIndentLevel = b:PHP_default_indenting let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
return indent(FindTheIfOfAnElse(v:lnum, 1)) return indent(FindTheIfOfAnElse(v:lnum, 1))
elseif cline =~# s:defaultORcase elseif cline =~# s:defaultORcase
return FindTheSwitchIndent(v:lnum) + &sw * b:PHP_vintage_case_default_indent return FindTheSwitchIndent(v:lnum) + s:sw() * b:PHP_vintage_case_default_indent
elseif cline =~ '^\s*)\=\s*{' elseif cline =~ '^\s*)\=\s*{'
let previous_line = last_line let previous_line = last_line
let last_line_num = lnum let last_line_num = lnum
@ -672,7 +678,7 @@ function! GetPhpIndent()
let ind = indent(last_line_num) let ind = indent(last_line_num)
if b:PHP_BracesAtCodeLevel if b:PHP_BracesAtCodeLevel
let ind = ind + &sw let ind = ind + s:sw()
endif endif
return ind return ind
@ -683,7 +689,7 @@ function! GetPhpIndent()
endwhile endwhile
elseif last_line =~# unstated && cline !~ '^\s*);\='.endline elseif last_line =~# unstated && cline !~ '^\s*);\='.endline
let ind = ind + &sw let ind = ind + s:sw()
return ind + addSpecial return ind + addSpecial
elseif (ind != b:PHP_default_indenting || last_line =~ '^[)\]]' ) && last_line =~ terminated elseif (ind != b:PHP_default_indenting || last_line =~ '^[)\]]' ) && last_line =~ terminated
@ -782,7 +788,7 @@ function! GetPhpIndent()
endif endif
if !dontIndent && (!b:PHP_BracesAtCodeLevel || last_line !~# '^\s*{') if !dontIndent && (!b:PHP_BracesAtCodeLevel || last_line !~# '^\s*{')
let ind = ind + &sw let ind = ind + s:sw()
endif endif
if b:PHP_BracesAtCodeLevel || b:PHP_vintage_case_default_indent == 1 if b:PHP_BracesAtCodeLevel || b:PHP_vintage_case_default_indent == 1
@ -800,17 +806,17 @@ function! GetPhpIndent()
endif endif
elseif last_line =~ '^\s*'.s:blockstart elseif last_line =~ '^\s*'.s:blockstart
let ind = ind + &sw let ind = ind + s:sw()
elseif AntepenultimateLine =~ '{'.endline || AntepenultimateLine =~ terminated || AntepenultimateLine =~# s:defaultORcase elseif AntepenultimateLine =~ '{'.endline || AntepenultimateLine =~ terminated || AntepenultimateLine =~# s:defaultORcase
let ind = ind + &sw let ind = ind + s:sw()
endif endif
endif endif
if cline =~ '^\s*[)\]];\=' if cline =~ '^\s*[)\]];\='
let ind = ind - &sw let ind = ind - s:sw()
endif endif
let b:PHP_CurrentIndentLevel = ind let b:PHP_CurrentIndentLevel = ind

4
runtime/indent/sh.vim
View File

@ -3,7 +3,7 @@
" Maintainer: Christian Brabandt <cb@256bit.org> " Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Peter Aronoff <telemachus@arpinum.org> " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
" Original Author: Nikolai Weibull <now@bitwi.se> " Original Author: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2015-12-15 " Latest Revision: 2016-01-15
" License: Vim (see :h license) " License: Vim (see :h license)
" Repository: https://github.com/chrisbra/vim-sh-indent " Repository: https://github.com/chrisbra/vim-sh-indent
@ -28,7 +28,7 @@ let s:cpo_save = &cpo
set cpo&vim set cpo&vim
function s:buffer_shiftwidth() function s:buffer_shiftwidth()
return &shiftwidth return shiftwidth()
endfunction endfunction
let s:sh_indent_defaults = { let s:sh_indent_defaults = {

14
runtime/indent/vim.vim
View File

@ -1,7 +1,7 @@
" Vim indent file " Vim indent file
" Language: Vim script " Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2014 Dec 12 " Last Change: 2016 Jan 24
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists("b:did_indent") if exists("b:did_indent")
@ -58,19 +58,19 @@ function GetVimIndentIntern()
if exists("g:vim_indent_cont") if exists("g:vim_indent_cont")
let ind = ind + g:vim_indent_cont let ind = ind + g:vim_indent_cont
else else
let ind = ind + &sw * 3 let ind = ind + shiftwidth() * 3
endif endif
elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+END' elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+END'
let ind = ind + &sw let ind = ind + shiftwidth()
else else
" A line starting with :au does not increment/decrement indent. " A line starting with :au does not increment/decrement indent.
if prev_text !~ '^\s*au\%[tocmd]' if prev_text !~ '^\s*au\%[tocmd]'
let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>') let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
if i >= 0 if i >= 0
let ind += &sw let ind += shiftwidth()
if strpart(prev_text, i, 1) == '|' && has('syntax_items') if strpart(prev_text, i, 1) == '|' && has('syntax_items')
\ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$' \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
let ind -= &sw let ind -= shiftwidth()
endif endif
endif endif
endif endif
@ -82,7 +82,7 @@ function GetVimIndentIntern()
let i = match(prev_text, '[^\\]|\s*\(ene\@!\)') let i = match(prev_text, '[^\\]|\s*\(ene\@!\)')
if i > 0 && prev_text !~ '^\s*au\%[tocmd]' if i > 0 && prev_text !~ '^\s*au\%[tocmd]'
if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$' if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$'
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
endif endif
@ -90,7 +90,7 @@ function GetVimIndentIntern()
" Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry, " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
" :endfun, :else and :augroup END. " :endfun, :else and :augroup END.
if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)' if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)'
let ind = ind - &sw let ind = ind - shiftwidth()
endif endif
return ind return ind

12
runtime/indent/zimbu.vim
View File

@ -1,7 +1,7 @@
" Vim indent file " Vim indent file
" Language: Zimbu " Language: Zimbu
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2012 Sep 08 " Last Change: 2016 Jan 25
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists("b:did_indent") if exists("b:did_indent")
@ -74,9 +74,9 @@ func GetZimbuIndent(lnum)
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')" \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
\ . " =~ '\\(Comment\\|String\\|Char\\)$'") \ . " =~ '\\(Comment\\|String\\|Char\\)$'")
if pp > 0 if pp > 0
return indent(prevLnum) + &sw return indent(prevLnum) + shiftwidth()
endif endif
return indent(prevLnum) + &sw * 2 return indent(prevLnum) + shiftwidth() * 2
endif endif
if plnumstart == p if plnumstart == p
return indent(prevLnum) return indent(prevLnum)
@ -102,13 +102,13 @@ func GetZimbuIndent(lnum)
endif endif
if prevline =~ '^\s*\(IF\|\|ELSEIF\|ELSE\|GENERATE_IF\|\|GENERATE_ELSEIF\|GENERATE_ELSE\|WHILE\|REPEAT\|TRY\|CATCH\|FINALLY\|FOR\|DO\|SWITCH\|CASE\|DEFAULT\|FUNC\|VIRTUAL\|ABSTRACT\|DEFINE\|REPLACE\|FINAL\|PROC\|MAIN\|NEW\|ENUM\|CLASS\|INTERFACE\|BITS\|MODULE\|SHARED\)\>' if prevline =~ '^\s*\(IF\|\|ELSEIF\|ELSE\|GENERATE_IF\|\|GENERATE_ELSEIF\|GENERATE_ELSE\|WHILE\|REPEAT\|TRY\|CATCH\|FINALLY\|FOR\|DO\|SWITCH\|CASE\|DEFAULT\|FUNC\|VIRTUAL\|ABSTRACT\|DEFINE\|REPLACE\|FINAL\|PROC\|MAIN\|NEW\|ENUM\|CLASS\|INTERFACE\|BITS\|MODULE\|SHARED\)\>'
let plindent += &sw let plindent += shiftwidth()
endif endif
if thisline =~ '^\s*\(}\|ELSEIF\>\|ELSE\>\|CATCH\|FINALLY\|GENERATE_ELSEIF\>\|GENERATE_ELSE\>\|UNTIL\>\)' if thisline =~ '^\s*\(}\|ELSEIF\>\|ELSE\>\|CATCH\|FINALLY\|GENERATE_ELSEIF\>\|GENERATE_ELSE\>\|UNTIL\>\)'
let plindent -= &sw let plindent -= shiftwidth()
endif endif
if thisline =~ '^\s*\(CASE\>\|DEFAULT\>\)' && prevline !~ '^\s*SWITCH\>' if thisline =~ '^\s*\(CASE\>\|DEFAULT\>\)' && prevline !~ '^\s*SWITCH\>'
let plindent -= &sw let plindent -= shiftwidth()
endif endif
" line up continued comment that started after some code " line up continued comment that started after some code

42
runtime/syntax/d.vim
View File

@ -1,9 +1,9 @@
" Vim syntax file for the D programming language (version 1.076 and 2.063). " Vim syntax file for the D programming language (version 1.076 and 2.069).
" "
" Language: D " Language: D
" Maintainer: Jesse Phillips <Jesse.K.Phillips+D@gmail.com> " Maintainer: Jesse Phillips <Jesse.K.Phillips+D@gmail.com>
" Last Change: 2013 October 5 " Last Change: 2016 Feb 2
" Version: 0.26 " Version: 0.28
" "
" Contributors: " Contributors:
" - Jason Mills: original Maintainer " - Jason Mills: original Maintainer
@ -15,6 +15,7 @@
" - Steven N. Oliver " - Steven N. Oliver
" - Sohgo Takeuchi " - Sohgo Takeuchi
" - Robert Clipsham " - Robert Clipsham
" - Petar Kirov
" "
" Please submit bugs/comments/suggestions to the github repo: " Please submit bugs/comments/suggestions to the github repo:
" https://github.com/JesseKPhillips/d.vim " https://github.com/JesseKPhillips/d.vim
@ -114,17 +115,19 @@ syn keyword dTraitsIdentifier contained isIntegral isScalar isStaticArray
syn keyword dTraitsIdentifier contained isUnsigned isVirtualFunction syn keyword dTraitsIdentifier contained isUnsigned isVirtualFunction
syn keyword dTraitsIdentifier contained isVirtualMethod isAbstractFunction syn keyword dTraitsIdentifier contained isVirtualMethod isAbstractFunction
syn keyword dTraitsIdentifier contained isFinalFunction isStaticFunction syn keyword dTraitsIdentifier contained isFinalFunction isStaticFunction
syn keyword dTraitsIdentifier contained isOverrideFunction isTemplate
syn keyword dTraitsIdentifier contained isRef isOut isLazy hasMember syn keyword dTraitsIdentifier contained isRef isOut isLazy hasMember
syn keyword dTraitsIdentifier contained identifier getAttributes getMember syn keyword dTraitsIdentifier contained identifier getAliasThis
syn keyword dTraitsIdentifier contained getOverloads getProtection syn keyword dTraitsIdentifier contained getAttributes getFunctionAttributes getMember
syn keyword dTraitsIdentifier contained getVirtualFunctions syn keyword dTraitsIdentifier contained getOverloads getPointerBitmap getProtection
syn keyword dTraitsIdentifier contained getVirtualMethods parent syn keyword dTraitsIdentifier contained getVirtualFunctions getVirtualIndex
syn keyword dTraitsIdentifier contained classInstanceSize allMembers syn keyword dTraitsIdentifier contained getVirtualMethods getUnitTests
syn keyword dTraitsIdentifier contained parent classInstanceSize allMembers
syn keyword dTraitsIdentifier contained derivedMembers isSame compiles syn keyword dTraitsIdentifier contained derivedMembers isSame compiles
syn keyword dPragmaIdentifier contained lib msg startaddress GNU_asm syn keyword dPragmaIdentifier contained inline lib mangle msg startaddress GNU_asm
syn keyword dExternIdentifier contained Windows Pascal Java System D syn keyword dExternIdentifier contained C C++ D Windows Pascal System Objective-C
syn keyword dAttribute contained safe trusted system syn keyword dAttribute contained safe trusted system
syn keyword dAttribute contained property disable syn keyword dAttribute contained property disable nogc
syn keyword dVersionIdentifier contained DigitalMars GNU LDC SDC D_NET syn keyword dVersionIdentifier contained DigitalMars GNU LDC SDC D_NET
syn keyword dVersionIdentifier contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha syn keyword dVersionIdentifier contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha
syn keyword dVersionIdentifier contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64 syn keyword dVersionIdentifier contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64
@ -134,7 +137,7 @@ syn keyword dVersionIdentifier contained Cygwin MinGW
syn keyword dVersionIdentifier contained LittleEndian BigEndian syn keyword dVersionIdentifier contained LittleEndian BigEndian
syn keyword dVersionIdentifier contained D_InlineAsm_X86 D_InlineAsm_X86_64 syn keyword dVersionIdentifier contained D_InlineAsm_X86 D_InlineAsm_X86_64
syn keyword dVersionIdentifier contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC syn keyword dVersionIdentifier contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC
syn keyword dVersionIdentifier contained unittest none all syn keyword dVersionIdentifier contained unittest assert none all
syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment
@ -168,10 +171,10 @@ syn match dExternal "\<extern\>"
syn match dExtern "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier syn match dExtern "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier
" Make import a region to prevent highlighting keywords " Make import a region to prevent highlighting keywords
syn region dImport start="import\_s" end=";" contains=dExternal,@dComment syn region dImport start="\<import\_s" end=";" contains=dExternal,@dComment
" Make module a region to prevent highlighting keywords " Make module a region to prevent highlighting keywords
syn region dImport start="module\_s" end=";" contains=dExternal,@dComment syn region dImport start="\<module\_s" end=";" contains=dExternal,@dComment
" dTokens is used by the token string highlighting " dTokens is used by the token string highlighting
syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean
@ -246,13 +249,17 @@ syn match dUnicode "\\u\d\{4\}"
" String. " String.
" "
syn region dString start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dEscSequence,@Spell syn match dFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
syn match dFormat display "%%" contained
syn region dString start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dFormat,dEscSequence,@Spell
syn region dRawString start=+`+ end=+`[cwd]\=+ contains=@Spell syn region dRawString start=+`+ end=+`[cwd]\=+ contains=@Spell
syn region dRawString start=+r"+ end=+"[cwd]\=+ contains=@Spell syn region dRawString start=+r"+ end=+"[cwd]\=+ contains=@Spell
syn region dHexString start=+x"+ end=+"[cwd]\=+ contains=@Spell syn region dHexString start=+x"+ end=+"[cwd]\=+ contains=@Spell
syn region dDelimString start=+q"\z(.\)+ end=+\z1"+ contains=@Spell syn region dDelimString start=+q"\z(.\)+ end=+\z1"+ contains=@Spell
syn region dHereString start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell syn region dHereString start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell
" Nesting delimited string contents " Nesting delimited string contents
" "
syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell
@ -276,8 +283,8 @@ syn cluster dTokens add=dString,dRawString,dHexString,dDelimString,dNestString
" Token strings " Token strings
" "
syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens,dFormat
syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens,dFormat
syn cluster dTokens add=dTokenString syn cluster dTokens add=dTokenString
@ -357,6 +364,7 @@ hi def link dString String
hi def link dHexString String hi def link dHexString String
hi def link dCharacter Character hi def link dCharacter Character
hi def link dEscSequence SpecialChar hi def link dEscSequence SpecialChar
hi def link dFormat SpecialChar
hi def link dSpecialCharError Error hi def link dSpecialCharError Error
hi def link dOctalError Error hi def link dOctalError Error
hi def link dOperator Operator hi def link dOperator Operator

10
runtime/syntax/dcl.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: DCL (Digital Command Language - vms) " Language: DCL (Digital Command Language - vms)
" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
" Last Change: Oct 23, 2014 " Last Change: Jan 20, 2016
" Version: 7 " Version: 8
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL
" For version 5.x: Clear all syntax items " For version 5.x: Clear all syntax items
@ -13,10 +13,10 @@ elseif exists("b:current_syntax")
finish finish
endif endif
if version < 600 if !has("patch-7.4.1141")
set iskeyword=$,@,48-57,_
else
setlocal iskeyword=$,@,48-57,_ setlocal iskeyword=$,@,48-57,_
else
syn iskeyword $,@,48-57,_
endif endif
syn case ignore syn case ignore

8
runtime/syntax/lisp.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: Lisp " Language: Lisp
" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
" Last Change: Oct 06, 2014 " Last Change: Jan 20, 2016
" Version: 23 " Version: 24
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
" "
" Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec " Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
@ -16,8 +16,10 @@ endif
if exists("g:lisp_isk") if exists("g:lisp_isk")
exe "setl isk=".g:lisp_isk exe "setl isk=".g:lisp_isk
else elseif !has("patch-7.4.1141")
setl isk=38,42,43,45,47-58,60-62,64-90,97-122,_ setl isk=38,42,43,45,47-58,60-62,64-90,97-122,_
else
syn iskeyword 38,42,43,45,47-58,60-62,64-90,97-122,_
endif endif
if exists("g:lispsyntax_ignorecase") || exists("g:lispsyntax_clisp") if exists("g:lispsyntax_ignorecase") || exists("g:lispsyntax_clisp")

10
runtime/syntax/maple.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: Maple V (based on release 4) " Language: Maple V (based on release 4)
" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
" Last Change: Oct 23, 2014 " Last Change: Jan 20, 2016
" Version: 11 " Version: 12
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE
" "
" Package Function Selection: {{{1 " Package Function Selection: {{{1
@ -30,10 +30,10 @@ elseif exists("b:current_syntax")
endif endif
" Iskeyword Effects: {{{1 " Iskeyword Effects: {{{1
if version < 600 if !has("patch-7.4.1141")
set iskeyword=$,48-57,_,a-z,@-Z setl isk=$,48-57,_,a-z,@-Z
else else
setlocal iskeyword=$,48-57,_,a-z,@-Z syn iskeyword $,48-57,_,a-z,@-Z
endif endif
" Package Selection: {{{1 " Package Selection: {{{1

3
runtime/syntax/messages.vim
View File

@ -3,6 +3,7 @@
" Maintainer: Yakov Lerner <iler.ml@gmail.com> " Maintainer: Yakov Lerner <iler.ml@gmail.com>
" Latest Revision: 2008-06-29 " Latest Revision: 2008-06-29
" Changes: 2008-06-29 support for RFC3339 tuimestamps James Vega " Changes: 2008-06-29 support for RFC3339 tuimestamps James Vega
" 2016 Jan 19: messagesDate changed by Bram
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -13,7 +14,7 @@ set cpo&vim
syn match messagesBegin display '^' nextgroup=messagesDate,messagesDateRFC3339 syn match messagesBegin display '^' nextgroup=messagesDate,messagesDateRFC3339
syn match messagesDate contained display '\a\a\a [ 0-9]\d *' syn match messagesDate contained display '[[:lower:][:upper:]][[:lower:][:upper:]][[:lower:][:upper:]] [ 0-9]\d *'
\ nextgroup=messagesHour \ nextgroup=messagesHour
syn match messagesHour contained display '\d\d:\d\d:\d\d\s*' syn match messagesHour contained display '\d\d:\d\d:\d\d\s*'

8
runtime/syntax/tex.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: TeX " Language: TeX
" Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM> " Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
" Last Change: Oct 20, 2015 " Last Change: Jan 20, 2016
" Version: 90 " Version: 91
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
" "
" Notes: {{{1 " Notes: {{{1
@ -129,8 +129,10 @@ endif
" g:tex_isk " g:tex_isk
if exists("g:tex_isk") if exists("g:tex_isk")
exe "setlocal isk=".g:tex_isk exe "setlocal isk=".g:tex_isk
elseif !has("patch-7.4.1141")
setl isk=48-57,a-z,A-Z,192-255
else else
setlocal isk=48-57,a-z,A-Z,192-255 syn iskeyword 48-57,a-z,A-Z,192-255
endif endif
if b:tex_stylish if b:tex_stylish
setlocal isk+=@-@ setlocal isk+=@-@

15
runtime/syntax/zsh.vim
View File

@ -2,7 +2,7 @@
" Language: Zsh shell script " Language: Zsh shell script
" Maintainer: Christian Brabandt <cb@256bit.org> " Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2015-12-25 " Latest Revision: 2016-01-25
" License: Vim (see :h license) " License: Vim (see :h license)
" Repository: https://github.com/chrisbra/vim-zsh " Repository: https://github.com/chrisbra/vim-zsh
@ -14,6 +14,7 @@ let s:cpo_save = &cpo
set cpo&vim set cpo&vim
setlocal iskeyword+=- setlocal iskeyword+=-
setlocal foldmethod=syntax
syn keyword zshTodo contained TODO FIXME XXX NOTE syn keyword zshTodo contained TODO FIXME XXX NOTE
@ -307,19 +308,19 @@ syn match zshNumber '[+-]\=\d\+\.\d\+\>'
" TODO: $[...] is the same as $((...)), so add that as well. " TODO: $[...] is the same as $((...)), so add that as well.
syn cluster zshSubst contains=zshSubst,zshOldSubst,zshMathSubst syn cluster zshSubst contains=zshSubst,zshOldSubst,zshMathSubst
syn region zshSubst matchgroup=zshSubstDelim transparent syn region zshSubst matchgroup=zshSubstDelim transparent
\ start='\$(' skip='\\)' end=')' contains=TOP \ start='\$(' skip='\\)' end=')' contains=TOP fold
syn region zshParentheses transparent start='(' skip='\\)' end=')' syn region zshParentheses transparent start='(' skip='\\)' end=')' fold
syn region zshMathSubst matchgroup=zshSubstDelim transparent syn region zshMathSubst matchgroup=zshSubstDelim transparent
\ start='\$((' skip='\\)' \ start='\$((' skip='\\)'
\ matchgroup=zshSubstDelim end='))' \ matchgroup=zshSubstDelim end='))'
\ contains=zshParentheses,@zshSubst,zshNumber, \ contains=zshParentheses,@zshSubst,zshNumber,
\ @zshDerefs,zshString keepend \ @zshDerefs,zshString keepend fold
syn region zshBrackets contained transparent start='{' skip='\\}' syn region zshBrackets contained transparent start='{' skip='\\}'
\ end='}' \ end='}' fold
syn region zshSubst matchgroup=zshSubstDelim start='\${' skip='\\}' syn region zshSubst matchgroup=zshSubstDelim start='\${' skip='\\}'
\ end='}' contains=@zshSubst,zshBrackets,zshQuoted,zshString \ end='}' contains=@zshSubst,zshBrackets,zshQuoted,zshString fold
syn region zshOldSubst matchgroup=zshSubstDelim start=+`+ skip=+\\`+ syn region zshOldSubst matchgroup=zshSubstDelim start=+`+ skip=+\\`+
\ end=+`+ contains=TOP,zshOldSubst \ end=+`+ contains=TOP,zshOldSubst fold
syn sync minlines=50 maxlines=90 syn sync minlines=50 maxlines=90
syn sync match zshHereDocSync grouphere NONE '<<-\=\s*\%(\\\=\S\+\|\(["']\)\S\+\1\)' syn sync match zshHereDocSync grouphere NONE '<<-\=\s*\%(\\\=\S\+\|\(["']\)\S\+\1\)'

180
src/nvim/po/ja.euc-jp.po
View File

@ -1,11 +1,11 @@
# Japanese translation for Vim vim:set foldmethod=marker: # Japanese translation for Vim
# #
# Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed. # Do ":help credits" in Vim to see a list of people who contributed.
# #
# Last Change: 2013 Jul 06 # Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
# #
# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
# #
# Generated from ja.po, DO NOT EDIT. # Generated from ja.po, DO NOT EDIT.
@ -14,10 +14,10 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim 7.4\n" "Project-Id-Version: Vim 7.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-05-26 14:21+0200\n" "POT-Creation-Date: 2016-02-01 09:02+0900\n"
"PO-Revision-Date: 2013-07-06 15:00+0900\n" "PO-Revision-Date: 2016-02-01 09:08+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n" "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n" "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n" "Language: Japanese\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n" "Content-Type: text/plain; charset=euc-jp\n"
@ -34,7 +34,7 @@ msgstr "
#: ../buffer.c:92 #: ../buffer.c:92
msgid "[Location List]" msgid "[Location List]"
msgstr "[場所リスト]" msgstr "[ロケーションリスト]"
#: ../buffer.c:93 #: ../buffer.c:93
msgid "[Quickfix List]" msgid "[Quickfix List]"
@ -277,7 +277,7 @@ msgstr "E810:
#: ../diff.c:755 #: ../diff.c:755
msgid "E97: Cannot create diffs" msgid "E97: Cannot create diffs"
msgstr "E97: 差分を作成できません " msgstr "E97: 差分を作成できません"
#: ../diff.c:966 #: ../diff.c:966
msgid "E816: Cannot read patch output" msgid "E816: Cannot read patch output"
@ -293,7 +293,7 @@ msgstr "E99:
#: ../diff.c:2100 #: ../diff.c:2100
msgid "E793: No other buffer in diff mode is modifiable" msgid "E793: No other buffer in diff mode is modifiable"
msgstr "E793: 差分モードである他のバッファは変更可能です" msgstr "E793: 差分モードである他のバッファは変更できません"
#: ../diff.c:2102 #: ../diff.c:2102
msgid "E100: No other buffer in diff mode" msgid "E100: No other buffer in diff mode"
@ -349,7 +349,7 @@ msgstr "
#: ../edit.c:86 #: ../edit.c:86
msgid " File name completion (^F^N^P)" msgid " File name completion (^F^N^P)"
msgstr "ファイル名補完 (^F^N^P)" msgstr " ファイル名補完 (^F^N^P)"
#: ../edit.c:87 #: ../edit.c:87
msgid " Tag completion (^]^N^P)" msgid " Tag completion (^]^N^P)"
@ -377,7 +377,7 @@ msgstr "
#: ../edit.c:94 #: ../edit.c:94
msgid " User defined completion (^U^N^P)" msgid " User defined completion (^U^N^P)"
msgstr " ユーザ定義補完 (^U^N^P)" msgstr " ユーザー定義補完 (^U^N^P)"
#: ../edit.c:95 #: ../edit.c:95
msgid " Omni completion (^O^N^P)" msgid " Omni completion (^O^N^P)"
@ -679,6 +679,11 @@ msgstr "E696:
msgid "E697: Missing end of List ']': %s" msgid "E697: Missing end of List ']': %s"
msgstr "E697: リスト型の最後に ']' がありません: %s" msgstr "E697: リスト型の最後に ']' がありません: %s"
#: ../eval.c:5807
msgid "Not enough memory to set references, garbage collection aborted!"
msgstr ""
"ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
#: ../eval.c:6475 #: ../eval.c:6475
#, c-format #, c-format
msgid "E720: Missing colon in Dictionary: %s" msgid "E720: Missing colon in Dictionary: %s"
@ -721,7 +726,7 @@ msgstr "E117: ̤
#: ../eval.c:7383 #: ../eval.c:7383
#, c-format #, c-format
msgid "E119: Not enough arguments for function: %s" msgid "E119: Not enough arguments for function: %s"
msgstr "E119: 関数の引数が少な過ぎます: %s" msgstr "E119: 関数の引数が足りません: %s"
#: ../eval.c:7387 #: ../eval.c:7387
#, c-format #, c-format
@ -826,18 +831,16 @@ msgid "sort() argument"
msgstr "sort() の引数" msgstr "sort() の引数"
#: ../eval.c:13721 #: ../eval.c:13721
#, fuzzy
msgid "uniq() argument" msgid "uniq() argument"
msgstr "add() の引数" msgstr "uniq() の引数"
#: ../eval.c:13776 #: ../eval.c:13776
msgid "E702: Sort compare function failed" msgid "E702: Sort compare function failed"
msgstr "E702: ソートの比較関数が失敗しました" msgstr "E702: ソートの比較関数が失敗しました"
#: ../eval.c:13806 #: ../eval.c:13806
#, fuzzy
msgid "E882: Uniq compare function failed" msgid "E882: Uniq compare function failed"
msgstr "E702: ソートの比較関数が失敗しました" msgstr "E882: Uniq の比較関数が失敗しました"
#: ../eval.c:14085 #: ../eval.c:14085
msgid "(Invalid)" msgid "(Invalid)"
@ -863,6 +866,18 @@ msgstr "E745:
msgid "E728: Using a Dictionary as a Number" msgid "E728: Using a Dictionary as a Number"
msgstr "E728: 辞書型を数値として扱っています" msgstr "E728: 辞書型を数値として扱っています"
msgid "E891: Using a Funcref as a Float"
msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
msgid "E892: Using a String as a Float"
msgstr "E892: 文字列を浮動小数点数として扱っています"
msgid "E893: Using a List as a Float"
msgstr "E893: リスト型を浮動小数点数として扱っています"
msgid "E894: Using a Dictionary as a Float"
msgstr "E894: 辞書型を浮動小数点数として扱っています"
#: ../eval.c:16259 #: ../eval.c:16259
msgid "E729: using Funcref as a String" msgid "E729: using Funcref as a String"
msgstr "E729: 関数参照型を文字列として扱っています" msgstr "E729: 関数参照型を文字列として扱っています"
@ -961,14 +976,14 @@ msgid "E129: Function name required"
msgstr "E129: 関数名が要求されます" msgstr "E129: 関数名が要求されます"
#: ../eval.c:17824 #: ../eval.c:17824
#, fuzzy, c-format #, c-format
msgid "E128: Function name must start with a capital or \"s:\": %s" msgid "E128: Function name must start with a capital or \"s:\": %s"
msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s" msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
#: ../eval.c:17833 #: ../eval.c:17833
#, fuzzy, c-format #, c-format
msgid "E884: Function name cannot contain a colon: %s" msgid "E884: Function name cannot contain a colon: %s"
msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s" msgstr "E884: 関数名にはコロンは含められません: %s"
#: ../eval.c:18336 #: ../eval.c:18336
#, c-format #, c-format
@ -1081,7 +1096,7 @@ msgstr "E136: viminfo:
#: ../ex_cmds.c:1458 #: ../ex_cmds.c:1458
#, c-format #, c-format
msgid "Reading viminfo file \"%s\"%s%s%s" msgid "Reading viminfo file \"%s\"%s%s%s"
msgstr "viminfoファイル \"%s\"%s%s%s を読込み中 " msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
#: ../ex_cmds.c:1460 #: ../ex_cmds.c:1460
msgid " info" msgid " info"
@ -1357,6 +1372,10 @@ msgstr "E158: ̵
msgid "E157: Invalid sign ID: %<PRId64>" msgid "E157: Invalid sign ID: %<PRId64>"
msgstr "E157: 無効なsign識別子です: %<PRId64>" msgstr "E157: 無効なsign識別子です: %<PRId64>"
#, c-format
msgid "E885: Not possible to change sign %s"
msgstr "E885: 変更できない sign です: %s"
#: ../ex_cmds.c:6066 #: ../ex_cmds.c:6066
msgid " (not supported)" msgid " (not supported)"
msgstr " (非サポート)" msgstr " (非サポート)"
@ -1379,6 +1398,13 @@ msgstr "
msgid "cmd: %s" msgid "cmd: %s"
msgstr "コマンド: %s" msgstr "コマンド: %s"
msgid "frame is zero"
msgstr "フレームが 0 です"
#, c-format
msgid "frame at highest level: %d"
msgstr "最高レベルのフレーム: %d"
#: ../ex_cmds2.c:322 #: ../ex_cmds2.c:322
#, c-format #, c-format
msgid "Breakpoint in \"%s%s\" line %<PRId64>" msgid "Breakpoint in \"%s%s\" line %<PRId64>"
@ -1528,7 +1554,8 @@ msgstr "E197:
#. don't wait for return #. don't wait for return
#: ../ex_docmd.c:387 #: ../ex_docmd.c:387
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "Exモードに入ります. ノーマルに戻るには\"visual\"と入力してください." msgstr ""
"Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください."
#: ../ex_docmd.c:428 #: ../ex_docmd.c:428
msgid "E501: At end-of-file" msgid "E501: At end-of-file"
@ -1553,7 +1580,7 @@ msgstr "
#: ../ex_docmd.c:1628 #: ../ex_docmd.c:1628
msgid "E464: Ambiguous use of user-defined command" msgid "E464: Ambiguous use of user-defined command"
msgstr "E464: ユーザ定義コマンドのあいまいな使用です" msgstr "E464: ユーザー定義コマンドのあいまいな使用です"
#: ../ex_docmd.c:1638 #: ../ex_docmd.c:1638
msgid "E492: Not an editor command" msgid "E492: Not an editor command"
@ -1606,14 +1633,14 @@ msgstr "E174:
#: ../ex_docmd.c:4432 #: ../ex_docmd.c:4432
msgid "" msgid ""
"\n" "\n"
" Name Args Range Complete Definition" " Name Args Address Complete Definition"
msgstr "" msgstr ""
"\n" "\n"
" 名前 引数 範囲 補完 定義" " 名前 引数 アドレス 補完 定義"
#: ../ex_docmd.c:4516 #: ../ex_docmd.c:4516
msgid "No user-defined commands found" msgid "No user-defined commands found"
msgstr "ユーザ定義コマンドが見つかりませんでした" msgstr "ユーザー定義コマンドが見つかりませんでした"
#: ../ex_docmd.c:4538 #: ../ex_docmd.c:4538
msgid "E175: No attribute specified" msgid "E175: No attribute specified"
@ -1633,7 +1660,10 @@ msgstr "E178:
#: ../ex_docmd.c:4625 #: ../ex_docmd.c:4625
msgid "E179: argument required for -complete" msgid "E179: argument required for -complete"
msgstr "E179: -補完のための引数が必要です" msgstr "E179: -complete には引数が必要です"
msgid "E179: argument required for -addr"
msgstr "E179: -addr には引数が必要です"
#: ../ex_docmd.c:4635 #: ../ex_docmd.c:4635
#, c-format #, c-format
@ -1650,12 +1680,16 @@ msgstr "E183:
#: ../ex_docmd.c:4696 #: ../ex_docmd.c:4696
msgid "E841: Reserved name, cannot be used for user defined command" msgid "E841: Reserved name, cannot be used for user defined command"
msgstr "E841: 予約名なので, ユーザ定義コマンドに利用できません" msgstr "E841: 予約名なので, ユーザー定義コマンドに利用できません"
#: ../ex_docmd.c:4751 #: ../ex_docmd.c:4751
#, c-format #, c-format
msgid "E184: No such user-defined command: %s" msgid "E184: No such user-defined command: %s"
msgstr "E184: そのユーザ定義コマンドはありません: %s" msgstr "E184: そのユーザー定義コマンドはありません: %s"
#, c-format
msgid "E180: Invalid address type value: %s"
msgstr "E180: 無効なアドレスタイプ値です: %s"
#: ../ex_docmd.c:5219 #: ../ex_docmd.c:5219
#, c-format #, c-format
@ -2019,11 +2053,11 @@ msgstr "
#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578 #: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
msgid "is a directory" msgid "is a directory"
msgstr " はディレクトリです" msgstr "はディレクトリです"
#: ../fileio.c:397 #: ../fileio.c:397
msgid "is not a file" msgid "is not a file"
msgstr " はファイルではありません" msgstr "はファイルではありません"
#: ../fileio.c:508 ../fileio.c:3522 #: ../fileio.c:508 ../fileio.c:3522
msgid "[New File]" msgid "[New File]"
@ -2039,7 +2073,7 @@ msgstr "[
#: ../fileio.c:534 #: ../fileio.c:534
msgid "[Permission Denied]" msgid "[Permission Denied]"
msgstr "[認可がありません]" msgstr "[権限がありません]"
#: ../fileio.c:653 #: ../fileio.c:653
msgid "E200: *ReadPre autocommands made the file unreadable" msgid "E200: *ReadPre autocommands made the file unreadable"
@ -2210,7 +2244,7 @@ msgstr "
#: ../fileio.c:3509 #: ../fileio.c:3509
#, c-format #, c-format
msgid " in line %<PRId64>;" msgid " in line %<PRId64>;"
msgstr "行 %<PRId64>;" msgstr " 行 %<PRId64>;"
#: ../fileio.c:3519 #: ../fileio.c:3519
msgid "[Device]" msgid "[Device]"
@ -2766,9 +2800,8 @@ msgid "E37: No write since last change (add ! to override)"
msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)" msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
#: ../globals.h:1055 #: ../globals.h:1055
#, fuzzy
msgid "E37: No write since last change" msgid "E37: No write since last change"
msgstr "[最後の変更が保存されていません]\n" msgstr "E37: 最後の変更が保存されていません"
#: ../globals.h:1056 #: ../globals.h:1056
msgid "E38: Null argument" msgid "E38: Null argument"
@ -2810,7 +2843,7 @@ msgstr "E42:
#: ../globals.h:1067 #: ../globals.h:1067
msgid "E776: No location list" msgid "E776: No location list"
msgstr "E776: 場所リストはありません" msgstr "E776: ロケーションリストはありません"
#: ../globals.h:1068 #: ../globals.h:1068
msgid "E43: Damaged match string" msgid "E43: Damaged match string"
@ -3831,7 +3864,7 @@ msgid ""
"\n" "\n"
msgstr "" msgstr ""
"\n" "\n"
"それから.swpファイルを削除してください\n" "元の.swpファイルは削除しても構いません\n"
"\n" "\n"
#. use msg() to start the scrolling properly #. use msg() to start the scrolling properly
@ -3845,7 +3878,7 @@ msgstr "
#: ../memline.c:1448 #: ../memline.c:1448
msgid " Using specified name:\n" msgid " Using specified name:\n"
msgstr " ある名前を使用中:\n" msgstr " 以下の名前を使用中:\n"
#: ../memline.c:1450 #: ../memline.c:1450
msgid " In directory " msgid " In directory "
@ -3901,7 +3934,7 @@ msgid ""
" user name: " " user name: "
msgstr "" msgstr ""
"\n" "\n"
" ユーザ名: " " ユーザー名: "
#: ../memline.c:1568 #: ../memline.c:1568
msgid " host name: " msgid " host name: "
@ -4050,12 +4083,12 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"(1) 別のプログラムが同じファイルを編集しているかもしれません.\n" "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
" この場合には, 変更をした際に最終的に, 同じファイルの異なる\n" " この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
" 2つのインスタンスができてしまうことに注意してください." " インスタンスができてしまうので, そうしないように気をつけてください."
#: ../memline.c:3245 #: ../memline.c:3245
msgid " Quit, or continue with caution.\n" msgid " Quit, or continue with caution.\n"
msgstr " 終了するか, 注意しながら続けてください.\n" msgstr " 終了するか, 注意しながら続けてください.\n"
#: ../memline.c:3246 #: ../memline.c:3246
msgid "(2) An edit session for this file crashed.\n" msgid "(2) An edit session for this file crashed.\n"
@ -4479,6 +4512,11 @@ msgstr ""
msgid "E574: Unknown register type %d" msgid "E574: Unknown register type %d"
msgstr "E574: 未知のレジスタ型 %d です" msgstr "E574: 未知のレジスタ型 %d です"
msgid ""
"E883: search pattern and expression register may not contain two or more "
"lines"
msgstr "E883: 検索パターンと式レジスタには2行以上を含められません"
#: ../ops.c:5089 #: ../ops.c:5089
#, c-format #, c-format
msgid "%<PRId64> Cols; " msgid "%<PRId64> Cols; "
@ -4563,6 +4601,10 @@ msgstr "E522: termcap
msgid "E539: Illegal character <%s>" msgid "E539: Illegal character <%s>"
msgstr "E539: 不正な文字です <%s>" msgstr "E539: 不正な文字です <%s>"
#, c-format
msgid "For option %s"
msgstr "オプション: %s"
#: ../option.c:3862 #: ../option.c:3862
msgid "E529: Cannot set 'term' to empty string" msgid "E529: Cannot set 'term' to empty string"
msgstr "E529: 'term' には空文字列を設定できません" msgstr "E529: 'term' には空文字列を設定できません"
@ -4740,6 +4782,14 @@ msgstr ""
"\n" "\n"
"セキュリティコンテキストを設定できません " "セキュリティコンテキストを設定できません "
#, c-format
msgid "Could not set security context %s for %s"
msgstr "セキュリティコンテキスト %s を %s に設定できません"
#, c-format
msgid "Could not get security context %s for %s. Removing it!"
msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
#: ../os_unix.c:1558 ../os_unix.c:1647 #: ../os_unix.c:1558 ../os_unix.c:1647
#, c-format #, c-format
msgid "dlerror = \"%s\"" msgid "dlerror = \"%s\""
@ -4960,6 +5010,10 @@ msgstr "E554: %s{...}
msgid "External submatches:\n" msgid "External submatches:\n"
msgstr "外部の部分該当:\n" msgstr "外部の部分該当:\n"
#, c-format
msgid "E888: (NFA regexp) cannot repeat %s"
msgstr "E888: (NFA 正規表現) 繰り返せません %s"
#: ../regexp.c:7022 #: ../regexp.c:7022
msgid "" msgid ""
"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
@ -4968,6 +5022,9 @@ msgstr ""
"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選" "E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選"
"択されます。" "択されます。"
msgid "Switching to backtracking RE engine for pattern: "
msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
#: ../regexp_nfa.c:239 #: ../regexp_nfa.c:239
msgid "E865: (NFA) Regexp end encountered prematurely" msgid "E865: (NFA) Regexp end encountered prematurely"
msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました" msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました"
@ -4980,7 +5037,7 @@ msgstr "E866: (NFA
#: ../regexp_nfa.c:242 #: ../regexp_nfa.c:242
#, c-format #, c-format
msgid "E877: (NFA regexp) Invalid character class: %<PRId64>" msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
msgstr "" msgstr "E877: (NFA 正規表現) 無効な文字クラス: %<PRId64>"
#: ../regexp_nfa.c:1261 #: ../regexp_nfa.c:1261
#, c-format #, c-format
@ -5590,14 +5647,14 @@ msgid "E765: 'spellfile' does not have %<PRId64> entries"
msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません" msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません"
#: ../spell.c:8074 #: ../spell.c:8074
#, fuzzy, c-format #, c-format
msgid "Word '%.*s' removed from %s" msgid "Word '%.*s' removed from %s"
msgstr "%s から単語が削除されました" msgstr "単語 '%.*s' が %s から削除されました"
#: ../spell.c:8117 #: ../spell.c:8117
#, fuzzy, c-format #, c-format
msgid "Word '%.*s' added to %s" msgid "Word '%.*s' added to %s"
msgstr "%s に単語が追加されました" msgstr "単語 '%.*s' が %s へ追加されました"
#: ../spell.c:8381 #: ../spell.c:8381
msgid "E763: Word characters differ between spell files" msgid "E763: Word characters differ between spell files"
@ -5673,6 +5730,9 @@ msgstr "
msgid "E390: Illegal argument: %s" msgid "E390: Illegal argument: %s"
msgstr "E390: 不正な引数です: %s" msgstr "E390: 不正な引数です: %s"
msgid "syntax iskeyword "
msgstr "シンタックス用 iskeyword "
#: ../syntax.c:3299 #: ../syntax.c:3299
#, c-format #, c-format
msgid "E391: No such syntax cluster: %s" msgid "E391: No such syntax cluster: %s"
@ -5769,6 +5829,10 @@ msgstr "E847:
msgid "E789: Missing ']': %s" msgid "E789: Missing ']': %s"
msgstr "E789: ']' がありません: %s" msgstr "E789: ']' がありません: %s"
#, c-format
msgid "E890: trailing char after ']': %s]%s"
msgstr "E890: ']' の後ろに余分な文字があります: %s]%s"
#: ../syntax.c:4531 #: ../syntax.c:4531
#, c-format #, c-format
msgid "E398: Missing '=': %s" msgid "E398: Missing '=': %s"
@ -5874,7 +5938,7 @@ msgstr "E415: ͽ
#: ../syntax.c:6395 #: ../syntax.c:6395
#, c-format #, c-format
msgid "E416: missing equal sign: %s" msgid "E416: missing equal sign: %s"
msgstr "E416: 等号ががありません: %s" msgstr "E416: 等号がありません: %s"
#: ../syntax.c:6418 #: ../syntax.c:6418
#, c-format #, c-format
@ -6078,9 +6142,8 @@ msgstr "Vim:
#. This happens when the FileChangedRO autocommand changes the #. This happens when the FileChangedRO autocommand changes the
#. * file in a way it becomes shorter. #. * file in a way it becomes shorter.
#: ../undo.c:379 #: ../undo.c:379
#, fuzzy
msgid "E881: Line count changed unexpectedly" msgid "E881: Line count changed unexpectedly"
msgstr "E834: 予期せず行カウントが変わりました" msgstr "E881: 予期せず行カウントが変わりました"
#: ../undo.c:627 #: ../undo.c:627
#, c-format #, c-format
@ -6287,23 +6350,23 @@ msgstr "
#: ../version.c:672 #: ../version.c:672
msgid " user vimrc file: \"" msgid " user vimrc file: \""
msgstr " ユーザ vimrc: \"" msgstr " ユーザー vimrc: \""
#: ../version.c:677 #: ../version.c:677
msgid " 2nd user vimrc file: \"" msgid " 2nd user vimrc file: \""
msgstr " 第2ユーザ vimrc: \"" msgstr " 第2ユーザー vimrc: \""
#: ../version.c:682 #: ../version.c:682
msgid " 3rd user vimrc file: \"" msgid " 3rd user vimrc file: \""
msgstr " 第3ユーザ vimrc: \"" msgstr " 第3ユーザー vimrc: \""
#: ../version.c:687 #: ../version.c:687
msgid " user exrc file: \"" msgid " user exrc file: \""
msgstr " ユーザ exrc: \"" msgstr " ユーザー exrc: \""
#: ../version.c:692 #: ../version.c:692
msgid " 2nd user exrc file: \"" msgid " 2nd user exrc file: \""
msgstr " 第2ユーザ exrc: \"" msgstr " 第2ユーザー exrc: \""
#: ../version.c:699 #: ../version.c:699
msgid " fall-back for $VIM: \"" msgid " fall-back for $VIM: \""
@ -6379,7 +6442,7 @@ msgstr "Vim
#: ../version.c:828 #: ../version.c:828
msgid "Become a registered Vim user!" msgid "Become a registered Vim user!"
msgstr "Vimの登録ユーザになってください!" msgstr "Vimの登録ユーザーになってください!"
#: ../version.c:831 #: ../version.c:831
msgid "type :help sponsor<Enter> for information " msgid "type :help sponsor<Enter> for information "
@ -6391,7 +6454,7 @@ msgstr "
#: ../version.c:834 #: ../version.c:834
msgid "menu Help->Sponsor/Register for information " msgid "menu Help->Sponsor/Register for information "
msgstr "詳細はメニューの ヘルプ→スポンサー/登録 を参照して下さい " msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
#: ../window.c:119 #: ../window.c:119
msgid "Already only one window" msgid "Already only one window"
@ -6429,6 +6492,9 @@ msgstr "E445: ¾
msgid "E446: No file name under cursor" msgid "E446: No file name under cursor"
msgstr "E446: カーソルの下にファイル名がありません" msgstr "E446: カーソルの下にファイル名がありません"
msgid "List or number required"
msgstr "リストか数値が必要です"
#~ msgid "E831: bf_key_init() called with empty password" #~ msgid "E831: bf_key_init() called with empty password"
#~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました" #~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました"

179
src/nvim/po/ja.po
View File

@ -1,11 +1,11 @@
# Japanese translation for Vim vim:set foldmethod=marker: # Japanese translation for Vim
# #
# Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed. # Do ":help credits" in Vim to see a list of people who contributed.
# #
# Last Change: 2013 Jul 06 # Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
# #
# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
# #
# Original translations. # Original translations.
@ -14,10 +14,10 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim 7.4\n" "Project-Id-Version: Vim 7.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-05-26 14:21+0200\n" "POT-Creation-Date: 2016-02-01 09:02+0900\n"
"PO-Revision-Date: 2013-07-06 15:00+0900\n" "PO-Revision-Date: 2013-06-02-01 09:08+09n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n" "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n" "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n" "Language: Japanese\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
@ -34,7 +34,7 @@ msgstr "内部エラー: 未知のオプション型です"
#: ../buffer.c:92 #: ../buffer.c:92
msgid "[Location List]" msgid "[Location List]"
msgstr "[場所リスト]" msgstr "[ロケーションリスト]"
#: ../buffer.c:93 #: ../buffer.c:93
msgid "[Quickfix List]" msgid "[Quickfix List]"
@ -277,7 +277,7 @@ msgstr "E810: 一時ファイルの読込もしくは書込ができません"
#: ../diff.c:755 #: ../diff.c:755
msgid "E97: Cannot create diffs" msgid "E97: Cannot create diffs"
msgstr "E97: 差分を作成できません " msgstr "E97: 差分を作成できません"
#: ../diff.c:966 #: ../diff.c:966
msgid "E816: Cannot read patch output" msgid "E816: Cannot read patch output"
@ -293,7 +293,7 @@ msgstr "E99: 現在のバッファは差分モードではありません"
#: ../diff.c:2100 #: ../diff.c:2100
msgid "E793: No other buffer in diff mode is modifiable" msgid "E793: No other buffer in diff mode is modifiable"
msgstr "E793: 差分モードである他のバッファは変更可能です" msgstr "E793: 差分モードである他のバッファは変更できません"
#: ../diff.c:2102 #: ../diff.c:2102
msgid "E100: No other buffer in diff mode" msgid "E100: No other buffer in diff mode"
@ -349,7 +349,7 @@ msgstr " 行(全体)補完 (^L^N^P)"
#: ../edit.c:86 #: ../edit.c:86
msgid " File name completion (^F^N^P)" msgid " File name completion (^F^N^P)"
msgstr "ファイル名補完 (^F^N^P)" msgstr " ファイル名補完 (^F^N^P)"
#: ../edit.c:87 #: ../edit.c:87
msgid " Tag completion (^]^N^P)" msgid " Tag completion (^]^N^P)"
@ -377,7 +377,7 @@ msgstr " コマンドライン補完 (^V^N^P)"
#: ../edit.c:94 #: ../edit.c:94
msgid " User defined completion (^U^N^P)" msgid " User defined completion (^U^N^P)"
msgstr " ユーザ定義補完 (^U^N^P)" msgstr " ユーザー定義補完 (^U^N^P)"
#: ../edit.c:95 #: ../edit.c:95
msgid " Omni completion (^O^N^P)" msgid " Omni completion (^O^N^P)"
@ -679,6 +679,10 @@ msgstr "E696: リスト型にカンマがありません: %s"
msgid "E697: Missing end of List ']': %s" msgid "E697: Missing end of List ']': %s"
msgstr "E697: リスト型の最後に ']' がありません: %s" msgstr "E697: リスト型の最後に ']' がありません: %s"
msgid "Not enough memory to set references, garbage collection aborted!"
msgstr ""
"ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
#: ../eval.c:6475 #: ../eval.c:6475
#, c-format #, c-format
msgid "E720: Missing colon in Dictionary: %s" msgid "E720: Missing colon in Dictionary: %s"
@ -721,7 +725,7 @@ msgstr "E117: 未知の関数です: %s"
#: ../eval.c:7383 #: ../eval.c:7383
#, c-format #, c-format
msgid "E119: Not enough arguments for function: %s" msgid "E119: Not enough arguments for function: %s"
msgstr "E119: 関数の引数が少な過ぎます: %s" msgstr "E119: 関数の引数が足りません: %s"
#: ../eval.c:7387 #: ../eval.c:7387
#, c-format #, c-format
@ -826,18 +830,16 @@ msgid "sort() argument"
msgstr "sort() の引数" msgstr "sort() の引数"
#: ../eval.c:13721 #: ../eval.c:13721
#, fuzzy
msgid "uniq() argument" msgid "uniq() argument"
msgstr "add() の引数" msgstr "uniq() の引数"
#: ../eval.c:13776 #: ../eval.c:13776
msgid "E702: Sort compare function failed" msgid "E702: Sort compare function failed"
msgstr "E702: ソートの比較関数が失敗しました" msgstr "E702: ソートの比較関数が失敗しました"
#: ../eval.c:13806 #: ../eval.c:13806
#, fuzzy
msgid "E882: Uniq compare function failed" msgid "E882: Uniq compare function failed"
msgstr "E702: ソートの比較関数が失敗しました" msgstr "E882: Uniq の比較関数が失敗しました"
#: ../eval.c:14085 #: ../eval.c:14085
msgid "(Invalid)" msgid "(Invalid)"
@ -863,6 +865,18 @@ msgstr "E745: リスト型を数値として扱っています"
msgid "E728: Using a Dictionary as a Number" msgid "E728: Using a Dictionary as a Number"
msgstr "E728: 辞書型を数値として扱っています" msgstr "E728: 辞書型を数値として扱っています"
msgid "E891: Using a Funcref as a Float"
msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
msgid "E892: Using a String as a Float"
msgstr "E892: 文字列を浮動小数点数として扱っています"
msgid "E893: Using a List as a Float"
msgstr "E893: リスト型を浮動小数点数として扱っています"
msgid "E894: Using a Dictionary as a Float"
msgstr "E894: 辞書型を浮動小数点数として扱っています"
#: ../eval.c:16259 #: ../eval.c:16259
msgid "E729: using Funcref as a String" msgid "E729: using Funcref as a String"
msgstr "E729: 関数参照型を文字列として扱っています" msgstr "E729: 関数参照型を文字列として扱っています"
@ -961,14 +975,14 @@ msgid "E129: Function name required"
msgstr "E129: 関数名が要求されます" msgstr "E129: 関数名が要求されます"
#: ../eval.c:17824 #: ../eval.c:17824
#, fuzzy, c-format #, c-format
msgid "E128: Function name must start with a capital or \"s:\": %s" msgid "E128: Function name must start with a capital or \"s:\": %s"
msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s" msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
#: ../eval.c:17833 #: ../eval.c:17833
#, fuzzy, c-format #, c-format
msgid "E884: Function name cannot contain a colon: %s" msgid "E884: Function name cannot contain a colon: %s"
msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s" msgstr "E884: 関数名にはコロンは含められません: %s"
#: ../eval.c:18336 #: ../eval.c:18336
#, c-format #, c-format
@ -1081,7 +1095,7 @@ msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップし
#: ../ex_cmds.c:1458 #: ../ex_cmds.c:1458
#, c-format #, c-format
msgid "Reading viminfo file \"%s\"%s%s%s" msgid "Reading viminfo file \"%s\"%s%s%s"
msgstr "viminfoファイル \"%s\"%s%s%s を読込み中 " msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
#: ../ex_cmds.c:1460 #: ../ex_cmds.c:1460
msgid " info" msgid " info"
@ -1357,6 +1371,10 @@ msgstr "E158: 無効なバッファ名です: %s"
msgid "E157: Invalid sign ID: %<PRId64>" msgid "E157: Invalid sign ID: %<PRId64>"
msgstr "E157: 無効なsign識別子です: %<PRId64>" msgstr "E157: 無効なsign識別子です: %<PRId64>"
#, c-format
msgid "E885: Not possible to change sign %s"
msgstr "E885: 変更できない sign です: %s"
#: ../ex_cmds.c:6066 #: ../ex_cmds.c:6066
msgid " (not supported)" msgid " (not supported)"
msgstr " (非サポート)" msgstr " (非サポート)"
@ -1379,6 +1397,13 @@ msgstr "行 %<PRId64>: %s"
msgid "cmd: %s" msgid "cmd: %s"
msgstr "コマンド: %s" msgstr "コマンド: %s"
msgid "frame is zero"
msgstr "フレームが 0 です"
#, c-format
msgid "frame at highest level: %d"
msgstr "最高レベルのフレーム: %d"
#: ../ex_cmds2.c:322 #: ../ex_cmds2.c:322
#, c-format #, c-format
msgid "Breakpoint in \"%s%s\" line %<PRId64>" msgid "Breakpoint in \"%s%s\" line %<PRId64>"
@ -1528,7 +1553,8 @@ msgstr "E197: 言語を \"%s\" に設定できません"
#. don't wait for return #. don't wait for return
#: ../ex_docmd.c:387 #: ../ex_docmd.c:387
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "Exモードに入ります. ノーマルに戻るには\"visual\"と入力してください." msgstr ""
"Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください."
#: ../ex_docmd.c:428 #: ../ex_docmd.c:428
msgid "E501: At end-of-file" msgid "E501: At end-of-file"
@ -1553,7 +1579,7 @@ msgstr "関数の最後です"
#: ../ex_docmd.c:1628 #: ../ex_docmd.c:1628
msgid "E464: Ambiguous use of user-defined command" msgid "E464: Ambiguous use of user-defined command"
msgstr "E464: ユーザ定義コマンドのあいまいな使用です" msgstr "E464: ユーザー定義コマンドのあいまいな使用です"
#: ../ex_docmd.c:1638 #: ../ex_docmd.c:1638
msgid "E492: Not an editor command" msgid "E492: Not an editor command"
@ -1606,14 +1632,14 @@ msgstr "E174: コマンドが既にあります: 再定義するには ! を追
#: ../ex_docmd.c:4432 #: ../ex_docmd.c:4432
msgid "" msgid ""
"\n" "\n"
" Name Args Range Complete Definition" " Name Args Address Complete Definition"
msgstr "" msgstr ""
"\n" "\n"
" 名前 引数 範囲 補完 定義" " 名前 引数 アドレス 補完 定義"
#: ../ex_docmd.c:4516 #: ../ex_docmd.c:4516
msgid "No user-defined commands found" msgid "No user-defined commands found"
msgstr "ユーザ定義コマンドが見つかりませんでした" msgstr "ユーザー定義コマンドが見つかりませんでした"
#: ../ex_docmd.c:4538 #: ../ex_docmd.c:4538
msgid "E175: No attribute specified" msgid "E175: No attribute specified"
@ -1633,7 +1659,10 @@ msgstr "E178: カウントの省略値が無効です"
#: ../ex_docmd.c:4625 #: ../ex_docmd.c:4625
msgid "E179: argument required for -complete" msgid "E179: argument required for -complete"
msgstr "E179: -補完のための引数が必要です" msgstr "E179: -complete には引数が必要です"
msgid "E179: argument required for -addr"
msgstr "E179: -addr には引数が必要です"
#: ../ex_docmd.c:4635 #: ../ex_docmd.c:4635
#, c-format #, c-format
@ -1646,16 +1675,20 @@ msgstr "E182: 無効なコマンド名です"
#: ../ex_docmd.c:4691 #: ../ex_docmd.c:4691
msgid "E183: User defined commands must start with an uppercase letter" msgid "E183: User defined commands must start with an uppercase letter"
msgstr "E183: ユーザ定義コマンドは英大文字で始まらなければなりません" msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
#: ../ex_docmd.c:4696 #: ../ex_docmd.c:4696
msgid "E841: Reserved name, cannot be used for user defined command" msgid "E841: Reserved name, cannot be used for user defined command"
msgstr "E841: 予約名なので, ユーザ定義コマンドに利用できません" msgstr "E841: 予約名なので, ユーザー定義コマンドに利用できません"
#: ../ex_docmd.c:4751 #: ../ex_docmd.c:4751
#, c-format #, c-format
msgid "E184: No such user-defined command: %s" msgid "E184: No such user-defined command: %s"
msgstr "E184: そのユーザ定義コマンドはありません: %s" msgstr "E184: そのユーザー定義コマンドはありません: %s"
#, c-format
msgid "E180: Invalid address type value: %s"
msgstr "E180: 無効なアドレスタイプ値です: %s"
#: ../ex_docmd.c:5219 #: ../ex_docmd.c:5219
#, c-format #, c-format
@ -2019,11 +2052,11 @@ msgstr "不正なファイル名"
#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578 #: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
msgid "is a directory" msgid "is a directory"
msgstr " はディレクトリです" msgstr "はディレクトリです"
#: ../fileio.c:397 #: ../fileio.c:397
msgid "is not a file" msgid "is not a file"
msgstr " はファイルではありません" msgstr "はファイルではありません"
#: ../fileio.c:508 ../fileio.c:3522 #: ../fileio.c:508 ../fileio.c:3522
msgid "[New File]" msgid "[New File]"
@ -2039,7 +2072,7 @@ msgstr "[ファイル過大]"
#: ../fileio.c:534 #: ../fileio.c:534
msgid "[Permission Denied]" msgid "[Permission Denied]"
msgstr "[認可がありません]" msgstr "[権限がありません]"
#: ../fileio.c:653 #: ../fileio.c:653
msgid "E200: *ReadPre autocommands made the file unreadable" msgid "E200: *ReadPre autocommands made the file unreadable"
@ -2210,7 +2243,7 @@ msgstr " 変換エラー"
#: ../fileio.c:3509 #: ../fileio.c:3509
#, c-format #, c-format
msgid " in line %<PRId64>;" msgid " in line %<PRId64>;"
msgstr "行 %<PRId64>;" msgstr " 行 %<PRId64>;"
#: ../fileio.c:3519 #: ../fileio.c:3519
msgid "[Device]" msgid "[Device]"
@ -2766,9 +2799,8 @@ msgid "E37: No write since last change (add ! to override)"
msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)" msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
#: ../globals.h:1055 #: ../globals.h:1055
#, fuzzy
msgid "E37: No write since last change" msgid "E37: No write since last change"
msgstr "[最後の変更が保存されていません]\n" msgstr "E37: 最後の変更が保存されていません"
#: ../globals.h:1056 #: ../globals.h:1056
msgid "E38: Null argument" msgid "E38: Null argument"
@ -2810,7 +2842,7 @@ msgstr "E42: エラーはありません"
#: ../globals.h:1067 #: ../globals.h:1067
msgid "E776: No location list" msgid "E776: No location list"
msgstr "E776: 場所リストはありません" msgstr "E776: ロケーションリストはありません"
#: ../globals.h:1068 #: ../globals.h:1068
msgid "E43: Damaged match string" msgid "E43: Damaged match string"
@ -3831,7 +3863,7 @@ msgid ""
"\n" "\n"
msgstr "" msgstr ""
"\n" "\n"
"それから.swpファイルを削除してください\n" "元の.swpファイルは削除しても構いません\n"
"\n" "\n"
#. use msg() to start the scrolling properly #. use msg() to start the scrolling properly
@ -3845,7 +3877,7 @@ msgstr " 現在のディレクトリ:\n"
#: ../memline.c:1448 #: ../memline.c:1448
msgid " Using specified name:\n" msgid " Using specified name:\n"
msgstr " ある名前を使用中:\n" msgstr " 以下の名前を使用中:\n"
#: ../memline.c:1450 #: ../memline.c:1450
msgid " In directory " msgid " In directory "
@ -3901,7 +3933,7 @@ msgid ""
" user name: " " user name: "
msgstr "" msgstr ""
"\n" "\n"
" ユーザ名: " " ユーザー名: "
#: ../memline.c:1568 #: ../memline.c:1568
msgid " host name: " msgid " host name: "
@ -4050,12 +4082,12 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"(1) 別のプログラムが同じファイルを編集しているかもしれません.\n" "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
" この場合には, 変更をした際に最終的に, 同じファイルの異なる\n" " この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
" 2つのインスタンスができてしまうことに注意してください." " インスタンスができてしまうので, そうしないように気をつけてください."
#: ../memline.c:3245 #: ../memline.c:3245
msgid " Quit, or continue with caution.\n" msgid " Quit, or continue with caution.\n"
msgstr " 終了するか, 注意しながら続けてください.\n" msgstr " 終了するか, 注意しながら続けてください.\n"
#: ../memline.c:3246 #: ../memline.c:3246
msgid "(2) An edit session for this file crashed.\n" msgid "(2) An edit session for this file crashed.\n"
@ -4479,6 +4511,11 @@ msgstr ""
msgid "E574: Unknown register type %d" msgid "E574: Unknown register type %d"
msgstr "E574: 未知のレジスタ型 %d です" msgstr "E574: 未知のレジスタ型 %d です"
msgid ""
"E883: search pattern and expression register may not contain two or more "
"lines"
msgstr "E883: 検索パターンと式レジスタには2行以上を含められません"
#: ../ops.c:5089 #: ../ops.c:5089
#, c-format #, c-format
msgid "%<PRId64> Cols; " msgid "%<PRId64> Cols; "
@ -4563,6 +4600,10 @@ msgstr "E522: termcap 内に見つかりません"
msgid "E539: Illegal character <%s>" msgid "E539: Illegal character <%s>"
msgstr "E539: 不正な文字です <%s>" msgstr "E539: 不正な文字です <%s>"
#, c-format
msgid "For option %s"
msgstr "オプション: %s"
#: ../option.c:3862 #: ../option.c:3862
msgid "E529: Cannot set 'term' to empty string" msgid "E529: Cannot set 'term' to empty string"
msgstr "E529: 'term' には空文字列を設定できません" msgstr "E529: 'term' には空文字列を設定できません"
@ -4740,6 +4781,14 @@ msgstr ""
"\n" "\n"
"セキュリティコンテキストを設定できません " "セキュリティコンテキストを設定できません "
#, c-format
msgid "Could not set security context %s for %s"
msgstr "セキュリティコンテキスト %s を %s に設定できません"
#, c-format
msgid "Could not get security context %s for %s. Removing it!"
msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
#: ../os_unix.c:1558 ../os_unix.c:1647 #: ../os_unix.c:1558 ../os_unix.c:1647
#, c-format #, c-format
msgid "dlerror = \"%s\"" msgid "dlerror = \"%s\""
@ -4960,6 +5009,10 @@ msgstr "E554: %s{...} 内に文法エラーがあります"
msgid "External submatches:\n" msgid "External submatches:\n"
msgstr "外部の部分該当:\n" msgstr "外部の部分該当:\n"
#, c-format
msgid "E888: (NFA regexp) cannot repeat %s"
msgstr "E888: (NFA 正規表現) 繰り返せません %s"
#: ../regexp.c:7022 #: ../regexp.c:7022
msgid "" msgid ""
"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
@ -4968,6 +5021,9 @@ msgstr ""
"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選" "E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選"
"択されます。" "択されます。"
msgid "Switching to backtracking RE engine for pattern: "
msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
#: ../regexp_nfa.c:239 #: ../regexp_nfa.c:239
msgid "E865: (NFA) Regexp end encountered prematurely" msgid "E865: (NFA) Regexp end encountered prematurely"
msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました" msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました"
@ -4980,7 +5036,7 @@ msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
#: ../regexp_nfa.c:242 #: ../regexp_nfa.c:242
#, c-format #, c-format
msgid "E877: (NFA regexp) Invalid character class: %<PRId64>" msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
msgstr "" msgstr "E877: (NFA 正規表現) 無効な文字クラス: %<PRId64>"
#: ../regexp_nfa.c:1261 #: ../regexp_nfa.c:1261
#, c-format #, c-format
@ -5590,12 +5646,12 @@ msgid "E765: 'spellfile' does not have %<PRId64> entries"
msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません" msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません"
#: ../spell.c:8074 #: ../spell.c:8074
#, fuzzy, c-format #, c-format
msgid "Word '%.*s' removed from %s" msgid "Word '%.*s' removed from %s"
msgstr "%s から単語が削除されました" msgstr "単語 '%.*s' が %s から削除されました"
#: ../spell.c:8117 #: ../spell.c:8117
#, fuzzy, c-format #, c-format
msgid "Word '%.*s' added to %s" msgid "Word '%.*s' added to %s"
msgstr "%s に単語が追加されました" msgstr "%s に単語が追加されました"
@ -5673,6 +5729,9 @@ msgstr "このバッファに定義された構文要素はありません"
msgid "E390: Illegal argument: %s" msgid "E390: Illegal argument: %s"
msgstr "E390: 不正な引数です: %s" msgstr "E390: 不正な引数です: %s"
msgid "syntax iskeyword "
msgstr "シンタックス用 iskeyword "
#: ../syntax.c:3299 #: ../syntax.c:3299
#, c-format #, c-format
msgid "E391: No such syntax cluster: %s" msgid "E391: No such syntax cluster: %s"
@ -5769,6 +5828,10 @@ msgstr "E847: 構文の取り込み(include)が多過ぎます"
msgid "E789: Missing ']': %s" msgid "E789: Missing ']': %s"
msgstr "E789: ']' がありません: %s" msgstr "E789: ']' がありません: %s"
#, c-format
msgid "E890: trailing char after ']': %s]%s"
msgstr "E890: ']' の後ろに余分な文字があります: %s]%s"
#: ../syntax.c:4531 #: ../syntax.c:4531
#, c-format #, c-format
msgid "E398: Missing '=': %s" msgid "E398: Missing '=': %s"
@ -5874,7 +5937,7 @@ msgstr "E415: 予期せぬ等号です: %s"
#: ../syntax.c:6395 #: ../syntax.c:6395
#, c-format #, c-format
msgid "E416: missing equal sign: %s" msgid "E416: missing equal sign: %s"
msgstr "E416: 等号ががありません: %s" msgstr "E416: 等号がありません: %s"
#: ../syntax.c:6418 #: ../syntax.c:6418
#, c-format #, c-format
@ -6078,9 +6141,8 @@ msgstr "Vim: 入力を読込み中のエラーにより終了します...\n"
#. This happens when the FileChangedRO autocommand changes the #. This happens when the FileChangedRO autocommand changes the
#. * file in a way it becomes shorter. #. * file in a way it becomes shorter.
#: ../undo.c:379 #: ../undo.c:379
#, fuzzy
msgid "E881: Line count changed unexpectedly" msgid "E881: Line count changed unexpectedly"
msgstr "E834: 予期せず行カウントが変わりました" msgstr "E881: 予期せず行カウントが変わりました"
#: ../undo.c:627 #: ../undo.c:627
#, c-format #, c-format
@ -6287,23 +6349,23 @@ msgstr " システム vimrc: \""
#: ../version.c:672 #: ../version.c:672
msgid " user vimrc file: \"" msgid " user vimrc file: \""
msgstr " ユーザ vimrc: \"" msgstr " ユーザー vimrc: \""
#: ../version.c:677 #: ../version.c:677
msgid " 2nd user vimrc file: \"" msgid " 2nd user vimrc file: \""
msgstr " 第2ユーザ vimrc: \"" msgstr " 第2ユーザー vimrc: \""
#: ../version.c:682 #: ../version.c:682
msgid " 3rd user vimrc file: \"" msgid " 3rd user vimrc file: \""
msgstr " 第3ユーザ vimrc: \"" msgstr " 第3ユーザー vimrc: \""
#: ../version.c:687 #: ../version.c:687
msgid " user exrc file: \"" msgid " user exrc file: \""
msgstr " ユーザ exrc: \"" msgstr " ユーザー exrc: \""
#: ../version.c:692 #: ../version.c:692
msgid " 2nd user exrc file: \"" msgid " 2nd user exrc file: \""
msgstr " 第2ユーザ exrc: \"" msgstr " 第2ユーザー exrc: \""
#: ../version.c:699 #: ../version.c:699
msgid " fall-back for $VIM: \"" msgid " fall-back for $VIM: \""
@ -6379,7 +6441,7 @@ msgstr "Vimの開発を応援してください!"
#: ../version.c:828 #: ../version.c:828
msgid "Become a registered Vim user!" msgid "Become a registered Vim user!"
msgstr "Vimの登録ユーザになってください!" msgstr "Vimの登録ユーザーになってください!"
#: ../version.c:831 #: ../version.c:831
msgid "type :help sponsor<Enter> for information " msgid "type :help sponsor<Enter> for information "
@ -6391,7 +6453,7 @@ msgstr "詳細な情報は :help register<Enter> "
#: ../version.c:834 #: ../version.c:834
msgid "menu Help->Sponsor/Register for information " msgid "menu Help->Sponsor/Register for information "
msgstr "詳細はメニューの ヘルプ→スポンサー/登録 を参照して下さい " msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
#: ../window.c:119 #: ../window.c:119
msgid "Already only one window" msgid "Already only one window"
@ -6429,6 +6491,9 @@ msgstr "E445: 他のウィンドウには変更があります"
msgid "E446: No file name under cursor" msgid "E446: No file name under cursor"
msgstr "E446: カーソルの下にファイル名がありません" msgstr "E446: カーソルの下にファイル名がありません"
msgid "List or number required"
msgstr "リストか数値が必要です"
#~ msgid "E831: bf_key_init() called with empty password" #~ msgid "E831: bf_key_init() called with empty password"
#~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました" #~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました"

186
src/nvim/po/ja.sjis.po
View File

@ -1,11 +1,11 @@
# Japanese translation for Vim vim:set foldmethod=marker: # Japanese translation for Vim
# #
# Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed. # Do ":help credits" in Vim to see a list of people who contributed.
# #
# Last Change: 2013 Jul 06 # Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
# #
# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
# #
# Original translations. # Original translations.
@ -14,10 +14,10 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim 7.4\n" "Project-Id-Version: Vim 7.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-05-26 14:21+0200\n" "POT-Creation-Date: 2016-02-01 09:02+0900\n"
"PO-Revision-Date: 2013-07-06 15:00+0900\n" "PO-Revision-Date: 2016-02-01 09:08+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n" "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n" "Language-Team: vim-jpj (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n" "Language: Japanese\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=cp932\n" "Content-Type: text/plain; charset=cp932\n"
@ -34,7 +34,7 @@ msgstr "
#: ../buffer.c:92 #: ../buffer.c:92
msgid "[Location List]" msgid "[Location List]"
msgstr "[場所リスト]" msgstr "[ロケーションリスト]"
#: ../buffer.c:93 #: ../buffer.c:93
msgid "[Quickfix List]" msgid "[Quickfix List]"
@ -277,7 +277,7 @@ msgstr "E810:
#: ../diff.c:755 #: ../diff.c:755
msgid "E97: Cannot create diffs" msgid "E97: Cannot create diffs"
msgstr "E97: 差分を作成できません " msgstr "E97: 差分を作成できません"
#: ../diff.c:966 #: ../diff.c:966
msgid "E816: Cannot read patch output" msgid "E816: Cannot read patch output"
@ -293,7 +293,7 @@ msgstr "E99:
#: ../diff.c:2100 #: ../diff.c:2100
msgid "E793: No other buffer in diff mode is modifiable" msgid "E793: No other buffer in diff mode is modifiable"
msgstr "E793: 差分モードである他のバッファは変更可能\です" msgstr "E793: 差分モードである他のバッファは変更できません"
#: ../diff.c:2102 #: ../diff.c:2102
msgid "E100: No other buffer in diff mode" msgid "E100: No other buffer in diff mode"
@ -349,7 +349,7 @@ msgstr "
#: ../edit.c:86 #: ../edit.c:86
msgid " File name completion (^F^N^P)" msgid " File name completion (^F^N^P)"
msgstr "ファイル名補完 (^F^N^P)" msgstr " ファイル名補完 (^F^N^P)"
#: ../edit.c:87 #: ../edit.c:87
msgid " Tag completion (^]^N^P)" msgid " Tag completion (^]^N^P)"
@ -377,7 +377,7 @@ msgstr "
#: ../edit.c:94 #: ../edit.c:94
msgid " User defined completion (^U^N^P)" msgid " User defined completion (^U^N^P)"
msgstr " ユーザ定義補完 (^U^N^P)" msgstr " ユーザー定義補完 (^U^N^P)"
#: ../edit.c:95 #: ../edit.c:95
msgid " Omni completion (^O^N^P)" msgid " Omni completion (^O^N^P)"
@ -679,6 +679,10 @@ msgstr "E696:
msgid "E697: Missing end of List ']': %s" msgid "E697: Missing end of List ']': %s"
msgstr "E697: リスト型の最後に ']' がありません: %s" msgstr "E697: リスト型の最後に ']' がありません: %s"
msgid "Not enough memory to set references, garbage collection aborted!"
msgstr ""
"ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
#: ../eval.c:6475 #: ../eval.c:6475
#, c-format #, c-format
msgid "E720: Missing colon in Dictionary: %s" msgid "E720: Missing colon in Dictionary: %s"
@ -721,7 +725,7 @@ msgstr "E117:
#: ../eval.c:7383 #: ../eval.c:7383
#, c-format #, c-format
msgid "E119: Not enough arguments for function: %s" msgid "E119: Not enough arguments for function: %s"
msgstr "E119: 関数の引数が少な過ぎます: %s" msgstr "E119: 関数の引数が足りません: %s"
#: ../eval.c:7387 #: ../eval.c:7387
#, c-format #, c-format
@ -826,18 +830,16 @@ msgid "sort() argument"
msgstr "sort() の引数" msgstr "sort() の引数"
#: ../eval.c:13721 #: ../eval.c:13721
#, fuzzy
msgid "uniq() argument" msgid "uniq() argument"
msgstr "add() の引数" msgstr "uniq() の引数"
#: ../eval.c:13776 #: ../eval.c:13776
msgid "E702: Sort compare function failed" msgid "E702: Sort compare function failed"
msgstr "E702: ソ\ートの比較関数が失敗しました" msgstr "E702: ソ\ートの比較関数が失敗しました"
#: ../eval.c:13806 #: ../eval.c:13806
#, fuzzy
msgid "E882: Uniq compare function failed" msgid "E882: Uniq compare function failed"
msgstr "E702: ソ\ートの比較関数が失敗しました" msgstr "E882: Uniq の比較関数が失敗しました"
#: ../eval.c:14085 #: ../eval.c:14085
msgid "(Invalid)" msgid "(Invalid)"
@ -863,6 +865,18 @@ msgstr "E745:
msgid "E728: Using a Dictionary as a Number" msgid "E728: Using a Dictionary as a Number"
msgstr "E728: 辞書型を数値として扱っています" msgstr "E728: 辞書型を数値として扱っています"
msgid "E891: Using a Funcref as a Float"
msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
msgid "E892: Using a String as a Float"
msgstr "E892: 文字列を浮動小数点数として扱っています"
msgid "E893: Using a List as a Float"
msgstr "E893: リスト型を浮動小数点数として扱っています"
msgid "E894: Using a Dictionary as a Float"
msgstr "E894: 辞書型を浮動小数点数として扱っています"
#: ../eval.c:16259 #: ../eval.c:16259
msgid "E729: using Funcref as a String" msgid "E729: using Funcref as a String"
msgstr "E729: 関数参照型を文字列として扱っています" msgstr "E729: 関数参照型を文字列として扱っています"
@ -961,14 +975,14 @@ msgid "E129: Function name required"
msgstr "E129: 関数名が要求されます" msgstr "E129: 関数名が要求されます"
#: ../eval.c:17824 #: ../eval.c:17824
#, fuzzy, c-format #, c-format
msgid "E128: Function name must start with a capital or \"s:\": %s" msgid "E128: Function name must start with a capital or \"s:\": %s"
msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s" msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
#: ../eval.c:17833 #: ../eval.c:17833
#, fuzzy, c-format #, c-format
msgid "E884: Function name cannot contain a colon: %s" msgid "E884: Function name cannot contain a colon: %s"
msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s" msgstr "E884: 関数名にはコロンは含められません: %s"
#: ../eval.c:18336 #: ../eval.c:18336
#, c-format #, c-format
@ -1081,7 +1095,7 @@ msgstr "E136: viminfo:
#: ../ex_cmds.c:1458 #: ../ex_cmds.c:1458
#, c-format #, c-format
msgid "Reading viminfo file \"%s\"%s%s%s" msgid "Reading viminfo file \"%s\"%s%s%s"
msgstr "viminfoファイル \"%s\"%s%s%s を読込み中 " msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
#: ../ex_cmds.c:1460 #: ../ex_cmds.c:1460
msgid " info" msgid " info"
@ -1357,6 +1371,10 @@ msgstr "E158:
msgid "E157: Invalid sign ID: %<PRId64>" msgid "E157: Invalid sign ID: %<PRId64>"
msgstr "E157: 無効なsign識別子です: %<PRId64>" msgstr "E157: 無効なsign識別子です: %<PRId64>"
#, c-format
msgid "E885: Not possible to change sign %s"
msgstr "E885: 変更できない sign です: %s"
#: ../ex_cmds.c:6066 #: ../ex_cmds.c:6066
msgid " (not supported)" msgid " (not supported)"
msgstr " (非サポート)" msgstr " (非サポート)"
@ -1379,6 +1397,13 @@ msgstr "
msgid "cmd: %s" msgid "cmd: %s"
msgstr "コマンド: %s" msgstr "コマンド: %s"
msgid "frame is zero"
msgstr "フレームが 0 です"
#, c-format
msgid "frame at highest level: %d"
msgstr "最高レベルのフレーム: %d"
#: ../ex_cmds2.c:322 #: ../ex_cmds2.c:322
#, c-format #, c-format
msgid "Breakpoint in \"%s%s\" line %<PRId64>" msgid "Breakpoint in \"%s%s\" line %<PRId64>"
@ -1528,7 +1553,8 @@ msgstr "E197:
#. don't wait for return #. don't wait for return
#: ../ex_docmd.c:387 #: ../ex_docmd.c:387
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "Exモードに入ります. ノーマルに戻るには\"visual\"と入力してください." msgstr ""
"Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください."
#: ../ex_docmd.c:428 #: ../ex_docmd.c:428
msgid "E501: At end-of-file" msgid "E501: At end-of-file"
@ -1553,7 +1579,7 @@ msgstr "
#: ../ex_docmd.c:1628 #: ../ex_docmd.c:1628
msgid "E464: Ambiguous use of user-defined command" msgid "E464: Ambiguous use of user-defined command"
msgstr "E464: ユーザ定義コマンドのあいまいな使用です" msgstr "E464: ユーザー定義コマンドのあいまいな使用です"
#: ../ex_docmd.c:1638 #: ../ex_docmd.c:1638
msgid "E492: Not an editor command" msgid "E492: Not an editor command"
@ -1606,14 +1632,14 @@ msgstr "E174:
#: ../ex_docmd.c:4432 #: ../ex_docmd.c:4432
msgid "" msgid ""
"\n" "\n"
" Name Args Range Complete Definition" " Name Args Address Complete Definition"
msgstr "" msgstr ""
"\n" "\n"
" 名前 引数 範囲 補完 定義" " 名前 引数 アドレス 補完 定義"
#: ../ex_docmd.c:4516 #: ../ex_docmd.c:4516
msgid "No user-defined commands found" msgid "No user-defined commands found"
msgstr "ユーザ定義コマンドが見つかりませんでした" msgstr "ユーザー定義コマンドが見つかりませんでした"
#: ../ex_docmd.c:4538 #: ../ex_docmd.c:4538
msgid "E175: No attribute specified" msgid "E175: No attribute specified"
@ -1633,7 +1659,10 @@ msgstr "E178:
#: ../ex_docmd.c:4625 #: ../ex_docmd.c:4625
msgid "E179: argument required for -complete" msgid "E179: argument required for -complete"
msgstr "E179: -補完のための引数が必要です" msgstr "E179: -complete には引数が必要です"
msgid "E179: argument required for -addr"
msgstr "E179: -addr には引数が必要です"
#: ../ex_docmd.c:4635 #: ../ex_docmd.c:4635
#, c-format #, c-format
@ -1646,16 +1675,20 @@ msgstr "E182:
#: ../ex_docmd.c:4691 #: ../ex_docmd.c:4691
msgid "E183: User defined commands must start with an uppercase letter" msgid "E183: User defined commands must start with an uppercase letter"
msgstr "E183: ユーザ定義コマンドは英大文字で始まらなければなりません" msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
#: ../ex_docmd.c:4696 #: ../ex_docmd.c:4696
msgid "E841: Reserved name, cannot be used for user defined command" msgid "E841: Reserved name, cannot be used for user defined command"
msgstr "E841: 予\約名なので, ユーザ定義コマンドに利用できません" msgstr "E841: 予\約名なので, ユーザー定義コマンドに利用できません"
#: ../ex_docmd.c:4751 #: ../ex_docmd.c:4751
#, c-format #, c-format
msgid "E184: No such user-defined command: %s" msgid "E184: No such user-defined command: %s"
msgstr "E184: そのユーザ定義コマンドはありません: %s" msgstr "E184: そのユーザー定義コマンドはありません: %s"
#, c-format
msgid "E180: Invalid address type value: %s"
msgstr "E180: 無効なアドレスタイプ値です: %s"
#: ../ex_docmd.c:5219 #: ../ex_docmd.c:5219
#, c-format #, c-format
@ -2019,11 +2052,11 @@ msgstr "
#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578 #: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
msgid "is a directory" msgid "is a directory"
msgstr " はディレクトリです" msgstr "はディレクトリです"
#: ../fileio.c:397 #: ../fileio.c:397
msgid "is not a file" msgid "is not a file"
msgstr " はファイルではありません" msgstr "はファイルではありません"
#: ../fileio.c:508 ../fileio.c:3522 #: ../fileio.c:508 ../fileio.c:3522
msgid "[New File]" msgid "[New File]"
@ -2039,7 +2072,7 @@ msgstr "[
#: ../fileio.c:534 #: ../fileio.c:534
msgid "[Permission Denied]" msgid "[Permission Denied]"
msgstr "[認可がありません]" msgstr "[権限がありません]"
#: ../fileio.c:653 #: ../fileio.c:653
msgid "E200: *ReadPre autocommands made the file unreadable" msgid "E200: *ReadPre autocommands made the file unreadable"
@ -2210,7 +2243,7 @@ msgstr "
#: ../fileio.c:3509 #: ../fileio.c:3509
#, c-format #, c-format
msgid " in line %<PRId64>;" msgid " in line %<PRId64>;"
msgstr "行 %<PRId64>;" msgstr " 行 %<PRId64>;"
#: ../fileio.c:3519 #: ../fileio.c:3519
msgid "[Device]" msgid "[Device]"
@ -2766,9 +2799,8 @@ msgid "E37: No write since last change (add ! to override)"
msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)" msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
#: ../globals.h:1055 #: ../globals.h:1055
#, fuzzy
msgid "E37: No write since last change" msgid "E37: No write since last change"
msgstr "[最後の変更が保存されていません]\n" msgstr "E37: 最後の変更が保存されていません"
#: ../globals.h:1056 #: ../globals.h:1056
msgid "E38: Null argument" msgid "E38: Null argument"
@ -2810,7 +2842,7 @@ msgstr "E42:
#: ../globals.h:1067 #: ../globals.h:1067
msgid "E776: No location list" msgid "E776: No location list"
msgstr "E776: 場所リストはありません" msgstr "E776: ロケーションリストはありません"
#: ../globals.h:1068 #: ../globals.h:1068
msgid "E43: Damaged match string" msgid "E43: Damaged match string"
@ -2931,6 +2963,10 @@ msgstr "E363:
msgid "E749: empty buffer" msgid "E749: empty buffer"
msgstr "E749: バッファが空です" msgstr "E749: バッファが空です"
#, c-format
msgid "E86: Buffer %ld does not exist"
msgstr "E86: バッファ %ld はありません"
#: ../globals.h:1108 #: ../globals.h:1108
msgid "E682: Invalid search pattern or delimiter" msgid "E682: Invalid search pattern or delimiter"
msgstr "E682: 検索パターンか区切り記号が不正です" msgstr "E682: 検索パターンか区切り記号が不正です"
@ -3831,7 +3867,7 @@ msgid ""
"\n" "\n"
msgstr "" msgstr ""
"\n" "\n"
"それから.swpファイルを削除してください\n" "元の.swpファイルは削除しても構\いません\n"
"\n" "\n"
#. use msg() to start the scrolling properly #. use msg() to start the scrolling properly
@ -3845,7 +3881,7 @@ msgstr "
#: ../memline.c:1448 #: ../memline.c:1448
msgid " Using specified name:\n" msgid " Using specified name:\n"
msgstr " ある名前を使用中:\n" msgstr " 以下の名前を使用中:\n"
#: ../memline.c:1450 #: ../memline.c:1450
msgid " In directory " msgid " In directory "
@ -3901,7 +3937,7 @@ msgid ""
" user name: " " user name: "
msgstr "" msgstr ""
"\n" "\n"
" ユーザ名: " " ユーザー名: "
#: ../memline.c:1568 #: ../memline.c:1568
msgid " host name: " msgid " host name: "
@ -4050,12 +4086,12 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"(1) 別のプログラムが同じファイルを編集しているかもしれません.\n" "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
" この場合には, 変更をした際に最終的に, 同じファイルの異なる\n" " この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
" 2つのインスタンスができてしまうことに注意してください." " インスタンスができてしまうので, そうしないように気をつけてください."
#: ../memline.c:3245 #: ../memline.c:3245
msgid " Quit, or continue with caution.\n" msgid " Quit, or continue with caution.\n"
msgstr " 終了するか, 注意しながら続けてください.\n" msgstr " 終了するか, 注意しながら続けてください.\n"
#: ../memline.c:3246 #: ../memline.c:3246
msgid "(2) An edit session for this file crashed.\n" msgid "(2) An edit session for this file crashed.\n"
@ -4479,6 +4515,11 @@ msgstr ""
msgid "E574: Unknown register type %d" msgid "E574: Unknown register type %d"
msgstr "E574: 未知のレジスタ型 %d です" msgstr "E574: 未知のレジスタ型 %d です"
msgid ""
"E883: search pattern and expression register may not contain two or more "
"lines"
msgstr "E883: 検索パターンと式レジスタには2行以上を含められません"
#: ../ops.c:5089 #: ../ops.c:5089
#, c-format #, c-format
msgid "%<PRId64> Cols; " msgid "%<PRId64> Cols; "
@ -4563,6 +4604,10 @@ msgstr "E522: termcap
msgid "E539: Illegal character <%s>" msgid "E539: Illegal character <%s>"
msgstr "E539: 不正な文字です <%s>" msgstr "E539: 不正な文字です <%s>"
#, c-format
msgid "For option %s"
msgstr "オプション: %s"
#: ../option.c:3862 #: ../option.c:3862
msgid "E529: Cannot set 'term' to empty string" msgid "E529: Cannot set 'term' to empty string"
msgstr "E529: 'term' には空文字列を設定できません" msgstr "E529: 'term' には空文字列を設定できません"
@ -4740,6 +4785,14 @@ msgstr ""
"\n" "\n"
"セキュリティコンテキストを設定できません " "セキュリティコンテキストを設定できません "
#, c-format
msgid "Could not set security context %s for %s"
msgstr "セキュリティコンテキスト %s を %s に設定できません"
#, c-format
msgid "Could not get security context %s for %s. Removing it!"
msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
#: ../os_unix.c:1558 ../os_unix.c:1647 #: ../os_unix.c:1558 ../os_unix.c:1647
#, c-format #, c-format
msgid "dlerror = \"%s\"" msgid "dlerror = \"%s\""
@ -4960,6 +5013,10 @@ msgstr "E554: %s{...}
msgid "External submatches:\n" msgid "External submatches:\n"
msgstr "外部の部分該当:\n" msgstr "外部の部分該当:\n"
#, c-format
msgid "E888: (NFA regexp) cannot repeat %s"
msgstr "E888: (NFA 正規表\現) 繰り返せません %s"
#: ../regexp.c:7022 #: ../regexp.c:7022
msgid "" msgid ""
"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
@ -4968,7 +5025,9 @@ msgstr ""
"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表\現エンジンは自動選" "E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表\現エンジンは自動選"
"択されます。" "択されます。"
#: ../regexp_nfa.c:239 msgid "Switching to backtracking RE engine for pattern: "
msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
msgid "E865: (NFA) Regexp end encountered prematurely" msgid "E865: (NFA) Regexp end encountered prematurely"
msgstr "E865: (NFA) 期待より早く正規表\現の終端に到達しました" msgstr "E865: (NFA) 期待より早く正規表\現の終端に到達しました"
@ -4980,7 +5039,7 @@ msgstr "E866: (NFA
#: ../regexp_nfa.c:242 #: ../regexp_nfa.c:242
#, c-format #, c-format
msgid "E877: (NFA regexp) Invalid character class: %<PRId64>" msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
msgstr "" msgstr "E877: (NFA 正規表\現) 無効な文字クラス: %<PRId64>"
#: ../regexp_nfa.c:1261 #: ../regexp_nfa.c:1261
#, c-format #, c-format
@ -5590,14 +5649,14 @@ msgid "E765: 'spellfile' does not have %<PRId64> entries"
msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません" msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません"
#: ../spell.c:8074 #: ../spell.c:8074
#, fuzzy, c-format #, c-format
msgid "Word '%.*s' removed from %s" msgid "Word '%.*s' removed from %s"
msgstr "%s から単語が削除されました" msgstr "単語 '%.*s' が %s から削除されました"
#: ../spell.c:8117 #: ../spell.c:8117
#, fuzzy, c-format #, c-format
msgid "Word '%.*s' added to %s" msgid "Word '%.*s' added to %s"
msgstr "%s に単語が追加されました" msgstr "単語 '%.*s' が %s へ追加されました"
#: ../spell.c:8381 #: ../spell.c:8381
msgid "E763: Word characters differ between spell files" msgid "E763: Word characters differ between spell files"
@ -5673,6 +5732,9 @@ msgstr "
msgid "E390: Illegal argument: %s" msgid "E390: Illegal argument: %s"
msgstr "E390: 不正な引数です: %s" msgstr "E390: 不正な引数です: %s"
msgid "syntax iskeyword "
msgstr "シンタックス用 iskeyword "
#: ../syntax.c:3299 #: ../syntax.c:3299
#, c-format #, c-format
msgid "E391: No such syntax cluster: %s" msgid "E391: No such syntax cluster: %s"
@ -5769,6 +5831,10 @@ msgstr "E847:
msgid "E789: Missing ']': %s" msgid "E789: Missing ']': %s"
msgstr "E789: ']' がありません: %s" msgstr "E789: ']' がありません: %s"
#, c-format
msgid "E890: trailing char after ']': %s]%s"
msgstr "E890: ']' の後ろに余分な文字があります: %s]%s"
#: ../syntax.c:4531 #: ../syntax.c:4531
#, c-format #, c-format
msgid "E398: Missing '=': %s" msgid "E398: Missing '=': %s"
@ -5874,7 +5940,7 @@ msgstr "E415:
#: ../syntax.c:6395 #: ../syntax.c:6395
#, c-format #, c-format
msgid "E416: missing equal sign: %s" msgid "E416: missing equal sign: %s"
msgstr "E416: 等号ががありません: %s" msgstr "E416: 等号がありません: %s"
#: ../syntax.c:6418 #: ../syntax.c:6418
#, c-format #, c-format
@ -6078,9 +6144,8 @@ msgstr "Vim:
#. This happens when the FileChangedRO autocommand changes the #. This happens when the FileChangedRO autocommand changes the
#. * file in a way it becomes shorter. #. * file in a way it becomes shorter.
#: ../undo.c:379 #: ../undo.c:379
#, fuzzy
msgid "E881: Line count changed unexpectedly" msgid "E881: Line count changed unexpectedly"
msgstr "E834: 予\期せず行カウントが変わりました" msgstr "E881: 予\期せず行カウントが変わりました"
#: ../undo.c:627 #: ../undo.c:627
#, c-format #, c-format
@ -6287,23 +6352,23 @@ msgstr "
#: ../version.c:672 #: ../version.c:672
msgid " user vimrc file: \"" msgid " user vimrc file: \""
msgstr " ユーザ vimrc: \"" msgstr " ユーザー vimrc: \""
#: ../version.c:677 #: ../version.c:677
msgid " 2nd user vimrc file: \"" msgid " 2nd user vimrc file: \""
msgstr " 第2ユーザ vimrc: \"" msgstr " 第2ユーザー vimrc: \""
#: ../version.c:682 #: ../version.c:682
msgid " 3rd user vimrc file: \"" msgid " 3rd user vimrc file: \""
msgstr " 第3ユーザ vimrc: \"" msgstr " 第3ユーザー vimrc: \""
#: ../version.c:687 #: ../version.c:687
msgid " user exrc file: \"" msgid " user exrc file: \""
msgstr " ユーザ exrc: \"" msgstr " ユーザー exrc: \""
#: ../version.c:692 #: ../version.c:692
msgid " 2nd user exrc file: \"" msgid " 2nd user exrc file: \""
msgstr " 第2ユーザ exrc: \"" msgstr " 第2ユーザー exrc: \""
#: ../version.c:699 #: ../version.c:699
msgid " fall-back for $VIM: \"" msgid " fall-back for $VIM: \""
@ -6379,7 +6444,7 @@ msgstr "Vim
#: ../version.c:828 #: ../version.c:828
msgid "Become a registered Vim user!" msgid "Become a registered Vim user!"
msgstr "Vimの登録ユーザになってください!" msgstr "Vimの登録ユーザーになってください!"
#: ../version.c:831 #: ../version.c:831
msgid "type :help sponsor<Enter> for information " msgid "type :help sponsor<Enter> for information "
@ -6391,7 +6456,7 @@ msgstr "
#: ../version.c:834 #: ../version.c:834
msgid "menu Help->Sponsor/Register for information " msgid "menu Help->Sponsor/Register for information "
msgstr "詳細はメニューの ヘルプ→スポンサー/登録 を参照して下さい " msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
#: ../window.c:119 #: ../window.c:119
msgid "Already only one window" msgid "Already only one window"
@ -6429,6 +6494,9 @@ msgstr "E445:
msgid "E446: No file name under cursor" msgid "E446: No file name under cursor"
msgstr "E446: カーソ\ルの下にファイル名がありません" msgstr "E446: カーソ\ルの下にファイル名がありません"
msgid "List or number required"
msgstr "リストか数値が必要です"
#~ msgid "E831: bf_key_init() called with empty password" #~ msgid "E831: bf_key_init() called with empty password"
#~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました" #~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました"