diff options
32 files changed, 139 insertions, 128 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index bacd0e7cf1..045dd9a32a 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -4,7 +4,7 @@ VIM REFERENCE MANUAL by Bram Moolenaar -Automatic commands *autocmd* *autocommand* +Automatic commands *autocmd* *autocommand* *autocommand* For a basic explanation, see section |40.3| in the user manual. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 7a5b90c88d..a3d43dab11 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6612,6 +6612,8 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip} When {skip} is omitted or empty, every match is accepted. When evaluating {skip} causes an error the search is aborted and -1 returned. + {skip} can be a string, a lambda, a funcref or a partial. + Anything else makes the function fail. For {stopline} and {timeout} see |search()|. diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index fa770b4a61..2de667ef1c 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -908,6 +908,8 @@ Short explanation of each option: *option-list* 'undoreload' 'ur' max nr of lines to save for undo on a buffer reload 'updatecount' 'uc' after this many characters flush swap file 'updatetime' 'ut' after this many milliseconds flush swap file +'varsofttabstop' 'vsts' a list of number of spaces when typing <Tab> +'vartabstop' 'vts' a list of number of spaces for <Tab>s 'verbose' 'vbs' give informative messages 'verbosefile' 'vfile' file to write messages in 'viewdir' 'vdir' directory where to store files with :mkview diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim index 6a81b8c631..5a7a2c3794 100644 --- a/runtime/syntax/php.vim +++ b/runtime/syntax/php.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: php PHP 3/4/5/7 " Maintainer: Jason Woofenden <jason@jasonwoof.com> -" Last Change: Jul 14, 2017 +" Last Change: Jun 20, 2018 " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com> " Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> @@ -446,7 +446,7 @@ if exists("php_folding") && php_folding==1 syn match phpException "\(\s\|^\)catch\(\s\+.*}\)\@=" contained syn match phpException "\(\s\|^\)finally\(\s\+.*}\)\@=" contained - set foldmethod=syntax + setlocal foldmethod=syntax syn region phpFoldHtmlInside matchgroup=Delimiter start="?>" end="<?\(php\)\=" contained transparent contains=@htmlTop syn region phpFoldFunction matchgroup=Storageclass start="^\z(\s*\)\(abstract\s\+\|final\s\+\|private\s\+\|protected\s\+\|public\s\+\|static\s\+\)*function\s\([^};]*$\)\@="rs=e-9 matchgroup=Delimiter end="^\z1}" contains=@phpClFunction,phpFoldHtmlInside,phpFCKeyword contained transparent fold extend syn region phpFoldFunction matchgroup=Define start="^function\s\([^};]*$\)\@=" matchgroup=Delimiter end="^}" contains=@phpClFunction,phpFoldHtmlInside contained transparent fold extend @@ -460,7 +460,7 @@ else syn keyword phpException catch throw try finally contained syn keyword phpStorageClass final global private protected public static contained if exists("php_folding") && php_folding==2 - set foldmethod=syntax + setlocal foldmethod=syntax syn region phpFoldHtmlInside matchgroup=Delimiter start="?>" end="<?\(php\)\=" contained transparent contains=@htmlTop syn region phpParent matchgroup=Delimiter start="{" end="}" contained contains=@phpClFunction,phpFoldHtmlInside transparent fold endif diff --git a/runtime/syntax/sqloracle.vim b/runtime/syntax/sqloracle.vim index 3989b1f997..0907b48f0e 100644 --- a/runtime/syntax/sqloracle.vim +++ b/runtime/syntax/sqloracle.vim @@ -4,13 +4,15 @@ " Repository: https://github.com/chrisbra/vim-sqloracle-syntax " License: Vim " Previous Maintainer: Paul Moore -" Last Change: 2018 May 13 +" Last Change: 2018 June 24 " Changes: " 02.04.2016: Support for when keyword " 03.04.2016: Support for join related keywords " 22.07.2016: Support Oracle Q-Quote-Syntax " 25.07.2016: Support for Oracle N'-Quote syntax +" 22.06.2018: Remove skip part for sqlString (do not escape strings) +" (https://web.archive.org/web/20150922065035/https://mariadb.com/kb/en/sql-99/character-string-literals/) if exists("b:current_syntax") finish @@ -50,12 +52,14 @@ syn keyword sqlStatement truncate " next ones are contained, so folding works. syn keyword sqlStatement create update alter select insert contained -syn keyword sqlType boolean char character date float integer long -syn keyword sqlType mlslabel number raw rowid varchar varchar2 varray +syn keyword sqlType bfile blob boolean char character clob date datetime +syn keyword sqlType dec decimal float int integer long mlslabel nchar +syn keyword sqlType nclob number numeric nvarchar2 precision raw rowid +syn keyword sqlType smallint real timestamp urowid varchar varchar2 varray " Strings: -syn region sqlString matchgroup=Quote start=+n\?"+ skip=+\\\\\|\\"+ end=+"+ -syn region sqlString matchgroup=Quote start=+n\?'+ skip=+\\\\\|\\'+ end=+'+ +syn region sqlString matchgroup=Quote start=+n\?"+ end=+"+ +syn region sqlString matchgroup=Quote start=+n\?'+ end=+'+ syn region sqlString matchgroup=Quote start=+n\?q'\z([^[(<{]\)+ end=+\z1'+ syn region sqlString matchgroup=Quote start=+n\?q'<+ end=+>'+ syn region sqlString matchgroup=Quote start=+n\?q'{+ end=+}'+ @@ -68,6 +72,7 @@ syn match sqlNumber "-\=\<\d*\.\=[0-9_]\>" " Comments: syn region sqlComment start="/\*" end="\*/" contains=sqlTodo,@Spell fold syn match sqlComment "--.*$" contains=sqlTodo,@Spell +syn match sqlComment "^rem.*$" contains=sqlTodo,@Spell " Setup Folding: " this is a hack, to get certain statements folded. @@ -129,15 +134,15 @@ syn keyword sqlFunction xmlparse xmlpatch xmlpi xmlquery xmlroot xmlsequence xml syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained " Define the default highlighting. -hi def link Quote Special -hi def link sqlComment Comment -hi def link sqlFunction Function -hi def link sqlKeyword sqlSpecial -hi def link sqlNumber Number -hi def link sqlOperator sqlStatement -hi def link sqlSpecial Special +hi def link Quote Special +hi def link sqlComment Comment +hi def link sqlFunction Function +hi def link sqlKeyword sqlSpecial +hi def link sqlNumber Number +hi def link sqlOperator sqlStatement +hi def link sqlSpecial Special hi def link sqlStatement Statement -hi def link sqlString String +hi def link sqlString String hi def link sqlType Type hi def link sqlTodo Todo diff --git a/src/nvim/po/af.po b/src/nvim/po/af.po index f42ad04409..61ad72d7e0 100644 --- a/src/nvim/po/af.po +++ b/src/nvim/po/af.po @@ -2362,7 +2362,7 @@ msgstr "E216: Geen sodanige groep of gebeurtenis nie: %s" #. Highlight title msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Outobevele ---" @@ -2381,7 +2381,7 @@ msgid "E218: autocommand nesting too deep" msgstr "E218: outobevele te diep genes" #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s outobevele vir \"%s\"" #, c-format @@ -4353,7 +4353,7 @@ msgstr "E55: Onpaar %s)" msgid "E66: \\z( not allowed here" msgstr "E66: \\z( nie hier toegelaat nie" -msgid "E67: \\z1 et al. not allowed here" +msgid "E67: \\z1 - \\z9 not allowed here" msgstr "E67: \\z1 e.a. nie hier toegelaat nie" #, c-format diff --git a/src/nvim/po/ca.po b/src/nvim/po/ca.po index 43798400f6..7e83cb08ed 100644 --- a/src/nvim/po/ca.po +++ b/src/nvim/po/ca.po @@ -3409,7 +3409,7 @@ msgstr "-q [ftxerrors] edita el fitxer on hi ha el primer error" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/cs.cp1250.po b/src/nvim/po/cs.cp1250.po index 112e949815..26bdbe8c45 100644 --- a/src/nvim/po/cs.cp1250.po +++ b/src/nvim/po/cs.cp1250.po @@ -2535,7 +2535,7 @@ msgstr "E216: Událost %s neexistuje" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Automatické pøíkazy ---" @@ -2559,7 +2559,7 @@ msgstr "E218: vnoøení automatického pøíkazu pøíliš hluboká" #: ../fileio.c:7143 #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s automatické pøíkazy pro \"%s\"" #: ../fileio.c:7149 @@ -3486,7 +3486,7 @@ msgstr "-q [chybový soubor] editovat soubor na místì výskytu první chyby" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/cs.po b/src/nvim/po/cs.po index 3839230df2..986d6753a8 100644 --- a/src/nvim/po/cs.po +++ b/src/nvim/po/cs.po @@ -2535,7 +2535,7 @@ msgstr "E216: Událost %s neexistuje" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Automatické pøíkazy ---" @@ -2559,7 +2559,7 @@ msgstr "E218: vnoøení automatického pøíkazu pøíli¹ hluboká" #: ../fileio.c:7143 #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s automatické pøíkazy pro \"%s\"" #: ../fileio.c:7149 @@ -3486,7 +3486,7 @@ msgstr "-q [chybový soubor] editovat soubor na místì výskytu první chyby" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/de.po b/src/nvim/po/de.po index 4ef47f9fd2..a6ba8476d8 100644 --- a/src/nvim/po/de.po +++ b/src/nvim/po/de.po @@ -1918,7 +1918,7 @@ msgstr "E216: Keine solche Gruppe oder Ereignis: %s" #: ../fileio.c:5993 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Autokommandos ---" @@ -1942,7 +1942,7 @@ msgstr "E218: Autokommandos zu tief verschachtelt" #: ../fileio.c:7042 #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s Autokommandos für \"%s\"" #: ../fileio.c:7048 @@ -2835,7 +2835,7 @@ msgstr "-q [Fehler-Datei] öffne Datei mit erstem Fehler" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po index 3283e167a2..52592d0767 100644 --- a/src/nvim/po/eo.po +++ b/src/nvim/po/eo.po @@ -2002,7 +2002,7 @@ msgstr "E216: Ne ekzistas tia grupo aÅ evento: %s" msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- AÅto-Komandoj ---" @@ -2021,7 +2021,7 @@ msgid "E218: autocommand nesting too deep" msgstr "E218: aÅtokomando tro ingita" #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s AÅtokomandoj por \"%s\"" #, c-format @@ -2922,7 +2922,7 @@ msgstr "-q [erardosiero] redakti dosieron kun unua eraro" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" @@ -4733,7 +4733,7 @@ msgid "E66: \\z( not allowed here" msgstr "E66: \\z( estas nepermesebla tie" # DP: vidu http://www.thefreedictionary.com/et+al. -msgid "E67: \\z1 et al. not allowed here" +msgid "E67: \\z1 - \\z9 not allowed here" msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie" #, c-format @@ -4844,10 +4844,10 @@ msgstr "E869: (NFA) Nekonata operatoro '\\@%c'" msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFS-regulesprimo) Eraro dum legado de limoj de ripeto" -msgid "E871: (NFA regexp) Can't have a multi follow a multi !" +msgid "E871: (NFA regexp) Can't have a multi follow a multi" msgstr "" "E871: (NFA-regulesprimo) Ne povas havi mult-selekton tuj post alia mult-" -"selekto!" +"selekto" msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA-regulesprimo) tro da '('" @@ -4858,7 +4858,7 @@ msgstr "E879: (NFA-regulesprimo) tro da \\z(" msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA-regulesprimo) propra end-eraro" -msgid "E874: (NFA) Could not pop the stack !" +msgid "E874: (NFA) Could not pop the stack!" msgstr "E874: (NFA) Ne povis elpreni de la staplo!" msgid "" diff --git a/src/nvim/po/es.po b/src/nvim/po/es.po index 27edb1600d..f30e8780f9 100644 --- a/src/nvim/po/es.po +++ b/src/nvim/po/es.po @@ -2525,7 +2525,7 @@ msgstr "E216: No existe tal grupo o evento: %s" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Auto-órdenes ---" @@ -2549,7 +2549,7 @@ msgstr "E218: La auto-orden se anida en exceso" #: ../fileio.c:7143 #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s Auto-órdenes para \"%s\"" #: ../fileio.c:7149 @@ -3464,7 +3464,7 @@ msgstr "-q [fich. err.] Editar el archivo con el primer error" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po index a131548c82..4612988c95 100644 --- a/src/nvim/po/fi.po +++ b/src/nvim/po/fi.po @@ -2473,7 +2473,7 @@ msgstr "E216: Ryhmää tai eventtiä ei ole: %s" msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Autocommandit ---" @@ -2492,7 +2492,7 @@ msgid "E218: autocommand nesting too deep" msgstr "E218: liian monta tasoa autocommandissa" #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s Autocommands kohteelle %s" #, c-format @@ -4420,7 +4420,7 @@ msgstr "E55: Pariton %s)" msgid "E66: \\z( not allowed here" msgstr "E66: \\z( ei ole sallittu tässä" -msgid "E67: \\z1 et al. not allowed here" +msgid "E67: \\z1 - \\z9 not allowed here" msgstr "E67: \\z1 jne. ei ole sallittu tässä" #, c-format diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po index 2dc5bca7b1..31b30d0454 100644 --- a/src/nvim/po/fr.po +++ b/src/nvim/po/fr.po @@ -2216,7 +2216,7 @@ msgstr "E216: Aucun événement ou groupe %s" msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Auto-commandes ---" @@ -2236,7 +2236,7 @@ msgid "E218: autocommand nesting too deep" msgstr "E218: autocommandes trop imbriquées" #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "Autocommandes %s pour \"%s\"" #, c-format @@ -3163,11 +3163,11 @@ msgstr "-q [fichErr] ouvrir à l'endroit de la première erreur" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" -"utilisation :" +"Utilisation :" msgid " vim [arguments] " msgstr " vim [args] " @@ -5003,7 +5003,7 @@ msgstr "E55: %s) fermante non ouverte" msgid "E66: \\z( not allowed here" msgstr "E66: \\z( n'est pas autorisé ici" -msgid "E67: \\z1 et al. not allowed here" +msgid "E67: \\z1 - \\z9 not allowed here" msgstr "E67: \\z1 et co. ne sont pas autorisés ici" #, c-format @@ -5117,8 +5117,8 @@ msgstr "E869: (NFA) Opérateur inconnu '\\@%c'" msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (regexp NFA) Erreur à la lecture des limites de répétition" -msgid "E871: (NFA regexp) Can't have a multi follow a multi !" -msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi !" +msgid "E871: (NFA regexp) Can't have a multi follow a multi" +msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi" msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (regexp NFA) Trop de '('" @@ -5129,7 +5129,7 @@ msgstr "E879: (regexp NFA) Trop de \\z(" msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA regexp) erreur de terminaison" -msgid "E874: (NFA) Could not pop the stack !" +msgid "E874: (NFA) Could not pop the stack!" msgstr "E874: (NFA) Impossible de dépiler !" msgid "" diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po index 6c66d3d71a..617b805eb8 100644 --- a/src/nvim/po/ga.po +++ b/src/nvim/po/ga.po @@ -2021,7 +2021,7 @@ msgstr "E216: Níl a leithéid de ghrúpa nó theagmhas: %s" #. Highlight title msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Uathorduithe ---" @@ -2040,7 +2040,7 @@ msgid "E218: autocommand nesting too deep" msgstr "E218: uathordú neadaithe ródhomhain" #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s Uathorduithe do \"%s\"" #, c-format @@ -2953,7 +2953,7 @@ msgstr "-q [comhadearr] cuir comhad leis an chéad earráid in eagar" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" @@ -4797,8 +4797,8 @@ msgstr "E55: %s) corr" msgid "E66: \\z( not allowed here" msgstr "E66: ní cheadaítear \\z( anseo" -msgid "E67: \\z1 et al. not allowed here" -msgstr "E67: ní cheadaítear \\z1 et al. anseo" +msgid "E67: \\z1 - \\z9 not allowed here" +msgstr "E67: ní cheadaítear \\z1 - \\z9 anseo" #, c-format msgid "E69: Missing ] after %s%%[" @@ -4911,8 +4911,8 @@ msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (slonn NFA) Earráid agus teorainneacha athdhéanta á léamh" #. Can't have a multi follow a multi. -msgid "E871: (NFA regexp) Can't have a multi follow a multi !" -msgstr "E871: (slonn NFA) Ní cheadaítear ilchodach tar éis ilchodach!" +msgid "E871: (NFA regexp) Can't have a multi follow a multi" +msgstr "E871: (slonn NFA) Ní cheadaítear ilchodach tar éis ilchodach" #. Too many `(' msgid "E872: (NFA regexp) Too many '('" @@ -4924,7 +4924,7 @@ msgstr "E879: (slonn NFA) An iomarca \\z(" msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (slonn NFA) críochnú neamhoiriúnach" -msgid "E874: (NFA) Could not pop the stack !" +msgid "E874: (NFA) Could not pop the stack!" msgstr "E874: (NFA) Níorbh fhéidir an chruach a phlobadh!" msgid "" diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po index 652f0c7676..4eafa8ca2a 100644 --- a/src/nvim/po/it.po +++ b/src/nvim/po/it.po @@ -1,6 +1,8 @@ -# Italian Translation for Vim +# Italian translation for Vim # # FIRST AUTHOR Antonio Colombo <azc100@gmail.com>, 2000 +# Vlad Sandrini <vlad.gently@gmail.com> +# Luciano Montanaro <mikelima@cirulla.net> # # Ogni commento è benvenuto... # Every remark is very welcome... @@ -3449,7 +3451,7 @@ msgstr "-q [errorfile] apri file col primo errore" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po index a260fc98d8..1595eab926 100644 --- a/src/nvim/po/ja.euc-jp.po +++ b/src/nvim/po/ja.euc-jp.po @@ -2021,10 +2021,10 @@ msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥°¥ë¡¼¥×¤â¤·¤¯¤Ï¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s" msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" #, c-format msgid "E680: <buffer=%d>: invalid buffer number " @@ -2040,8 +2040,8 @@ msgid "E218: autocommand nesting too deep" msgstr "E218: autocommand¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹" #, c-format -msgid "%s Auto commands for \"%s\"" -msgstr "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" +msgstr "%s Autocommands for \"%s\"" #, c-format msgid "Executing %s" @@ -2938,7 +2938,7 @@ msgstr "-q [errorfile] ºÇ½é¤Î¥¨¥é¡¼¤ÇÊÔ½¸¤¹¤ë" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" @@ -4732,7 +4732,7 @@ msgid "E66: \\z( not allowed here" msgstr "E66: \\z( ¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" # -msgid "E67: \\z1 et al. not allowed here" +msgid "E67: \\z1 - \\z9 not allowed here" msgstr "E67: \\z1 ¤½¤Î¾¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" # @@ -4853,8 +4853,8 @@ msgstr "E869: (NFA) ̤ÃΤΥª¥Ú¥ì¡¼¥¿¤Ç¤¹: '\\@%c'" msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFA Àµµ¬É½¸½) ·«¤êÊÖ¤·¤ÎÀ©¸Â²ó¿ô¤òÆɹþÃæ¤Ë¥¨¥é¡¼" -msgid "E871: (NFA regexp) Can't have a multi follow a multi !" -msgstr "E871: (NFA Àµµ¬É½¸½) ·«¤êÊÖ¤· ¤Î¸å¤Ë ·«¤êÊÖ¤· ¤Ï¤Ç¤¤Þ¤»¤ó!" +msgid "E871: (NFA regexp) Can't have a multi follow a multi" +msgstr "E871: (NFA Àµµ¬É½¸½) ·«¤êÊÖ¤· ¤Î¸å¤Ë ·«¤êÊÖ¤· ¤Ï¤Ç¤¤Þ¤»¤ó" msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA Àµµ¬É½¸½) '(' ¤¬Â¿²á¤®¤Þ¤¹" @@ -4865,7 +4865,7 @@ msgstr "E879: (NFA Àµµ¬É½¸½) \\z( ¤¬Â¿²á¤®¤Þ¤¹" msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA Àµµ¬É½¸½) ½ªÃ¼µ¹æ¤¬¤¢¤ê¤Þ¤»¤ó" -msgid "E874: (NFA) Could not pop the stack !" +msgid "E874: (NFA) Could not pop the stack!" msgstr "E874: (NFA) ¥¹¥¿¥Ã¥¯¤ò¥Ý¥Ã¥×¤Ç¤¤Þ¤»¤ó!" msgid "" diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po index 9db7db9886..969e71b8f0 100644 --- a/src/nvim/po/ja.po +++ b/src/nvim/po/ja.po @@ -2021,10 +2021,10 @@ msgstr "E216: ãã®ã‚ˆã†ãªã‚°ãƒ«ãƒ¼ãƒ—ã‚‚ã—ãã¯ã‚¤ãƒ™ãƒ³ãƒˆã¯ã‚ã‚Šã¾ã› msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" #, c-format msgid "E680: <buffer=%d>: invalid buffer number " @@ -2040,8 +2040,8 @@ msgid "E218: autocommand nesting too deep" msgstr "E218: autocommandã®å…¥ã‚ŒåãŒæ·±éŽãŽã¾ã™" #, c-format -msgid "%s Auto commands for \"%s\"" -msgstr "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" +msgstr "%s Autocommands for \"%s\"" #, c-format msgid "Executing %s" @@ -2938,7 +2938,7 @@ msgstr "-q [errorfile] 最åˆã®ã‚¨ãƒ©ãƒ¼ã§ç·¨é›†ã™ã‚‹" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" @@ -4732,7 +4732,7 @@ msgid "E66: \\z( not allowed here" msgstr "E66: \\z( ã¯ã‚³ã‚³ã§ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“" # -msgid "E67: \\z1 et al. not allowed here" +msgid "E67: \\z1 - \\z9 not allowed here" msgstr "E67: \\z1 ãã®ä»–ã¯ã‚³ã‚³ã§ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“" # @@ -4853,8 +4853,8 @@ msgstr "E869: (NFA) 未知ã®ã‚ªãƒšãƒ¬ãƒ¼ã‚¿ã§ã™: '\\@%c'" msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFA æ£è¦è¡¨ç¾) ç¹°ã‚Šè¿”ã—ã®åˆ¶é™å›žæ•°ã‚’èªè¾¼ä¸ã«ã‚¨ãƒ©ãƒ¼" -msgid "E871: (NFA regexp) Can't have a multi follow a multi !" -msgstr "E871: (NFA æ£è¦è¡¨ç¾) 繰り返㗠ã®å¾Œã« 繰り返㗠ã¯ã§ãã¾ã›ã‚“!" +msgid "E871: (NFA regexp) Can't have a multi follow a multi" +msgstr "E871: (NFA æ£è¦è¡¨ç¾) 繰り返㗠ã®å¾Œã« 繰り返㗠ã¯ã§ãã¾ã›ã‚“" msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA æ£è¦è¡¨ç¾) '(' ãŒå¤šéŽãŽã¾ã™" @@ -4865,7 +4865,7 @@ msgstr "E879: (NFA æ£è¦è¡¨ç¾) \\z( ãŒå¤šéŽãŽã¾ã™" msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA æ£è¦è¡¨ç¾) 終端記å·ãŒã‚ã‚Šã¾ã›ã‚“" -msgid "E874: (NFA) Could not pop the stack !" +msgid "E874: (NFA) Could not pop the stack!" msgstr "E874: (NFA) スタックをãƒãƒƒãƒ—ã§ãã¾ã›ã‚“!" msgid "" diff --git a/src/nvim/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po index 192d850c00..e048cb99b2 100644 --- a/src/nvim/po/ko.UTF-8.po +++ b/src/nvim/po/ko.UTF-8.po @@ -2460,7 +2460,7 @@ msgstr "E216: 그런 그룹ì´ë‚˜ ì´ë²¤íŠ¸ ì—†ìŒ: %s" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- ìžë™-ëª…ë ¹ ---" @@ -3378,7 +3378,7 @@ msgstr "-q [ì—러파ì¼] 첫 번째 ì—러가 ë‚œ íŒŒì¼ ê³ ì¹˜ê¸°" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/nb.po b/src/nvim/po/nb.po index e0cacc4a6b..b99e8ce465 100644 --- a/src/nvim/po/nb.po +++ b/src/nvim/po/nb.po @@ -2483,7 +2483,7 @@ msgstr "E216: Gruppen eller handlingen finnes ikke: %s" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Autokommandoer ---" @@ -2507,7 +2507,7 @@ msgstr "E218: Nøsting av autokommandoer for dyp" #: ../fileio.c:7143 #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s Autokommandoer for \"%s\"" #: ../fileio.c:7149 @@ -3392,7 +3392,7 @@ msgstr "-q [feilfil] rediger fil med første feil" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/nl.po b/src/nvim/po/nl.po index f2877903f2..56bcd94e79 100644 --- a/src/nvim/po/nl.po +++ b/src/nvim/po/nl.po @@ -2471,10 +2471,10 @@ msgstr "E216: onbekende groep of 'event': %s" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" #: ../fileio.c:6293 #, c-format @@ -2495,8 +2495,8 @@ msgstr "E218: hierarchie van aanroepen autocommands te diep" #: ../fileio.c:7143 #, c-format -msgid "%s Auto commands for \"%s\"" -msgstr "%s 'Auto commands' voor \"%s\"" +msgid "%s Autocommands for \"%s\"" +msgstr "%s 'Autocommands' voor \"%s\"" #: ../fileio.c:7149 #, c-format @@ -3389,7 +3389,7 @@ msgstr "-q [foutbestand] bewerk bestand dat eerste fout bevat" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/no.po b/src/nvim/po/no.po index e0cacc4a6b..b99e8ce465 100644 --- a/src/nvim/po/no.po +++ b/src/nvim/po/no.po @@ -2483,7 +2483,7 @@ msgstr "E216: Gruppen eller handlingen finnes ikke: %s" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Autokommandoer ---" @@ -2507,7 +2507,7 @@ msgstr "E218: Nøsting av autokommandoer for dyp" #: ../fileio.c:7143 #, c-format -msgid "%s Auto commands for \"%s\"" +msgid "%s Autocommands for \"%s\"" msgstr "%s Autokommandoer for \"%s\"" #: ../fileio.c:7149 @@ -3392,7 +3392,7 @@ msgstr "-q [feilfil] rediger fil med første feil" msgid "" "\n" "\n" -"usage:" +"Usage:" msgstr "" "\n" "\n" diff --git a/src/nvim/po/pl.UTF-8.po b/src/nvim/po/pl.UTF-8.po index 33ac034b1f..28e486df18 100644 --- a/src/nvim/po/pl.UTF-8.po +++ b/src/nvim/po/pl.UTF-8.po @@ -14,7 +14,7 @@ msgstr "" "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n" "Language: pl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " @@ -2441,7 +2441,7 @@ msgstr "E216: Nie ma takiej grupy lub wydarzenia: %s" #: ../fileio.c:6090 msgid "" "\n" -"--- Auto-Commands ---" +"--- Autocommands ---" msgstr "" "\n" "--- Autokomendy ---" @@ -2465,7 +2465,7 @@ msgstr "E218: zbyt gÅ‚Ä™bokie |