summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-03-07 13:20:54 +0100
committerBram Moolenaar <Bram@vim.org>2013-03-07 13:20:54 +0100
commit34700a6a15323a499d56b2f66a286fc368783371 (patch)
tree208ba037375ed002886ddbfa8f5c4eeed8327c7e
parent7534221ebaba7244f4daaf54bb91206cf45e8a5e (diff)
downloadvim-git-34700a6a15323a499d56b2f66a286fc368783371.tar.gz
Updated runtime files.
Diffstat
-rw-r--r--runtime/doc/change.txt2
-rw-r--r--runtime/doc/index.txt8
-rw-r--r--runtime/doc/mbyte.txt2
-rw-r--r--runtime/doc/message.txt8
-rw-r--r--runtime/doc/options.txt8
-rw-r--r--runtime/doc/syntax.txt31
-rw-r--r--runtime/doc/tags4
-rw-r--r--runtime/doc/todo.txt55
-rw-r--r--runtime/filetype.vim13
-rw-r--r--runtime/indent/falcon.vim3
-rw-r--r--runtime/indent/sdl.vim2
-rw-r--r--runtime/lang/menu_ja_jp.euc-jp.vim16
-rw-r--r--runtime/lang/menu_ja_jp.utf-8.vim16
-rw-r--r--runtime/lang/menu_japanese_japan.932.vim16
-rw-r--r--runtime/macros/editexisting.vim4
-rw-r--r--runtime/synmenu.vim21
-rw-r--r--runtime/syntax/c.vim10
-rw-r--r--runtime/syntax/cl.vim14
-rw-r--r--runtime/syntax/csdl.vim536
-rw-r--r--runtime/syntax/python.vim4
-rw-r--r--src/po/ja.po999
-rw-r--r--src/po/ja.sjis.po999
22 files changed, 1841 insertions, 930 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index d5f19a634..18cc812bd 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -600,7 +600,7 @@ For other systems the tmpnam() library function is used.
*g&*
g& Synonym for `:%s//~/&` (repeat last substitute with
last search pattern on all lines with the same flags).
- For exaple, when you first do a substitution with
+ For example, when you first do a substitution with
`:s/pattern/repl/flags` and then `/search` for
something else, `g&` will do `:%s/search/repl/flags`.
Mnemonic: global substitute. {not in Vi}
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 57ca2fd79..7ce87cf03 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.3. Last change: 2012 Jul 25
+*index.txt* For Vim version 7.3. Last change: 2013 Feb 28
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1134,7 +1134,7 @@ tag command action ~
|:cgetbuffer| :cgetb[uffer] get errors from buffer
|:cgetexpr| :cgete[xpr] get errors from expr
|:cgetfile| :cg[etfile] read file with error messages
-|:changes| :cha[nges] print the change list
+|:changes| :changes print the change list
|:chdir| :chd[ir] change directory
|:checkpath| :che[ckpath] list included files
|:checktime| :checkt[ime] check timestamp of loaded buffers
@@ -1383,7 +1383,7 @@ tag command action ~
|:promptrepl| :promptr[epl] open GUI dialog for search/replace
|:perldo| :perld[o] execute Perl command for each line
|:pop| :po[p] jump to older entry in tag stack
-|:popup| :pop[up] popup a menu by name
+|:popup| :popu[p] popup a menu by name
|:ppop| :pp[op] ":pop" in preview window
|:preserve| :pre[serve] write all text to swap file
|:previous| :prev[ious] go to previous file in argument list
@@ -1469,7 +1469,7 @@ tag command action ~
|:slast| :sla[st] split window and go to last file in the
argument list
|:smagic| :sm[agic] :substitute with 'magic'
-|:smap| :sma[p] like ":map" but for Select mode
+|:smap| :smap like ":map" but for Select mode
|:smapclear| :smapc[lear] remove all mappings for Select mode
|:smenu| :sme[nu] add menu for Select mode
|:snext| :sn[ext] split window and go to next file in the
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index c2d95104a..61647935f 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1067,7 +1067,7 @@ The actual mappings are in the lines below "loadkeymap". In the example "a"
is mapped to "A" and "b" to "B". Thus the first item is mapped to the second
item. This is done for each line, until the end of the file.
These items are exactly the same as what can be used in a |:lnoremap| command,
-using "<buffer>" to make the mappings local to the buffer..
+using "<buffer>" to make the mappings local to the buffer.
You can check the result with this command: >
:lmap
The two items must be separated by white space. You cannot include white
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 97c452502..35f6c49de 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt* For Vim version 7.3. Last change: 2011 May 10
+*message.txt* For Vim version 7.3. Last change: 2013 Feb 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -730,7 +730,11 @@ Vim cannot create a temporary file.
Can't open file {filename}
Can't read file {filename}
-Vim cannot read a temporary file.
+Vim cannot read a temporary file. Especially on Windows, this can be caused
+by wrong escaping of special characters for cmd.exe; the approach was
+changed with patch 7.3.443. Try using |shellescape()| for all shell arguments
+given to |system()|, or explicitly add escaping with ^. Also see
+'shellxquote' and 'shellxescape'.
*E464* >
Ambiguous use of user-defined command
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 559a61987..143656a98 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2013 Feb 20
+*options.txt* For Vim version 7.3. Last change: 2013 Feb 28
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -986,7 +986,7 @@ A jump table for the options with a short description can be found at |Q_op|.
- The backup file will be created in the first directory in the list
where this is possible. The directory must exist, Vim will not
create it for you.
- - Empty means that no backup file will be created ('patchmode' is
+ - Empty means that no backup file will be created ( 'patchmode' is
impossible!). Writing may fail because of this.
- A directory "." means to put the backup file in the same directory
as the edited file.
@@ -1703,7 +1703,7 @@ A jump table for the options with a short description can be found at |Q_op|.
when CTRL-P or CTRL-N are used. It is also used for whole-line
completion |i_CTRL-X_CTRL-L|. It indicates the type of completion
and the places to scan. It is a comma separated list of flags:
- . scan the current buffer ('wrapscan' is ignored)
+ . scan the current buffer ( 'wrapscan' is ignored)
w scan buffers from other windows
b scan other loaded buffers that are in the buffer list
u scan the unloaded buffers that are in the buffer list
@@ -7085,7 +7085,7 @@ A jump table for the options with a short description can be found at |Q_op|.
{not in Vi}
Encoding used for the terminal. This specifies what character
encoding the keyboard produces and the display will understand. For
- the GUI it only applies to the keyboard ('encoding' is used for the
+ the GUI it only applies to the keyboard ( 'encoding' is used for the
display). Except for the Mac when 'macatsui' is off, then
'termencoding' should be "macroman".
In the Win32 console version the default value is the console codepage
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b48307d01..b69753ad0 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.3. Last change: 2013 Jan 30
+*syntax.txt* For Vim version 7.3. Last change: 2013 Mar 01
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -999,6 +999,14 @@ comment highlighting, add the following line to your startup file: >
The ColdFusion syntax file is based on the HTML syntax file.
+CPP *cpp.vim* *ft-cpp-syntax*
+
+Most of things are same as |ft-c-syntax|.
+
+Variable Highlight ~
+cpp_no_c11 don't highlight C++11 standard items
+
+
CSH *csh.vim* *ft-csh-syntax*
This covers the shell named "csh". Note that on some systems tcsh is actually
@@ -2440,24 +2448,33 @@ Pascal. Use this if you don't use assembly and Pascal: >
PYTHON *python.vim* *ft-python-syntax*
-There are four options to control Python syntax highlighting.
+There are six options to control Python syntax highlighting.
For highlighted numbers: >
- :let python_highlight_numbers = 1
+ :let python_no_number_highlight = 1
For highlighted builtin functions: >
- :let python_highlight_builtins = 1
+ :let python_no_builtin_highlight = 1
For highlighted standard exceptions: >
- :let python_highlight_exceptions = 1
+ :let python_no_exception_highlight = 1
+
+For highlighted doctests and code inside: >
+ :let python_no_doctest_highlight = 1
+or >
+ :let python_no_doctest_code_highlight = 1
+(first option implies second one).
For highlighted trailing whitespace and mix of spaces and tabs: >
- :let python_highlight_space_errors = 1
+ :let python_space_error_highlight = 1
If you want all possible Python highlighting (the same as setting the
-preceding three options): >
+preceding last option and unsetting all other ones): >
:let python_highlight_all = 1
+Note: only existence of these options matter, not their value. You can replace
+ 1 above with anything.
+
QUAKE *quake.vim* *ft-quake-syntax*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index da079b286..89ac4a991 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4251,6 +4251,7 @@ E859 eval.txt /*E859*
E86 windows.txt /*E86*
E860 eval.txt /*E860*
E861 eval.txt /*E861*
+E862 eval.txt /*E862*
E87 windows.txt /*E87*
E88 windows.txt /*E88*
E89 message.txt /*E89*
@@ -6694,6 +6695,7 @@ mapmode-s map.txt /*mapmode-s*
mapmode-v map.txt /*mapmode-v*
mapmode-x map.txt /*mapmode-x*
mapping map.txt /*mapping*
+mapping-functions usr_41.txt /*mapping-functions*
mark motion.txt /*mark*
mark-functions usr_41.txt /*mark-functions*
mark-motions motion.txt /*mark-motions*
@@ -7561,6 +7563,7 @@ sgr-mouse options.txt /*sgr-mouse*
sh-awk syntax.txt /*sh-awk*
sh-embed syntax.txt /*sh-embed*
sh.vim syntax.txt /*sh.vim*
+sha256() eval.txt /*sha256()*
shell-window tips.txt /*shell-window*
shell_error-variable eval.txt /*shell_error-variable*
shellescape() eval.txt /*shellescape()*
@@ -8523,6 +8526,7 @@ white-space pattern.txt /*white-space*
whitespace pattern.txt /*whitespace*
wildcard editing.txt /*wildcard*
wildcards editing.txt /*wildcards*
+wildmenumode() eval.txt /*wildmenumode()*
win16-!start gui_w16.txt /*win16-!start*
win16-clipboard gui_w16.txt /*win16-clipboard*
win16-colors gui_w16.txt /*win16-colors*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index f17d2540a..7fde2eda9 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.3. Last change: 2013 Feb 20
+*todo.txt* For Vim version 7.3. Last change: 2013 Mar 07
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,16 +34,6 @@ not be repeated below, unless there is extra information.
*known-bugs*
-------------------- Known bugs and current work -----------------------
-Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
- Sutcliffe says it works well.
- Update 2007 May 22 for Vim 7.1
- Update 2008 Dec 2008 for Vim 7.2.xx (Sharonov)
- Update by Ken Takata (2012 Dec 31, 2013 Jan 4, 2013 Jan 26)
-
-Download counter for scripts no longer incremented?
-Because SourceForge does not have the IP address now, see ticket
-https://sourceforge.net/p/forge/site-support/2461/?page=1
-
Several syntax file match "^\s*" which may get underlined if that's in the
highlight group. Add a "\zs" after it?
@@ -55,13 +45,38 @@ Memory leaks in Lua, uncovered by test 85.
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
+Patch to build with Ruby 2.0 and Ming@ 64. (Ken Takata, 2013 Feb 28)
+
Checking runtime scripts: Thilo Six, 2012 Jun 6.
GTK: problem with 'L' in 'guioptions' changing the window width.
(Aaron Cornelius, 2012 Feb 6)
+Patch for this problem: (David B端rgin (glts), 2013 Mar 5)
+8 ":g//" gives "Pattern not found error" with E486. Should not use the
+ error number, it's not a regular error message.
+
+Patch to fix ":vimgrep //". (David B端rgin (glts), 2013 Mar 5)
+
+Updates for Debian runtime files. (James McCoy, 2013 Mar 3)
+Also an update for debcontrol in another message.
+
Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
+Patch for ":sort" not properly handling an empty search pattern when there is
+no previous search pattern. (David B端rgin, 2013 Mar 4)
+
+system() breaks clipboard text. (Yukihiro Nakadaira, 2013 Feb 28)
+Patch by Christian Brabandt, 2013 Mar 1.
+
+Patch for replace multi-byte character in multiple lines. (Yasuhiro Matsumoto,
+2013 Feb 27)
+
+Patch to avoid register being changed when yanking. (Christian Brabandt, 2013
+Feb 26)
+
+Patch to trigger QuitPre in more situations. (Tatsuro Fujii, 2013 Mar 3)
+
The CompleteDone autocommand needs some info passed to it:
- The word that was selected (empty if abandoned complete)
- Type of completion: tag, omnifunc, user func.
@@ -70,8 +85,8 @@ Win32: When a directory name contains an exclamation mark, completion doesn't
complete the contents of the directory. No escaping for the "!"? (Jan
Stocker, 2012 Jan 5)
-Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
-Patch by Christian Brabandt, Nov 22. Tests in another patch, Nov 23.
+Patch to fix wrong completion entry after using backspace. (reported by
+Olivier Teuliere, fixed by Christian Brabandt, 2013 Feb 26)
Patch to detect value of 'ambiwidth' from the termresponse.
(Hayaki Saito, 2013 Feb 11)
@@ -94,6 +109,9 @@ Patch to fix compiler warnings for MingW 4.5.3. (Ken Takata, 2013 Jan 26)
Bug: search() does not use the match at the cursor position if it's empty.
(Christian Brabandt, 2013 Feb 16) Patch later.
+On Mac do not define CASE_INSENSITIVE_FILENAME ? (Richo Healey, 2013 Mar 3)
+But do set 'wildignorecase' ?
+
Patch to make it possible to create Title Case in :s. with \L\u.
(James McCoy, 2013 Feb 13)
@@ -112,6 +130,9 @@ Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
Issue 54: document behavior of -complete, also expands arg.
+Matches might be highlighted correctly. Inefficient patch by Christian
+Brabandt, 2013 Feb 26.
+
New syntax files for apt. (quidame, 2012 Sep 21)
'ff' is wrong for one-line file without EOL. (Issue 77)
@@ -152,7 +173,7 @@ Or use expand('<sid>')?
Patch to make confirm() display colors. (Christian Brabandt, 2012 Nov 9)
-Patch to add functions for signs. (Christian Brabandt,, 2013 Jan 27)
+Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
Patch to use directX to draw text on Windows. Adds the 'directx' option.
(Taro Muraoka, 2013 Jan 25)
@@ -189,7 +210,7 @@ MS-Windows resizing problems:
'iminsert' global value set when using ":setlocal iminsert"? (Wu, 2012 Jun 23)
-Help for b:undo_indent'. (Thilo Six, 2012 May 28)
+Help for 'b:undo_indent'. (Thilo Six, 2012 May 28)
Also question if examples are correct.
It should be possible to make globpath() return a list instead of a string,
@@ -261,6 +282,8 @@ Problem with l: dictionary being locked in a function. (ZyX, 2011 Jul 21)
Should use has("browsefilter") in ftplugins. Requires patch 7.3.593.
+Update for vim2html.pl. (Tyru, 2013 Feb 22)
+
Issue 48: foldopen error can't be caught by try/catch
"dg_" deletes including the last character, "d:normal! g_" doesn't.
@@ -2284,8 +2307,6 @@ Macintosh:
the :catch commands are always executed, also when the file is edited
normally. Should reset did_emsg and undo side effects. Also make sure
the ATTENTION message shows up. Servatius Brandt works on this.
-8 ":g//" gives "Pattern not found error" with E486. Should not use the
- error number, it's not a regular error message.
7 Vimtutor leaves escape sequence in terminal. This is the xterm response to
requesting the version number. (Yasuhiro Matsumoto)
8 When redirecting and using ":silent" the current column for displaying and
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c427b1835..aee617cbe 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2013 Feb 20
+" Last Change: 2013 Feb 28
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -325,6 +325,9 @@ au BufNewFile,BufRead calendar setf calendar
" C#
au BufNewFile,BufRead *.cs setf cs
+" CSDL
+au BufNewFile,BufRead *.csdl setf csdl
+
" Cabal
au BufNewFile,BufRead *.cabal setf cabal
@@ -2194,8 +2197,12 @@ au BufNewFile,BufRead *.uc setf uc
au BufNewFile,BufRead */etc/updatedb.conf setf updatedb
" Upstart (init(8)) config files
-au BufNewFile,BufRead */etc/init/*.conf,*/.init/*.conf setf upstart
-au BufNewFile,BufRead */etc/init/*.override,*/.init/*.override setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.conf setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.override setf upstart
+au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override setf upstart
+au BufNewFile,BufRead */.init/*.conf,*/.init/*.override setf upstart
+au BufNewFile,BufRead */.config/upstart/*.conf setf upstart
+au BufNewFile,BufRead */.config/upstart/*.override setf upstart
" Vera
au BufNewFile,BufRead *.vr,*.vri,*.vrh setf vera
diff --git a/runtime/indent/falcon.vim b/runtime/indent/falcon.vim
index 41f8f3470..46a228e8b 100644
--- a/runtime/indent/falcon.vim
+++ b/runtime/indent/falcon.vim
@@ -5,7 +5,6 @@
" Credits: Thanks to the ruby.vim authors, I borrow a lot!
" Previous Maintainer: Brent A. Fulgham <bfulgham@debian.org>
" -----------------------------------------------------------
-" GetLatestVimScripts: 2752 1 :AutoInstall: falcon.vim
"======================================
" SETUP
@@ -132,7 +131,7 @@ function FalconGetIndent()
" If previous line ends in a semi-colon reset indent to previous
" lines setting
if prevline =~? ';\s*$' && prevnonblank(prevline) =~? ',\s*$'
- return chg = chg - (2 * &sw)
+ let chg = chg - (2 * &sw)
endif
" If previous line ended in a comma, indent again
diff --git a/runtime/indent/sdl.vim b/runtime/indent/sdl.vim
index b5e535eea..ba03f2d3f 100644
--- a/runtime/indent/sdl.vim
+++ b/runtime/indent/sdl.vim
@@ -73,7 +73,7 @@ function! GetSDLIndent()
" Systems and packages are always in column 0
if getline(v:lnum) =~? '^\s*\(\(end\)\=system\|\(end\)\=package\)'
- return 0;
+ return 0
endif
" Put each end* where the corresponding begin was
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index 23a00930b..d3961b90c 100644
--- a/runtime/lang/menu_ja_jp.euc-jp.vim
+++ b/runtime/lang/menu_ja_jp.euc-jp.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (EUC-JP)
" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change: 15-Jun-2012.
+" Last Change: 24-Feb-2013.
"
" Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@ menutrans &Paste 貼り付け(&P)
menutrans &Delete 削除(&D)
menutrans Select\ Blockwise 矩形ブロック選択
menutrans Select\ &Word 単語選択(&W)
+menutrans Select\ &Sentence 文選択(&S)
+menutrans Select\ Pa&ragraph 段落選択(&R)
menutrans Select\ &Line 行選択(&L)
menutrans Select\ &Block ブロック選択(&B)
menutrans Select\ &All すべて選択(&A)
@@ -301,12 +303,12 @@ menutrans &Convert\ to\ HTML HTMLへコンバート(&C)
" 成否はiconv次第、必ずしも指定したエンコードになるわけではないことに注意
if has('iconv')
" iconvのバージョン判定
- let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
- "
+ let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
" 読み込み
an 10.395 &File.-SEPICONV- <Nop>
an 10.396.100.100 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.100.110 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
an 10.396.100.120 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
else
@@ -317,7 +319,7 @@ if has('iconv')
" 再読込
an 10.396.110.100 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.110.110 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
an 10.396.110.120 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
else
@@ -329,7 +331,7 @@ if has('iconv')
" 保存
an 10.396.115 &File.エンコード指定(&E)\.\.\..-SEP1- <Nop>
an 10.396.120.100 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.120.110 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
an 10.396.120.120 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
else
@@ -337,6 +339,8 @@ if has('iconv')
an 10.396.120.120 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
endif
an 10.396.120.130 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+ unlet s:support_jisx0213
endif
let &cpo = s:keepcpo
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index 2638c3c1b..0e48fcf52 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (UTF-8)
" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change: 15-Jun-2012.
+" Last Change: 24-Feb-2013.
"
" Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@ menutrans &Paste 莢若篁(&P)
menutrans &Delete (&D)
menutrans Select\ Blockwise 綵≪御
menutrans Select\ &Word 茯御(&W)
+menutrans Select\ &Sentence 御(&S)
+menutrans Select\ Pa&ragraph 罧笈初御(&R)
menutrans Select\ &Line 茵御(&L)
menutrans Select\ &Block 御(&B)
menutrans Select\ &All 鴻御(&A)
@@ -301,12 +303,12 @@ menutrans &Convert\ to\ HTML HTML吾潟潟若(&C)
" iconv罨∞綽絎潟潟若с羈
if has('iconv')
" iconv若吾с喝ゅ
- let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
- "
+ let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
" 茯粋昭
an 10.395 &File.-SEPICONV- <Nop>
an 10.396.100.100 &File.潟潟若絎(&E)\.\.\..(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.100.110 &File.潟潟若絎(&E)\.\.\..(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
an 10.396.100.120 &File.潟潟若絎(&E)\.\.\..(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
else
@@ -317,7 +319,7 @@ if has('iconv')
" 茯莨
an 10.396.110.100 &File.潟潟若絎(&E)\.\.\..茯莨(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.110.110 &File.潟潟若絎(&E)\.\.\..茯莨(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
an 10.396.110.120 &File.潟潟若絎(&E)\.\.\..茯莨(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
else
@@ -329,7 +331,7 @@ if has('iconv')
" 篆絖
an 10.396.115 &File.潟潟若絎(&E)\.\.\..-SEP1- <Nop>
an 10.396.120.100 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.120.110 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
an 10.396.120.120 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
else
@@ -337,6 +339,8 @@ if has('iconv')
an 10.396.120.120 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
endif
an 10.396.120.130 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+ unlet s:support_jisx0213
endif
let &cpo = s:keepcpo
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index fc030134e..eee7e7640 100644
--- a/runtime/lang/menu_japanese_japan.932.vim
+++ b/runtime/lang/menu_japanese_japan.932.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (CP932)
" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change: 15-Jun-2012.
+" Last Change: 24-Feb-2013.
"
" Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@ menutrans &Paste \t(&P)
menutrans &Delete (&D)
menutrans Select\ Blockwise `ubNI
menutrans Select\ &Word PI(&W)
+menutrans Select\ &Sentence I(&S)
+menutrans Select\ Pa&ragraph iI(&R)
menutrans Select\ &Line sI(&L)
menutrans Select\ &Block ubNI(&B)
menutrans Select\ &All I(&A)
@@ -301,12 +303,12 @@ menutrans &Convert\ to\ HTML HTMLRo[g(&C)
" iconvAKwGR[h
if has('iconv')
" iconvo[W
- let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
- "
+ let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
"
an 10.395 &File.-SEPICONV- <Nop>
an 10.396.100.100 &File.GR[hw(&E)\.\.\..J(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.100.110 &File.GR[hw(&E)\.\.\..J(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
an 10.396.100.120 &File.GR[hw(&E)\.\.\..J(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
else
@@ -317,7 +319,7 @@ if has('iconv')
"
an 10.396.110.100 &File.GR[hw(&E)\.\.\..(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.110.110 &File.GR[hw(&E)\.\.\..(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
an 10.396.110.120 &File.GR[hw(&E)\.\.\..(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
else
@@ -329,7 +331,7 @@ if has('iconv')
"
an 10.396.115 &File.GR[hw(&E)\.\.\..-SEP1- <Nop>
an 10.396.120.100 &File.GR[hw(&E)\.\.\..(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.120.110 &File.GR[hw(&E)\.\.\..(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
an 10.396.120.120 &File.GR[hw(&E)\.\.\..(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
else
@@ -337,6 +339,8 @@ if has('iconv')
an 10.396.120.120 &File.GR[hw(&E)\.\.\..(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
endif
an 10.396.120.130 &File.GR[hw(&E)\.\.\..(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+ unlet s:support_jisx0213
endif
let &cpo = s:keepcpo
diff --git a/runtime/macros/editexisting.vim b/runtime/macros/editexisting.vim
index 07c55f675..c18f22569 100644
--- a/runtime/macros/editexisting.vim
+++ b/runtime/macros/editexisting.vim
@@ -1,6 +1,6 @@
" Vim Plugin: Edit the file with an existing Vim if possible
" Maintainer: Bram Moolenaar
-" Last Change: 2008 May 29
+" Last Change: 2013 Feb 24
" This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32)
" $VIM/vimfiles/plugin directory. Or make a symbolic link, so that you
@@ -98,7 +98,7 @@ func! EditExisting(fname, command)
" Make this tab page the current one and find the window number.
exe 'tabnext ' . (i + 1)
let winnr = bufwinnr(a:fname)
- break;
+ break
endif
endfor
endif
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 92678d149..d964d0e91 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -124,16 +124,17 @@ an 50.20.360 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
an 50.20.370 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
an 50.20.380 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
an 50.20.390 &Syntax.C.Crontab :cal SetSyn("crontab")<CR>
-an 50.20.400 &Syntax.C.CSP :cal SetSyn("csp")<CR>
-an 50.20.410 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
-an 50.20.420 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
-an 50.20.430 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
-an 50.20.440 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
-an 50.20.450 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
-an 50.20.460 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
-an 50.20.470 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
-an 50.20.480 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
-an 50.20.490 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
+an 50.20.400 &Syntax.C.CSDL :cal SetSyn("csdl")<CR>
+an 50.20.410 &Syntax.C.CSP :cal SetSyn("csp")<CR>
+an 50.20.420 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
+an 50.20.430 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
+an 50.20.440 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
+an 50.20.450 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
+an 50.20.460 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
+an 50.20.470 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
+an 50.20.480 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
+an 50.20.490 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
+an 50.20.500 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
an 50.30.100 &Syntax.DE.D :cal SetSyn("d")<CR>
an 50.30.110 &Syntax.DE.Datascript :cal SetSyn("datascript")<CR>
an 50.30.120 &Syntax.DE.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog")<CR>
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 501c91a44..c663c4eb5 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2012 Dec 14
+" Last Change: 2013 Mar 07
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -36,7 +36,13 @@ endif
if exists("c_no_cformat")
syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
" cCppString: same as cString, but ends at end of line
- syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,@Spell
+ if !exists("cpp_no_cpp11") " ISO C++11
+ syn region cCppString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+ else
+ syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+ endif
+ syn region cCppOut2 contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip
+ syn region cCppSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip
else
if !exists("c_no_c99") " ISO C99
syn match cFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index 82660db74..41c045fb0 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -1,12 +1,14 @@
" Vim syntax file
-" Language: CL
-" (pronounced alphabetically, and NOT known as Clever)
-" (CL was created by Multibase, http://www.mbase.com.au)
+" Language: CL
+" (pronounced alphabetically: "Cee-El".
+" CL stands for Clever Language,
+" but the language is CL, not "Clever".
+" CL was created by Multibase, http://www.mbase.com.au)
" Filename extensions: *.ent
-" *.eni
+" *.eni
" Maintainer: Philip Uren <philuSPAX@ieee.org> Remove SPAX spam block
-" Version: 5
-" Last Change: Aug 16 2012
+" Version: 6
+" Last Change: Mar 06 2013
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
diff --git a/runtime/syntax/csdl.vim b/runtime/syntax/csdl.vim
new file mode 100644
index 000000000..f7d30f164
--- /dev/null
+++ b/runtime/syntax/csdl.vim
@@ -0,0 +1,536 @@
+" Vim syntax file
+" Language: Curated Stream Definition Language (CSDL)
+" Maintainer: Jacek Artymiak
+" Latest Revision: 25 February 2013
+
+if exists("b:current_syntax")
+ finish
+endif
+
+setlocal iskeyword=.,@,48-57,_,192-255
+syn case ignore
+
+syn match csdlKeyword "tag "
+syn match csdlKeyword "stream "
+syn match csdlKeyword "return "
+
+syn keyword csdlOperator contains
+syn match csdlOperator "cs contains"
+syn keyword csdlOperator substr
+syn match csdlOperator "cs substr"
+syn keyword csdlOperator contains_any
+syn match csdlOperator "cs contains_any"
+syn keyword csdlOperator any
+syn match csdlOperator "cs any"
+syn keyword csdlOperator contains_near
+syn match csdlOperator "cs contains_near"
+syn keyword csdlOperator exists
+syn keyword csdlOperator in
+syn keyword csdlOperator url_in
+syn match csdlOperator "=="
+syn match csdlOperator "!="
+syn match csdlOperator "cs =="
+syn match csdlOperator "cs !="
+syn match csdlOperator ">"
+syn match csdlOperator ">="
+syn match csdlOperator "<"
+syn match csdlOperator "<="
+syn keyword csdlOperator regex_partial
+syn keyword csdlOperator regex_exact
+syn keyword csdlOperator geo_box
+syn keyword csdlOperator geo_radius
+syn keyword csdlOperator geo_polygon
+
+syn keyword csdlLogicalOperator and
+syn keyword csdlLogicalOperator or
+syn keyword csdlLogicalOperator not
+
+syn match csdlTarget 'reddit\.title'
+syn match csdlTarget 'reddit\.content'
+syn match csdlTarget 'reddit\.contenttype'
+syn match csdlTarget 'reddit\.link'
+syn match csdlTarget 'reddit\.author\.name'
+syn match csdlTarget 'reddit\.author\.link'
+syn match csdlTarget 'reddit\.type'
+syn match csdlTarget 'reddit\.thread'
+syn match csdlTarget 'interaction\.type'
+syn match csdlTarget 'interaction\.title'
+syn match csdlTarget 'interaction\.content'
+syn match csdlTarget 'interaction\.source'
+syn match csdlTarget 'interaction\.geo'
+syn match csdlTarget 'interaction\.link'
+syn match csdlTarget 'interaction\.author\.username'
+syn match csdlTarget 'interaction\.author\.name'
+syn match csdlTarget 'interaction\.author\.id'
+syn match csdlTarget 'interaction\.author\.avatar'
+syn match csdlTarget 'interaction\.author\.link'
+syn match csdlTarget 'interaction\.sample'
+syn match csdlTarget 'links\.title'
+syn match csdlTarget 'links\.url'
+syn keyword csdlTarget links.normalized_url
+syn match csdlTarget 'links\.hops'
+syn match csdlTarget 'links\.code'
+syn match csdlTarget 'links\.domain'
+syn keyword csdlTarget links.retweet_count
+syn match csdlTarget 'links\.age'
+syn keyword csdlTarget links.meta.content_type
+syn match csdlTarget 'links\.meta\.charset'
+syn match csdlTarget 'links\.meta\.lang'
+syn match csdlTarget 'links\.meta\.keywords'
+syn match csdlTarget 'links\.meta\.description'
+syn match csdlTarget 'links\.meta\.newskeywords'
+syn match csdlTarget 'links\.meta\.standout'
+syn match csdlTarget 'links\.meta\.opengraph\.type'
+syn match csdlTarget 'links\.meta\.opengraph\.title'
+syn match csdlTarget 'links\.meta\.opengraph\.image'
+syn match csdlTarget 'links\.meta\.opengraph\.url'
+syn match csdlTarget 'links\.meta\.opengraph\.description'
+syn keyword csdlTarget links.meta.opengraph.site_name
+syn match csdlTarget 'links\.meta\.opengraph\.email'
+syn keyword csdlTarget links.meta.opengraph.phone_number
+syn keyword csdlTarget links.meta.opengraph.fax_number
+syn match csdlTarget 'links\.meta\.opengraph\.geo'
+syn keyword csdlTarget links.meta.opengraph.street_address
+syn match csdlTarget 'links\.meta\.opengraph\.locality'
+syn match csdlTarget 'links\.meta\.opengraph\.region'
+syn keyword csdlTarget links.meta.opengraph.postal_code
+syn match csdlTarget 'links\.meta\.opengraph\.activity'
+syn match csdlTarget 'links\.meta\.opengraph\.sport'
+syn match csdlTarget 'links\.meta\.opengraph\.bar'
+syn match csdlTarget 'links\.meta\.opengraph\.company'
+syn match csdlTarget 'links\.meta\.opengraph\.cafe'
+syn match csdlTarget 'links\.meta\.opengraph\.hotel'
+syn match csdlTarget 'links\.meta\.opengraph\.restaurant'
+syn match csdlTarget 'links\.meta\.opengraph\.cause'
+syn keyword csdlTarget links.meta.opengraph.sports_league
+syn keyword csdlTarget links.meta.opengraph.sports_team
+syn match csdlTarget 'links\.meta\.opengraph\.band'
+syn match csdlTarget 'links\.meta\.opengraph\.government'
+syn keyword csdlTarget links.meta.opengraph.non_profit
+syn match csdlTarget 'links\.meta\.opengraph\.school'
+syn match csdlTarget 'links\.meta\.opengraph\.university'
+syn match csdlTarget 'links\.meta\.opengraph\.actor'
+syn match csdlTarget 'links\.meta\.opengraph\.athlete'
+syn match csdlTarget 'links\.meta\.opengraph\.author'
+syn match csdlTarget 'links\.meta\.opengraph\.director'
+syn match csdlTarget 'links\.meta\.opengraph\.musician'
+syn match csdlTarget 'links\.meta\.opengraph\.politician'
+syn keyword csdlTarget links.meta.opengraph.public_figure
+syn match csdlTarget 'links\.meta\.opengraph\.city'
+syn match csdlTarget 'links\.meta\.opengraph\.country'
+syn match csdlTarget 'links\.meta\.opengraph\.landmark'
+syn keyword csdlTarget links.meta.opengraph.state_province
+syn match csdlTarget 'links\.meta\.opengraph\.album'
+syn match csdlTarget 'links\.meta\.opengraph\.book'
+syn match csdlTarget 'links\.meta\.opengraph\.drink'
+syn match csdlTarget 'links\.meta\.opengraph\.food'
+syn match csdlTarget 'links\.meta\.opengraph\.game'
+syn match csdlTarget 'links\.meta\.opengraph\.movie'
+syn match csdlTarget 'links\.meta\.opengraph\.product'
+syn match csdlTarget 'links\.meta\.opengraph\.song'
+syn keyword csdlTarget links.meta.opengraph.tv_show
+syn match csdlTarget 'links\.meta\.opengraph\.blog'
+syn match csdlTarget 'links\.meta\.opengraph\.website'
+syn match csdlTarget 'links\.meta\.opengraph\.article'
+syn match csdlTarget 'links\.meta\.twitter\.card'
+syn match csdlTarget 'links\.meta\.twitter\.site'
+syn keyword csdlTarget links.meta.twitter.site_id
+syn match csdlTarget 'links\.meta\.twitter\.creator'
+syn keyword csdlTarget links.meta.twitter.creator_id
+syn match csdlTarget 'links\.meta\.twitter\.url'
+syn match csdlTarget 'links\.meta\.twitter\.description'
+syn match csdlTarget 'links\.meta\.twitter\.title'
+syn match csdlTarget 'links\.meta\.twitter\.image'
+syn keyword csdlTarget links.meta.twitter.image_width
+syn keyword csdlTarget links.meta.twitter.image_height
+syn match csdlTarget 'links\.meta\.twitter\.player'
+syn keyword csdlTarget links.meta.twitter.player_width
+syn keyword csdlTarget links.meta.twitter.player_height
+syn keyword csdlTarget links.meta.twitter.player_stream
+syn keyword csdlTarget links.meta.twitter.player_stream_content_type
+syn match csdlTarget 'myspace\.link'
+syn match csdlTarget 'myspace\.content'
+syn match csdlTarget 'myspace\.contenttype'
+syn match csdlTarget 'myspace\.category'
+syn match csdlTarget 'myspace\.author\.username'
+syn match csdlTarget 'myspace\.author\.name'
+syn match csdlTarget 'myspace\.author\.id'
+syn match csdlTarget 'myspace\.author\.link'
+syn match csdlTarget 'myspace\.author\.avatar'
+syn match csdlTarget 'myspace\.geo'
+syn match csdlTarget 'myspace\.verb'
+syn match csdlTarget 'newscred\.type'
+syn match csdlTarget 'newscred\.article\.domain'
+syn match csdlTarget 'newscred\.video\.domain'
+syn match csdlTarget 'newscred\.article\.topics'
+syn match csdlTarget 'newscred\.video\.topics'
+syn match csdlTarget 'newscred\.article\.category'
+syn match csdlTarget 'newscred\.video\.category'
+syn match csdlTarget 'newscred\.article\.title'
+syn match csdlTarget 'newscred\.video\.title'
+syn match csdlTarget 'newscred\.article\.content'
+syn match csdlTarget 'newscred\.article\.fulltext'
+syn match csdlTarget 'newscred\.article\.authors'
+syn match csdlTarget 'newscred\.image\.caption'
+syn match csdlTarget 'newscred\.video\.caption'
+syn match csdlTarget 'newscred\.image\.attribution\.text'
+syn match csdlTarget 'newscred\.image\.attribution\.link'
+syn match csdlTarget 'newscred\.source\.name'
+syn match csdlTarget 'newscred\.source\.link'
+syn match csdlTarget 'newscred\.source\.domain'
+syn keyword csdlTarget newscred.source.media_type
+syn keyword csdlTarget newscred.source.company_type
+syn match csdlTarget 'newscred\.source\.country'
+syn match csdlTarget 'newscred\.source\.circulation'
+syn match csdlTarget 'newscred\.source\.founded'
+syn match csdlTarget 'imdb\.title'
+syn match csdlTarget 'imdb\.content'
+syn match csdlTarget 'imdb\.contenttype'
+syn match csdlTarget 'imdb\.link'
+syn match csdlTarget 'imdb\.author\.name'
+syn match csdlTarget 'imdb\.author\.link'
+syn match csdlTarget 'imdb\.type'
+syn match csdlTarget 'imdb\.thread'
+syn match csdlTarget 'amazon\.title'
+syn match csdlTarget 'amazon\.content'
+syn match csdlTarget 'amazon\.contenttype'
+syn match csdlTarget 'amazon\.link'
+syn match csdlTarget 'amazon\.author\.name'
+syn match csdlTarget 'amazon\.author\.link'
+syn match csdlTarget 'amazon\.type'
+syn match csdlTarget 'amazon\.thread'
+syn match csdlTarget 'salience\.content\.sentiment'
+syn match csdlTarget 'salience\.content\.topics'
+syn match csdlTarget 'salience\.title\.sentiment'
+syn match csdlTarget 'salience\.title\.topics'
+syn match csdlTarget 'salience\.content\.entities\.name'
+syn match csdlTarget 'salience\.content\.entities\.type'
+syn match csdlTarget 'salience\.title\.entities\.name'
+syn match csdlTarget 'salience\.title\.entities\.type'
+syn match csdlTarget 'klout\.score'
+syn match csdlTarget 'klout\.network'
+syn match csdlTarget 'klout\.amplification'
+syn keyword csdlTarget klout.true_reach
+syn match csdlTarget 'klout\.topics'
+syn match csdlTarget 'wikipedia\.author\.talk'
+syn match csdlTarget 'wikipedia\.author\.contributions'
+syn match csdlTarget 'wikipedia\.author\.username'
+syn match csdlTarget 'wikipedia\.body'
+syn match csdlTarget 'wikipedia\.title'
+syn match csdlTarget 'wikipedia\.images'
+syn match csdlTarget 'wikipedia\.categories'
+syn match csdlTarget 'wikipedia\.externallinks'
+syn match csdlTarget 'wikipedia\.ns'
+syn match csdlTarget 'wikipedia\.namespace'
+syn match csdlTarget 'wikipedia\.pageid'
+syn match csdlTarget 'wikipedia\.parentid'
+syn match csdlTarget 'wikipedia\.oldlen'
+syn match csdlTarget 'wikipedia\.newlen'
+syn match csdlTarget 'wikipedia\.changetype'
+syn match csdlTarget 'wikipedia\.diff\.from'
+syn match csdlTarget 'wikipedia\.diff\.to'
+syn match csdlTarget 'wikipedia\.diff\.changes\.added'
+syn match csdlTarget 'wikipedia\.diff\.changes\.removed'
+syn keyword csdlTarget demographic.twitter_activity
+syn match csdlTarget 'demographic\.location\.country'
+syn keyword csdlTarget demographic.location.us_state
+syn match csdlTarget 'demographic\.location\.city'
+syn match csdlTarget 'demographic\.type'
+syn match csdlTarget 'demographic\.sex'
+syn match csdlTarget 'demographic\.status\.relationship'
+syn match csdlTarget 'demographic\.status\.work'
+syn keyword csdlTarget demographic.likes_and_interests
+syn keyword csdlTarget demographic.first_language
+syn match csdlTarget 'demographic\.professions'
+syn match csdlTarget 'demographic\.services'
+syn keyword csdlTarget demographic.large_accounts_followed
+syn keyword csdlTarget demographic.age_range.start
+syn keyword csdlTarget demographic.age_range.end
+syn match csdlTarget 'demographic\.income\.start'
+syn match csdlTarget 'demographic\.income\.end'
+syn keyword csdlTarget demographic.main_street.dressed_by
+syn keyword csdlTarget demographic.main_street.shop_at
+syn keyword csdlTarget demographic.main_street.eat_and_drink_at
+syn match csdlTarget 'demographic\.accounts\.categories'
+syn match csdlTarget 'tumblr\.activity'
+syn match csdlTarget 'tumblr\.source\.blogid'
+syn match csdlTarget 'tumblr\.dest\.blogid'
+syn match csdlTarget 'tumblr\.dest\.postid'
+syn match csdlTarget 'tumblr\.root\.blogid'
+syn match csdlTarget 'tumblr\.root\.postid'
+syn match csdlTarget 'tumblr\.blogid'
+syn keyword csdlTarget tumblr.blog_name
+syn match csdlTarget 'tumblr\.type'
+syn match csdlTarget 'tumblr\.title'
+syn match csdlTarget 'tumblr\.body'
+syn match csdlTarget 'tumblr\.text'
+syn match csdlTarget 'tumblr\.tags'
+syn keyword csdlTarget tumblr.track_name
+syn match csdlTarget 'tumblr\.album'
+syn match csdlTarget 'tumblr\.link'
+syn match csdlTarget 'tumblr\.meta\.url'
+syn match csdlTarget 'tumblr\.meta\.type'
+syn match csdlTarget 'tumblr\.meta\.description'
+syn keyword csdlTarget tumblr.meta.likes_local
+syn keyword csdlTarget tumblr.meta.likes_global
+syn keyword csdlTarget tumblr.meta.reblogged_global
+syn match csdlTarget 'demographic\.gender'
+syn match csdlTarget 'flickr\.title'
+syn match csdlTarget 'flickr\.content'
+syn match csdlTarget 'flickr\.contenttype'
+syn match csdlTarget 'flickr\.link'
+syn match csdlTarget 'flickr\.author\.name'
+syn match csdlTarget 'flickr\.author\.link'
+syn match csdlTarget 'flickr\.author\.username'
+syn match csdlTarget 'flickr\.type'
+syn match csdlTarget 'flickr\.thread'
+syn match csdlTarget 'twitter\.text'
+syn match csdlTarget 'twitter\.source'
+syn match csdlTarget 'twitter\.mentions'
+syn keyword csdlTarget twitter.mention_ids
+syn match csdlTarget 'twitter\.links'
+syn match csdlTarget 'twitter\.domains'
+syn keyword csdlTarget twitter.in_reply_to_screen_name
+syn keyword csdlTarget twitter.in_reply_to_user_id
+syn keyword csdlTarget twitter.in_reply_to_status_id
+syn keyword csdlTarget twitter.filter_level
+syn match csdlTarget 'twitter\.lang'
+syn match csdlTarget 'twitter\.geo'
+syn match csdlTarget 'twitter\.user\.description'
+syn match csdlTarget 'twitter\.user\.location'
+syn keyword csdlTarget twitter.user.statuses_count
+syn keyword csdlTarget twitter.user.followers_count
+syn keyword csdlTarget twitter.user.follower_ratio
+syn keyword csdlTarget twitter.user.profile_age
+syn keyword csdlTarget twitter.user.friends_count
+syn keyword csdlTarget twitter.user.screen_name
+syn match csdlTarget 'twitter\.user\.lang'
+syn keyword csdlTarget twitter.user.time_zone
+syn match csdlTarget 'twitter\.user\.name'
+syn match csdlTarget 'twitter\.user\.id'
+syn keyword csdlTarget twitter.user.listed_count
+syn match csdlTarget 'twitter\.user\.url'
+syn match csdlTarget 'twitter\.user\.verified'
+syn keyword csdlTarget twitter.place.place_type
+syn match csdlTarget 'twitter\.place\.country'
+syn keyword csdlTarget twitter.place.country_code
+syn keyword csdlTarget twitter.place.full_name
+syn match csdlTarget 'twitter\.place\.name'
+syn match csdlTarget 'twitter\.place\.url'
+syn match csdlTarget 'twitter\.place\.attributes\.locality'
+syn match csdlTarget 'twitter\.place\.attributes\.region'
+syn keyword csdlTarget twitter.place.attributes.street_address
+syn match csdlTarget 'twitter\.status'
+syn match csdlTarget 'twitter\.retweet\.text'
+syn match csdlTarget 'twitter\.retweet\.elapsed'
+syn match csdlTarget 'twitter\.retweet\.source'
+syn keyword csdlTarget twitter.retweet.filter_level
+syn match csdlTarget 'twitter\.retweet\.lang'
+syn match csdlTarget 'twitter\.retweet\.user\.description'
+syn match csdlTarget 'twitter\.retweet\.user\.location'
+syn keyword csdlTarget twitter.retweet.user.statuses_count
+syn keyword csdlTarget twitter.retweet.user.followers_count
+syn keyword csdlTarget twitter.retweet.user.follower_ratio
+syn keyword csdlTarget twitter.retweet.user.profile_age
+syn keyword csdlTarget twitter.retweet.user.friends_count
+syn keyword csdlTarget twitter.retweet.user.screen_name
+syn match csdlTarget 'twitter\.retweet\.user\.lang'
+syn keyword csdlTarget twitter.retweet.user.time_zone
+syn match csdlTarget 'twitter\.retweet\.user\.name'
+syn match csdlTarget 'twitter\.retweet\.user\.id'
+syn keyword csdlTarget twitter.retweet.user.listed_count
+syn match csdlTarget 'twitter\.retweet\.user\.url'
+syn match csdlTarget 'twitter\.retweet\.user\.verified'
+syn match csdlTarget 'twitter\.retweeted\.id'
+syn match csdlTarget 'twitter\.retweeted\.source'
+syn keyword csdlTarget twitter.retweeted.in_reply_to_screen_name
+syn keyword csdlTarget twitter.retweeted.in_reply_to_user_id_str
+syn keyword csdlTarget twitter.retweeted.in_reply_to_status_id
+syn match csdlTarget 'twitter\.retweet\.count'
+syn match csdlTarget 'twitter\.retweet\.mentions'
+syn keyword csdlTarget twitter.retweet.mention_ids
+syn match csdlTarget 'twitter\.retweet\.links'
+syn match csdlTarget 'twitter\.retweet\.domains'
+syn match csdlTarget 'twitter\.retweeted\.user\.description'
+syn match csdlTarget 'twitter\.retweeted\.user\.location'
+syn keyword csdlTarget twitter.retweeted.user.statuses_count
+syn keyword csdlTarget twitter.retweeted.user.followers_count
+syn keyword csdlTarget twitter.retweeted.user.follower_ratio
+syn keyword csdlTarget twitter.retweeted.user.profile_age
+syn keyword csdlTarget twitter.retweeted.user.friends_count
+syn keyword csdlTarget twitter.retweeted.user.screen_name
+syn match csdlTarget 'twitter\.retweeted\.user\.lang'
+syn keyword csdlTarget twitter.retweeted.user.time_zone
+syn match csdlTarget 'twitter\.retweeted\.user\.name'
+syn match csdlTarget 'twitter\.retweeted\.user\.id'
+syn keyword csdlTarget twitter.retweeted.user.listed_count
+syn match csdlTarget 'twitter\.retweeted\.user\.url'
+syn match csdlTarget 'twitter\.retweeted\.user\.verified'
+syn match csdlTarget 'twitter\.retweeted\.geo'
+syn keyword csdlTarget twitter.retweeted.place.place_type
+syn match csdlTarget 'twitter\.retweeted\.place\.country'
+syn keyword csdlTarget twitter.retweeted.place.country_code
+syn keyword csdlTarget twitter.retweeted.place.full_name
+syn match csdlTarget 'twitter\.retweeted\.place\.name'
+syn match csdlTarget 'twitter\.retweeted\.place\.url'
+syn match csdlTarget 'twitter\.retweeted\.place\.attributes'
+syn match csdlTarget 'twitter\.hashtags'
+syn match csdlTarget 'twitter\.retweet\.hashtags'
+syn match csdlTarget 'twitter\.media\.type'
+syn keyword csdlTarget twitter.media.media_url
+syn keyword csdlTarget twitter.media.display_url
+syn match csdlTarget 'twitter\.retweet\.media\.type'
+syn keyword csdlTarget twitter.retweet.media.media_url
+syn keyword csdlTarget twitter.retweet.media.display_url
+syn match csdlTarget 'blog\.title'
+syn match csdlTarget 'blog\.content'
+syn match csdlTarget 'blog\.contenttype'
+syn match csdlTarget 'blog\.link'
+syn match csdlTarget 'blog\.domain'
+syn match csdlTarget 'blog\.author\.name'
+syn match csdlTarget 'blog\.author\.link'
+syn match csdlTarget 'blog\.author\.avatar'
+syn match csdlTarget 'blog\.author\.username'
+syn match csdlTarget 'blog\.type'
+syn match csdlTarget 'blog\.post\.link'
+syn match csdlTarget 'blog\.post\.title'
+syn match csdlTarget 'facebook\.author\.name'
+syn match csdlTarget 'facebook\.author\.link'
+syn match csdlTarget 'facebook\.author\.id'
+syn match csdlTarget 'facebook\.author\.avatar'
+syn match csdlTarget 'facebook\.message'
+syn match csdlTarget 'facebook\.description'
+syn match csdlTarget 'facebook\.caption'
+syn match csdlTarget 'facebook\.type'
+syn match csdlTarget 'facebook\.application'
+syn match csdlTarget 'facebook\.source'
+syn match csdlTarget 'facebook\.link'
+syn match csdlTarget 'facebook\.name'
+syn match csdlTarget 'facebook\.to\.names'
+syn match csdlTarget 'facebook\.to\.ids'
+syn match csdlTarget 'facebook\.og\.title'
+syn match csdlTarget 'facebook\.og\.location'
+syn match csdlTarget 'facebook\.og\.photos'
+syn match csdlTarget 'facebook\.og\.by'
+syn match csdlTarget 'facebook\.og\.description'
+syn match csdlTarget 'facebook\.og\.type'
+syn match csdlTarget 'facebook\.og\.length'
+syn match csdlTarget 'facebook\.likes\.count'
+syn match csdlTarget 'facebook\.likes\.names'
+syn match csdlTarget 'facebook\.likes\.ids'
+syn match csdlTarget 'topix\.title'
+syn match csdlTarget 'topix\.content'
+syn match csdlTarget 'topix\.contenttype'
+syn match csdlTarget 'topix\.link'
+syn match csdlTarget 'topix\.author\.name'
+syn match csdlTarget 'topix\.type'
+syn match csdlTarget 'topix\.thread'
+syn match csdlTarget 'topix\.author\.location'
+syn match csdlTarget 'bitly\.user\.agent'
+syn keyword csdlTarget bitly.url_hash
+syn match csdlTarget 'bitly\.share\.hash'
+syn match csdlTarget 'bitly\.cname'
+syn keyword csdlTarget bitly.referring_url
+syn keyword csdlTarget bitly.referring_domain
+syn match csdlTarget 'bitly\.url'
+syn match csdlTarget 'bitly\.domain'
+syn keyword csdlTarget bitly.country_code
+syn keyword csdlTarget bitly.geo_region_code
+syn match csdlTarget 'bitly\.country'
+syn keyword csdlTarget bitly.geo_region
+syn keyword csdlTarget bitly.geo_city
+syn match csdlTarget 'bitly\.geo'
+syn match csdlTarget 'bitly\.timezone'
+syn match csdlTarget 'trends\.type'
+syn match csdlTarget 'trends\.content'
+syn match csdlTarget 'trends\.source'
+syn match csdlTarget 'board\.title'
+syn match csdlTarget 'board\.content'
+syn match csdlTarget 'board\.contenttype'
+syn match csdlTarget 'board\.link'
+syn match csdlTarget 'board\.domain'
+syn match csdlTarget 'board\.author\.name'
+syn match csdlTarget 'board\.author\.link'
+syn match csdlTarget 'board\.author\.avatar'
+syn match csdlTarget 'board\.author\.username'
+syn match csdlTarget 'board\.type'
+syn match csdlTarget 'board\.thread'
+syn match csdlTarget 'board\.author\.location'
+syn match csdlTarget 'board\.author\.signature'
+syn match csdlTarget 'board\.author\.registered'
+syn match csdlTarget 'board\.author\.age'
+syn match csdlTarget 'board\.author\.gender'
+syn match csdlTarget 'video\.title'
+syn match csdlTarget 'video\.content'
+syn match csdlTarget 'video\.contenttype'
+syn match csdlTarget 'video\.domain'
+syn match csdlTarget 'video\.author\.name'
+syn match csdlTarget 'video\.author\.link'
+syn match csdlTarget 'video\.author\.avatar'
+syn match csdlTarget 'video\.author\.username'
+syn match csdlTarget 'video\.type'
+syn match csdlTarget 'video\.videolink'
+syn match csdlTarget 'video\.commentslink'
+syn match csdlTarget 'video\.duration'
+syn match csdlTarget 'video\.thumbnail'
+syn match csdlTarget 'video\.category'
+syn match csdlTarget 'video\.tags'
+syn match csdlTarget '2ch\.title'
+syn match csdlTarget '2ch\.content'
+syn match csdlTarget '2ch\.contenttype'
+syn match csdlTarget '2ch\.link'
+syn match csdlTarget '2ch\.author\.name'
+syn match csdlTarget '2ch\.type'
+syn match csdlTarget '2ch\.thread'
+syn match csdlTarget 'dailymotion\.title'
+syn match csdlTarget 'dailymotion\.content'
+syn match csdlTarget 'dailymotion\.contenttype'
+syn match csdlTarget 'dailymotion\.author\.link'
+syn match csdlTarget 'dailymotion\.author\.username'
+syn match csdlTarget 'dailymotion\.videolink'
+syn match csdlTarget 'dailymotion\.duration'
+syn match csdlTarget 'dailymotion\.thumbnail'
+syn match csdlTarget 'dailymotion\.category'
+syn match csdlTarget 'dailymotion\.tags'
+syn match csdlTarget 'language\.tag'
+syn match csdlTarget 'language\.confidence'
+syn match csdlTarget 'digg\.type'
+syn match csdlTarget 'digg\.user\.name'
+syn match csdlTarget 'digg\.user\.fullname'
+syn match csdlTarget 'digg\.user\.registered'
+syn match csdlTarget 'digg\.user\.profileviews'
+syn match csdlTarget 'digg\.user\.icon'
+syn match csdlTarget 'digg\.user\.links'
+syn match csdlTarget 'digg\.item\.status'
+syn match csdlTarget 'digg\.item\.description'
+syn match csdlTarget 'digg\.item\.title'
+syn match csdlTarget 'digg\.item\.diggs'
+syn match csdlTarget 'digg\.item\.comments'
+syn match csdlTarget 'digg\.item\.topic'
+syn match csdlTarget 'digg\.comment\.buries'
+syn match csdlTarget 'digg\.comment\.diggs'
+syn match csdlTarget 'digg\.comment\.text'
+syn match csdlTarget 'youtube\.title'
+syn match csdlTarget 'youtube\.content'
+syn match csdlTarget 'youtube\.contenttype'
+syn match csdlTarget 'youtube\.author\.name'
+syn match csdlTarget 'youtube\.author\.link'
+syn match csdlTarget 'youtube\.type'
+syn match csdlTarget 'youtube\.videolink'
+syn match csdlTarget 'youtube\.commentslink'
+syn match csdlTarget 'youtube\.duration'
+syn match csdlTarget 'youtube\.thumbnail'
+syn match csdlTarget 'youtube\.category'
+syn match csdlTarget 'youtube\.tags'
+
+syn match csdlComment "^\/\/.*$"
+syn match csdlComment "^\/\*.*$"
+syn match csdlComment "^.*\*\/$"
+
+highlight link csdlKeyword Statement
+highlight link csdlOperator Operator
+highlight link csdlLogicalOperator Operator
+highlight link csdlTarget Constant
+highlight link csdlComment Comment
+"
+let b:current_syntax = "csdl"
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index 0cdf9c4e4..71b4405e9 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Python
" Maintainer: Neil Schemenauer <nas@python.ca>
-" Last Change: 2010 Sep 21
+" Last Change: 2013 Feb 26
" Credits: Zvezdan Petkovic <zpetkovic@acm.org>
" Neil Schemenauer <nas@python.ca>
" Dmitry Vasiliev
@@ -236,7 +236,7 @@ endif
" Notice that the end of a string, either ''', or """, will end the contained
" doctest too. Thus, we do *not* need to have it as an end pattern.
if !exists("python_no_doctest_highlight")
- if !exists("python_no_doctest_code_higlight")
+ if !exists("python_no_doctest_code_highlight")
syn region pythonDoctest
\ start="^\s*>>>\s" end="^\s*$"
\ contained contains=ALLBUT,pythonDoctest,@Spell
diff --git a/src/po/ja.po b/src/po/ja.po
index f34a35f59..14ae378d7 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,7 +3,7 @@
# Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed.
#
-# Last Change: 15-Jun-2012.
+# Last Change: 24-Feb-2013.
#
# Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -12,10 +12,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim 7.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-15 08:50+0900\n"
-"PO-Revision-Date: 2012-06-15 09:45+0900\n"
+"POT-Creation-Date: 2013-02-24 12:38+0900\n"
+"PO-Revision-Date: 2013-02-24 13:30+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
+"Language: Japanese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8-bit\n"
@@ -109,7 +110,7 @@ msgstr "W14: 警告: ファイル名のリストが長過ぎます"
#, c-format
msgid "E92: Buffer %ld not found"
-msgstr "E92: バッファ %ld がみつかりません"
+msgstr "E92: バッファ %ld が見つかりません"
#, c-format
msgid "E93: More than one match for %s"
@@ -234,7 +235,7 @@ msgstr ""
#, c-format
msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: バッファ \"%s\" がみつかりません"
+msgstr "E102: バッファ \"%s\" が見つかりません"
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
@@ -247,7 +248,7 @@ msgid "E104: Escape not allowed in digraph"
msgstr "E104: 合字にEscapeは使用できません"
msgid "E544: Keymap file not found"
-msgstr "E544: キーマップファイルがみつかりません"
+msgstr "E544: キーマップファイルが見つかりません"
msgid "E105: Using :loadkeymap not in a sourced file"
msgstr "E105: :source で取込むファイル以外では :loadkeymap を使えません"
@@ -369,7 +370,7 @@ msgid "E121: Undefined variable: %s"
msgstr "E121: 未定義の変数です: %s"
msgid "E111: Missing ']'"
-msgstr "E111: ']' がみつかりません"
+msgstr "E111: ']' が見つかりません"
#, c-format
msgid "E686: Argument of %s must be a List"
@@ -489,7 +490,7 @@ msgid "E804: Cannot use '%' with Float"
msgstr "E804: '%' を浮動小数点数と組み合わせては使えません"
msgid "E110: Missing ')'"
-msgstr "E110: ')' がみつかりません"
+msgstr "E110: ')' が見つかりません"
msgid "E695: Cannot index a Funcref"
msgstr "E695: 関数参照型はインデックスできません"
@@ -596,7 +597,7 @@ msgstr "filter() の引数"
#, c-format
msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld 行:"
+msgstr "+-%s%3ld 行: "
#, c-format
msgid "E700: Unknown function: %s"
@@ -727,10 +728,14 @@ msgstr "E123: 未定義の関数です: %s"
msgid "E124: Missing '(': %s"
msgstr "E124: '(' がありません: %s"
+msgid "E862: Cannot use g: here"
+msgstr "E862: ここでは g: は使えません"
+
#, c-format
msgid "E125: Illegal argument: %s"
msgstr "E125: 不正な引数です: %s"
+#, c-format
msgid "E853: Duplicate argument name: %s"
msgstr "E853: 引数名が重複しています: %s"
@@ -960,7 +965,7 @@ msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
msgstr "%s に置換しますか? (y/n/a/q/l/^E/^Y)"
msgid "(Interrupted) "
-msgstr "(割込まれました)"
+msgstr "(割込まれました) "
msgid "1 match"
msgstr "1 箇所該当しました"
@@ -991,7 +996,7 @@ msgstr "E148: globalコマンドに正規表現が指定されていません"
#, c-format
msgid "Pattern found in every line: %s"
-msgstr "パターンが全ての行でみつかりました: %s"
+msgstr "パターンが全ての行で見つかりました: %s"
msgid ""
"\n"
@@ -1015,7 +1020,7 @@ msgstr "E149: 残念ですが %s にはヘルプがありません"
#, c-format
msgid "Sorry, help file \"%s\" not found"
-msgstr "残念ですがヘルプファイル \"%s\" がみつかりません"
+msgstr "残念ですがヘルプファイル \"%s\" が見つかりません"
#, c-format
msgid "E150: Not a directory: %s"
@@ -1069,7 +1074,7 @@ msgstr "E157: 無効なsign識別子です: %ld"
# Added at 27-Jan-2004.
msgid " (NOT FOUND)"
-msgstr " (みつかりません)"
+msgstr " (見つかりません)"
msgid " (not supported)"
msgstr " (非サポート)"
@@ -1094,7 +1099,7 @@ msgstr "ブレークポイント \"%s%s\" 行 %ld"
#, c-format
msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ブレークポイントがみつかりません: %s"
+msgstr "E161: ブレークポイントが見つかりません: %s"
msgid "No breakpoints defined"
msgstr "ブレークポイントが定義されていません"
@@ -1143,7 +1148,7 @@ msgstr "\"%s\" を検索中"
#, c-format
msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' の中にはみつかりません: \"%s\""
+msgstr "'runtimepath' の中には見つかりません: \"%s\""
msgid "Source Vim script"
msgstr "Vimスクリプトの取込み"
@@ -1317,8 +1322,8 @@ msgid "unknown"
msgstr "不明"
#, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: カラースキーム %s がみつかりません"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: カラースキーム '%s' が見つかりません"
msgid "Greetings, Vim user!"
msgstr "Vim 使いさん、やあ!"
@@ -1669,7 +1674,7 @@ msgid "[READ ERRORS]"
msgstr "[読込エラー]"
msgid "Can't find temp file for conversion"
-msgstr "変換に必要な一時ファイルがみつかりません"
+msgstr "変換に必要な一時ファイルが見つかりません"
msgid "Conversion with 'charconvert' failed"
msgstr "'charconvert' による変換が失敗しました"
@@ -1725,7 +1730,7 @@ msgid "E460: The resource fork would be lost (add ! to override)"
msgstr "E460: リソースフォークが失われるかもしれません (! を追加で強制)"
msgid "E214: Can't find temp file for writing"
-msgstr "E214: 保存用一時ファイルがみつかりません"
+msgstr "E214: 保存用一時ファイルが見つかりません"
msgid "E213: Cannot convert (add ! to write without conversion)"
msgstr "E213: 変換できません (! を追加で変換せずに保存)"
@@ -1950,7 +1955,7 @@ msgstr ""
#, c-format
msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <バッファ=%d>: 無効なバッファ番号です"
+msgstr "E680: <バッファ=%d>: 無効なバッファ番号です "
msgid "E217: Can't execute autocommands for ALL events"
msgstr "E217: 全てのイベントに対してのautocommandは実行できません"
@@ -1990,7 +1995,7 @@ msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
#, c-format
msgid "+--%3ld lines folded "
-msgstr "+--%3ld 行が折畳まれました"
+msgstr "+--%3ld 行が折畳まれました "
msgid "E222: Add to read buffer"
msgstr "E222: 読込バッファへ追加"
@@ -2015,365 +2020,14 @@ msgid "E227: mapping already exists for %s"
msgstr "E227: %s というマッピングは既に存在します"
msgid "No abbreviation found"
-msgstr "短縮入力はみつかりませんでした"
+msgstr "短縮入力は見つかりませんでした"
msgid "No mapping found"
-msgstr "マッピングはみつかりませんでした"
+msgstr "マッピングは見つかりませんでした"
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: 不正なモード"
-msgid "--No lines in buffer--"
-msgstr "--バッファに行がありません--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: コマンドが中断されました"
-
-msgid "E471: Argument required"
-msgstr "E471: 引数が必要です"
-
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ の後は / か ? か & でなければなりません"
-
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: コマンドラインでは無効です; <CR>で実行, CTRL-Cでやめる"
-
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: 現在のディレクトリやタグ検索ではexrc/vimrcのコマンドは許可されません"
-
-msgid "E171: Missing :endif"
-msgstr "E171: :endif がありません"
-
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry がありません"
-
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile がありません"
-
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor がありません"
-
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while のない :endwhile があります"
-
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor のない :for があります"
-
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ファイルが存在します (! を追加で上書)"
-
-msgid "E472: Command failed"
-msgstr "E472: コマンドが失敗しました"
-
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: 未知のフォントセット: %s"
-
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: 未知のフォント: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: フォント \"%s\" は固定幅ではありません"
-
-msgid "E473: Internal error"
-msgstr "E473: 内部エラーです"
-
-msgid "Interrupted"
-msgstr "割込まれました"
-
-msgid "E14: Invalid address"
-msgstr "E14: 無効なアドレスです"
-
-msgid "E474: Invalid argument"
-msgstr "E474: 無効な引数です"
-
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: 無効な引数です: %s"
-
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: 無効な式です: %s"
-
-msgid "E16: Invalid range"
-msgstr "E16: 無効な範囲です"
-
-msgid "E476: Invalid command"
-msgstr "E476: 無効なコマンドです"
-
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" はディレクトリです"
-
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
-
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ライブラリ %s をロードできませんでした"
-
-#, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: ライブラリの関数 %s をロードできませんでした"
-
-msgid "E19: Mark has invalid line number"
-msgstr "E19: マークに無効な行番号が指定されていました"
-
-msgid "E20: Mark not set"
-msgstr "E20: マークは設定されていません"
-
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' がオフなので, 変更できません"
-
-msgid "E22: Scripts nested too deep"
-msgstr "E22: スクリプトの入れ子が深過ぎます"
-
-msgid "E23: No alternate file"
-msgstr "E23: 副ファイルはありません"
-
-msgid "E24: No such abbreviation"
-msgstr "E24: そのような短縮入力はありません"
-
-msgid "E477: No ! allowed"
-msgstr "E477: ! は許可されていません"
-
-msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされています"
-
-msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
-
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
-
-msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
-
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: そのような名のハイライトグループはありません: %s"
-
-msgid "E29: No inserted text yet"
-msgstr "E29: まだテキストが挿入されていません"
-
-msgid "E30: No previous command line"
-msgstr "E30: 以前にコマンド行がありません"
-
-msgid "E31: No such mapping"
-msgstr "E31: そのようなマッピングはありません"
-
-msgid "E479: No match"
-msgstr "E479: 該当はありません"
-
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: 該当はありません: %s"
-
-msgid "E32: No file name"
-msgstr "E32: ファイル名がありません"
-
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: 正規表現置換がまだ実行されていません"
-
-msgid "E34: No previous command"
-msgstr "E34: コマンドがまだ実行されていません"
-
-msgid "E35: No previous regular expression"
-msgstr "E35: 正規表現がまだ実行されていません"
-
-msgid "E481: No range allowed"
-msgstr "E481: 範囲指定は許可されていません"
-
-msgid "E36: Not enough room"
-msgstr "E36: 充分な容量がありません"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: %s という名前の登録されたサーバはありません"
-
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: ファイル %s を作成できません"
-
-msgid "E483: Can't get temp file name"
-msgstr "E483: 一時ファイルの名前を取得できません"
-
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: ファイル \"%s\" を開けません"
-
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: ファイル %s を読込めません"
-
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
-
-msgid "E38: Null argument"
-msgstr "E38: 引数が空です"
-
-msgid "E39: Number expected"
-msgstr "E39: 数値が要求されています"
-
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: エラーファイル %s を開けません"
-
-msgid "E233: cannot open display"
-msgstr "E233: ディスプレイを開けません"
-
-msgid "E41: Out of memory!"
-msgstr "E41: メモリが尽き果てました!"
-
-msgid "Pattern not found"
-msgstr "パターンはみつかりませんでした"
-
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: パターンはみつかりませんでした: %s"
-
-msgid "E487: Argument must be positive"
-msgstr "E487: 引数は正の値でなければなりません"
-
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: 前のディレクトリに戻れません"
-
-msgid "E42: No Errors"
-msgstr "E42: エラーはありません"
-
-msgid "E776: No location list"
-msgstr "E776: 場所リストはありません"
-
-msgid "E43: Damaged match string"
-msgstr "E43: 該当文字列が破損しています"
-
-msgid "E44: Corrupted regexp program"
-msgstr "E44: 不正な正規表現プログラムです"
-
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
-
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
-
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
-
-msgid "E47: Error while reading errorfile"
-msgstr "E47: エラーファイルの読込中にエラーが発生しました"
-
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: サンドボックスでは許されません"
-
-msgid "E523: Not allowed here"
-msgstr "E523: ここでは許可されません"
-
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: スクリーンモードの設定には対応していません"
-
-msgid "E49: Invalid scroll size"
-msgstr "E49: 無効なスクロール量です"
-
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' オプションが空です"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign のデータを読込めませんでした"
-
-msgid "E72: Close error on swap file"
-msgstr "E72: スワップファイルのクローズ時エラーです"
-
-msgid "E73: tag stack empty"
-msgstr "E73: タグスタックが空です"
-
-msgid "E74: Command too complex"
-msgstr "E74: コマンドが複雑過ぎます"
-
-msgid "E75: Name too long"
-msgstr "E75: 名前が長過ぎます"
-
-msgid "E76: Too many ["
-msgstr "E76: [ が多過ぎます"
-
-msgid "E77: Too many file names"
-msgstr "E77: ファイル名が多過ぎます"
-
-msgid "E488: Trailing characters"
-msgstr "E488: 余分な文字が後ろにあります"
-
-msgid "E78: Unknown mark"
-msgstr "E78: 未知のマーク"
-
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ワイルドカードを展開できません"
-
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' は 'winminheight' より小さくできません"
-
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
-
-msgid "E80: Error while writing"
-msgstr "E80: 書込み中のエラー"
-
-msgid "Zero count"
-msgstr "ゼロカウント"
-
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: スクリプト以外で<SID>が使われました"
-
-msgid "E449: Invalid expression received"
-msgstr "E449: 無効な式を受け取りました"
-
-msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: 領域が保護されているので, 変更できません"
-
-msgid "E744: NetBeans does not allow changes in read-only files"
-msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
-
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: 内部エラーです: %s"
-
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します"
-
-msgid "E749: empty buffer"
-msgstr "E749: バッファが空です"
-
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: 検索パターンか区切り記号が不正です"
-
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
-
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: オプション '%s' は設定されていません"
-
-msgid "E850: Invalid register name"
-msgstr "E850: 無効なレジスタ名です"
-
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "上まで検索したので下に戻ります"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "下まで検索したので上に戻ります"
-
-#, c-format
-msgid "Need encryption key for \"%s\""
-msgstr "暗号キーが必要です: \"%s\""
-
msgid "E851: Failed to create a new process for the GUI"
msgstr "E851: GUI用のプロセスの起動に失敗しました"
@@ -2404,7 +2058,7 @@ msgid "No match at cursor, finding next"
msgstr "カーソルの位置にマッチはありません, 次を検索しています"
msgid "<cannot open> "
-msgstr "<開けません>"
+msgstr "<開けません> "
#, c-format
msgid "E616: vim_SelFile: can't get font %s"
@@ -2541,7 +2195,7 @@ msgstr "アンドゥ(&U)"
#, c-format
msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: タイトルが \"%s\" のウィンドウはみつかりません"
+msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
@@ -2719,14 +2373,14 @@ msgid "E456: Can't open file \"%s\""
msgstr "E456: ファイル \"%s\" を開けません"
msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: PostScriptのリソースファイル \"prolog.ps\" がみつかりません"
+msgstr "E456: PostScriptのリソースファイル \"prolog.ps\" が見つかりません"
msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: PostScriptのリソースファイル \"cidfont.ps\" がみつかりません"
+msgstr "E456: PostScriptのリソースファイル \"cidfont.ps\" が見つかりません"
#, c-format
msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: PostScriptのリソースファイル \"%s.ps\" がみつかりません"
+msgstr "E456: PostScriptのリソースファイル \"%s.ps\" が見つかりません"
#, c-format
msgid "E620: Unable to convert to print encoding \"%s\""
@@ -2770,7 +2424,7 @@ msgid "E562: Usage: cstag <ident>"
msgstr "E562: 使用法: cstag <ident>"
msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: タグがみつかりません"
+msgstr "E257: cstag: タグが見つかりません"
#, c-format
msgid "E563: stat(%s) error: %d"
@@ -2863,7 +2517,7 @@ msgstr "E568: 重複するcscopeデータベースは追加されませんでした"
#, c-format
msgid "E261: cscope connection %s not found"
-msgstr "E261: cscope接続 %s がみつかりませんでした"
+msgstr "E261: cscope接続 %s が見つかりませんでした"
#, c-format
msgid "cscope connection %s closed"
@@ -2941,6 +2595,9 @@ msgstr "行を挿入できません"
msgid "string cannot contain newlines"
msgstr "文字列には改行文字を含められません"
+msgid "error converting Scheme values to Vim"
+msgstr "Scheme値のVimへの変換エラー"
+
msgid "Vim error: ~a"
msgstr "Vim エラー: ~a"
@@ -2959,6 +2616,10 @@ msgstr "範囲外の行番号です"
msgid "not allowed in the Vim sandbox"
msgstr "サンドボックスでは許されません"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ライブラリ %s をロードできませんでした"
+
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
"このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでした."
@@ -2971,6 +2632,9 @@ msgstr ""
msgid "E836: This Vim cannot execute :python after using :py3"
msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
+msgid "only string keys are allowed"
+msgstr "文字列のキーのみが許可されています"
+
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
@@ -2982,14 +2646,11 @@ msgstr ""
msgid "E659: Cannot invoke Python recursively"
msgstr "E659: Python を再帰的に実行することはできません"
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject属性を消せません"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした"
-msgid "softspace must be an integer"
-msgstr "softspace は integer でなければなりません"
-
-msgid "invalid attribute"
-msgstr "無効な属性です"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした"
#, c-format
msgid "<buffer object (deleted) at %p>"
@@ -2998,6 +2659,12 @@ msgstr "<バッファオブジェクト (消去済み) %p>"
msgid "E837: This Vim cannot execute :py3 after using :python"
msgstr "E837: このVimでは :python を使った後に :py3 を使えません"
+msgid "E860: Eval did not return a valid python 3 object"
+msgstr "E860: 式評価は有効なpython 3オブジェクトを返しませんでした"
+
+msgid "E861: Failed to convert returned python 3 object to vim value"
+msgstr "E861: 返されたpython 3オブジェクトをvimの値に変換できませんでした"
+
msgid "E265: $_ must be an instance of String"
msgstr "E265: $_ は文字列のインスタンスでなければなりません"
@@ -3054,7 +2721,7 @@ msgid "Show source of"
msgstr "次のソースを表示する"
msgid "Find symbol"
-msgstr "みつけたシンボル"
+msgstr "見つけたシンボル"
msgid "Browse class"
msgstr "クラスを参照"
@@ -3145,7 +2812,7 @@ msgid "line number out of range"
msgstr "範囲外の行番号です"
msgid "unknown flag: "
-msgstr "未知のフラグ:"
+msgstr "未知のフラグ: "
msgid "unknown vimOption"
msgstr "未知の vimOption です"
@@ -3175,7 +2842,7 @@ msgstr ""
msgid "cannot register callback command: buffer/window reference not found"
msgstr ""
-"コールバックコマンドを登録できません: バッファ/ウィンドウの参照がみつかりませ"
+"コールバックコマンドを登録できません: バッファ/ウィンドウの参照が見つかりませ"
"ん"
msgid ""
@@ -3290,7 +2957,7 @@ msgstr ""
"使用法:"
msgid " vim [arguments] "
-msgstr " vim [引数]"
+msgstr " vim [引数] "
msgid ""
"\n"
@@ -3670,7 +3337,7 @@ msgstr ""
"# ファイル内マークの履歴 (新しいものから古いもの):\n"
msgid "Missing '>'"
-msgstr "'>' がみつかりません"
+msgstr "'>' が見つかりません"
msgid "E543: Not a valid codepage"
msgstr "E543: 無効なコードページです"
@@ -3739,7 +3406,7 @@ msgstr "E304: ml_upd_block0(): ブロック 0 を取得できませんでした??"
#, c-format
msgid "E305: No swap file found for %s"
-msgstr "E305: %s にはスワップファイルがみつかりません"
+msgstr "E305: %s にはスワップファイルが見つかりません"
msgid "Enter number of swap file to use (0 to quit): "
msgstr "使用するスワップファイルの番号を入力してください(0 で終了): "
@@ -4013,7 +3680,7 @@ msgstr "E315: ml_get: 無効なlnumです: %ld"
#, c-format
msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: 行 %ld をみつけられません"
+msgstr "E316: ml_get: 行 %ld を見つけられません"
msgid "E317: pointer block id wrong 3"
msgstr "E317: ポインタブロックのIDが間違っています 3"
@@ -4032,7 +3699,7 @@ msgstr "ブロック 1 は消された?"
#, c-format
msgid "E320: Cannot find line %ld"
-msgstr "E320: 行 %ld がみつかりません"
+msgstr "E320: 行 %ld が見つかりません"
msgid "E317: pointer block id wrong"
msgstr "E317: ポインタブロックのIDが間違っています"
@@ -4196,7 +3863,7 @@ msgstr "E333: メニューパスはメニューアイテムを生じなければいけません"
#, c-format
msgid "E334: Menu not found: %s"
-msgstr "E334: メニューがみつかりません: %s"
+msgstr "E334: メニューが見つかりません: %s"
#, c-format
msgid "E335: Menu not defined for %s mode"
@@ -4206,7 +3873,7 @@ msgid "E336: Menu path must lead to a sub-menu"
msgstr "E336: メニューパスはサブメニューを生じなければいけません"
msgid "E337: Menu not found - check menu names"
-msgstr "E337: メニューがみつかりません - メニュー名を確認してください"
+msgstr "E337: メニューが見つかりません - メニュー名を確認してください"
#, c-format
msgid "Error detected while processing %s:"
@@ -4430,6 +4097,7 @@ msgstr "E838: NetBeansはこのGUIには対応していません"
msgid "E511: netbeans already connected"
msgstr "E511: NetBeansは既に接続しています"
+#, c-format
msgid "E505: %s is read-only (add ! to override)"
msgstr "E505: %s は読込専用です (強制書込には ! を追加)"
@@ -4484,11 +4152,11 @@ msgid "%ld lines to indent... "
msgstr "%ld 行がインデントされます... "
msgid "1 line indented "
-msgstr "1 行をインデントしました"
+msgstr "1 行をインデントしました "
#, c-format
msgid "%ld lines indented "
-msgstr "%ld 行をインデントしました"
+msgstr "%ld 行をインデントしました "
msgid "E748: No previously used register"
msgstr "E748: まだレジスタを使用していません"
@@ -4599,7 +4267,7 @@ msgid "E521: Number required after ="
msgstr "E521: = の後には数字が必要です"
msgid "E522: Not found in termcap"
-msgstr "E522: termcap 内にみつかりません"
+msgstr "E522: termcap 内に見つかりません"
#, c-format
msgid "E539: Illegal character <%s>"
@@ -4973,7 +4641,7 @@ msgid ""
"External commands will not pause after completion.\n"
"See :help win32-vimrun for more information."
msgstr ""
-"VIMRUN.EXEが $PATH の中にみつかりません.\n"
+"VIMRUN.EXEが $PATH の中に見つかりません.\n"
"外部コマンドの終了後に一時停止をしません.\n"
"詳細は :help win32-vimrun を参照してください."
@@ -5208,11 +4876,11 @@ msgstr "E383: 無効な検索文字列です: %s"
#, c-format
msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: 上まで検索したけれど該当箇所はありません: %s"
+msgstr "E384: 上まで検索しましたが該当箇所はありません: %s"
#, c-format
msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: 下まで検索したけれど該当箇所はありません: %s"
+msgstr "E385: 下まで検索しましたが該当箇所はありません: %s"
msgid "E386: Expected '?' or '/' after ';'"
msgstr "E386: ';' のあとには '?' か '/' が期待されている"
@@ -5222,10 +4890,10 @@ msgstr " (前に列挙した該当箇所を含む)"
#. cursor at status line
msgid "--- Included files "
-msgstr "--- インクルードされたファイル"
+msgstr "--- インクルードされたファイル "
msgid "not found "
-msgstr "みつかりません "
+msgstr "見つかりません "
msgid "in path ---\n"
msgstr "パスに ----\n"
@@ -5234,7 +4902,7 @@ msgid " (Already listed)"
msgstr " (既に列挙)"
msgid " NOT FOUND"
-msgstr " みつかりません"
+msgstr " 見つかりません"
#, c-format
msgid "Scanning included file: %s"
@@ -5248,16 +4916,16 @@ msgid "E387: Match is on current line"
msgstr "E387: 現在行に該当があります"
msgid "All included files were found"
-msgstr "全てのインクルードされたファイルがみつかりました"
+msgstr "全てのインクルードされたファイルが見つかりました"
msgid "No included files"
msgstr "インクルードファイルはありません"
msgid "E388: Couldn't find definition"
-msgstr "E388: 定義をみつけられません"
+msgstr "E388: 定義を見つけられません"
msgid "E389: Couldn't find pattern"
-msgstr "E389: パターンをみつけられません"
+msgstr "E389: パターンを見つけられません"
msgid "Substitute "
msgstr "Substitute "
@@ -5480,7 +5148,7 @@ msgstr "行 %6d, 単語 %6d - %s"
#, c-format
msgid "Duplicate word in %s line %d: %s"
-msgstr "%s の %d 行目で 重複単語がみつかりました: %s"
+msgstr "%s の %d 行目で 重複単語が見つかりました: %s"
#, c-format
msgid "First duplicate word in %s line %d: %s"
@@ -5620,7 +5288,7 @@ msgstr "E752: スペル置換がまだ実行されていません"
#, c-format
msgid "E753: Not found: %s"
-msgstr "E753: みつかりません: %s"
+msgstr "E753: 見つかりません: %s"
#, c-format
msgid "E778: This does not look like a .sug file: %s"
@@ -5696,10 +5364,10 @@ msgid "E392: No such syntax cluster: %s"
msgstr "E392: そのような構文クラスタはありません: %s"
msgid "minimal "
-msgstr "minimal"
+msgstr "minimal "
msgid "maximal "
-msgstr "maximal"
+msgstr "maximal "
msgid "; match "
msgstr "; 該当 "
@@ -5718,7 +5386,7 @@ msgstr "E393: ここではグループは許可されません"
#, c-format
msgid "E394: Didn't find region item for %s"
-msgstr "E394: %s の範囲要素がみつかりません"
+msgstr "E394: %s の範囲要素が見つかりません"
msgid "E397: Filename required"
msgstr "E397: ファイル名が必要です"
@@ -5746,7 +5414,7 @@ msgstr "E400: クラスタが指定されていません"
#, c-format
msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: パターン区切りがみつかりません: %s"
+msgstr "E401: パターン区切りが見つかりません: %s"
#, c-format
msgid "E402: Garbage after pattern: %s"
@@ -5788,7 +5456,7 @@ msgstr "E679: syncolor.vim の再帰呼び出しを検出しました"
#, c-format
msgid "E411: highlight group not found: %s"
-msgstr "E411: ハイライトグループがみつかりません: %s"
+msgstr "E411: ハイライトグループが見つかりません: %s"
#, c-format
msgid "E412: Not enough arguments: \":highlight link %s\""
@@ -5858,7 +5526,7 @@ msgstr "E425: 最初の該当タグを超えて戻ることはできません"
#, c-format
msgid "E426: tag not found: %s"
-msgstr "E426: タグがみつかりません: %s"
+msgstr "E426: タグが見つかりません: %s"
msgid " # pri kind tag"
msgstr " # pri kind tag"
@@ -5927,10 +5595,10 @@ msgid "E433: No tags file"
msgstr "E433: タグファイルがありません"
msgid "E434: Can't find tag pattern"
-msgstr "E434: タグパターンをみつけられません"
+msgstr "E434: タグパターンを見つけられません"
msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: タグをみつけられないので単に推測します!"
+msgstr "E435: タグを見つけられないので単に推測します!"
#, c-format
msgid "Duplicate field name: %s"
@@ -5946,10 +5614,10 @@ msgid "E557: Cannot open termcap file"
msgstr "E557: termcapファイルを開けません"
msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: terminfoに端末エントリをみつけられません"
+msgstr "E558: terminfoに端末エントリを見つけられません"
msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: termcapに端末エントリをみつけられません"
+msgstr "E559: termcapに端末エントリを見つけられません"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
@@ -6061,7 +5729,7 @@ msgstr "既に一番新しい変更です"
#, c-format
msgid "E830: Undo number %ld not found"
-msgstr "E830: アンドゥ番号 %ld はみつかりません"
+msgstr "E830: アンドゥ番号 %ld は見つかりません"
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: 行番号が間違っています"
@@ -6396,7 +6064,7 @@ msgid "Running modeless, typed text is inserted"
msgstr "モード無で実行中, タイプした文字が挿入されます"
msgid "menu Edit->Global Settings->Toggle Insert Mode "
-msgstr "メニューの 編集→全体設定→挿入(初心者)モード切替"
+msgstr "メニューの 編集→全体設定→挿入(初心者)モード切替 "
msgid " for two modes "
msgstr " でモード有に "
@@ -6458,3 +6126,486 @@ msgstr "E446: カーソルの下にファイル名がありません"
#, c-format
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: pathには \"%s\" というファイルがありません"
+
+msgid "Edit with &multiple Vims"
+msgstr "複数のVimで編集する (&M)"
+
+msgid "Edit with single &Vim"
+msgstr "1つのVimで編集する (&V)"
+
+msgid "Diff with Vim"
+msgstr "Vimで差分を表示する"
+
+msgid "Edit with &Vim"
+msgstr "Vimで編集する (&V)"
+
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "起動済のVimで編集する - "
+
+msgid "Edits the selected file(s) with Vim"
+msgstr "選択したファイルをVimで編集する"
+
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "プロセスの作成に失敗: gvimが環境変数PATH上にあるか確認してください!"
+
+msgid "gvimext.dll error"
+msgstr "gvimext.dll エラー"
+
+msgid "Path length too long!"
+msgstr "パスが長すぎます!"
+
+msgid "--No lines in buffer--"
+msgstr "--バッファに行がありません--"
+
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: コマンドが中断されました"
+
+msgid "E471: Argument required"
+msgstr "E471: 引数が必要です"
+
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ の後は / か ? か & でなければなりません"
+
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: コマンドラインでは無効です; <CR>で実行, CTRL-Cでやめる"
+
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: 現在のディレクトリやタグ検索ではexrc/vimrcのコマンドは許可されません"
+
+msgid "E171: Missing :endif"
+msgstr "E171: :endif がありません"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry がありません"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile がありません"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor がありません"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while のない :endwhile があります"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor のない :for があります"
+
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: ファイルが存在します (! を追加で上書)"
+
+msgid "E472: Command failed"
+msgstr "E472: コマンドが失敗しました"
+
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: 未知のフォントセット: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: 未知のフォント: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: フォント \"%s\" は固定幅ではありません"
+
+msgid "E473: Internal error"
+msgstr "E473: 内部エラーです"
+
+msgid "Interrupted"
+msgstr "割込まれました"
+
+msgid "E14: Invalid address"
+msgstr "E14: 無効なアドレスです"
+
+msgid "E474: Invalid argument"
+msgstr "E474: 無効な引数です"
+
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: 無効な引数です: %s"
+
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: 無効な式です: %s"
+
+msgid "E16: Invalid range"
+msgstr "E16: 無効な範囲です"
+
+msgid "E476: Invalid command"
+msgstr "E476: 無効なコマンドです"
+
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" はディレクトリです"
+
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: ライブラリの関数 %s をロードできませんでした"
+
+msgid "E19: Mark has invalid line number"
+msgstr "E19: マークに無効な行番号が指定されていました"
+
+msgid "E20: Mark not set"
+msgstr "E20: マークは設定されていません"
+
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' がオフなので, 変更できません"
+
+msgid "E22: Scripts nested too deep"
+msgstr "E22: スクリプトの入れ子が深過ぎます"
+
+msgid "E23: No alternate file"
+msgstr "E23: 副ファイルはありません"
+
+msgid "E24: No such abbreviation"
+msgstr "E24: そのような短縮入力はありません"
+
+msgid "E477: No ! allowed"
+msgstr "E477: ! は許可されていません"
+
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされています"
+
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
+
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
+
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: そのような名のハイライトグループはありません: %s"
+
+msgid "E29: No inserted text yet"
+msgstr "E29: まだテキストが挿入されていません"
+
+msgid "E30: No previous command line"
+msgstr "E30: 以前にコマンド行がありません"
+
+msgid "E31: No such mapping"
+msgstr "E31: そのようなマッピングはありません"
+
+msgid "E479: No match"
+msgstr "E479: 該当はありません"
+
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: 該当はありません: %s"
+
+msgid "E32: No file name"
+msgstr "E32: ファイル名がありません"
+
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: 正規表現置換がまだ実行されていません"
+
+msgid "E34: No previous command"
+msgstr "E34: コマンドがまだ実行されていません"
+
+msgid "E35: No previous regular expression"
+msgstr "E35: 正規表現がまだ実行されていません"
+
+msgid "E481: No range allowed"
+msgstr "E481: 範囲指定は許可されていません"
+
+msgid "E36: Not enough room"
+msgstr "E36: ウィンドウに十分な高さもしくは幅がありません"
+
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s という名前の登録されたサーバはありません"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: ファイル %s を作成できません"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: 一時ファイルの名前を取得できません"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: ファイル \"%s\" を開けません"
+
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: ファイル %s を読込めません"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
+
+msgid "E38: Null argument"
+msgstr "E38: 引数が空です"
+
+msgid "E39: Number expected"
+msgstr "E39: 数値が要求されています"
+
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: エラーファイル %s を開けません"
+
+msgid "E233: cannot open display"
+msgstr "E233: ディスプレイを開けません"
+
+msgid "E41: Out of memory!"
+msgstr "E41: メモリが尽き果てました!"
+
+msgid "Pattern not found"
+msgstr "パターンは見つかりませんでした"
+
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: パターンは見つかりませんでした: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: 引数は正の値でなければなりません"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: 前のディレクトリに戻れません"
+
+msgid "E42: No Errors"
+msgstr "E42: エラーはありません"
+
+msgid "E776: No location list"
+msgstr "E776: 場所リストはありません"
+
+msgid "E43: Damaged match string"
+msgstr "E43: 該当文字列が破損しています"
+
+msgid "E44: Corrupted regexp program"
+msgstr "E44: 不正な正規表現プログラムです"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
+
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
+
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
+
+msgid "E47: Error while reading errorfile"
+msgstr "E47: エラーファイルの読込中にエラーが発生しました"
+
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: サンドボックスでは許されません"
+
+msgid "E523: Not allowed here"
+msgstr "E523: ここでは許可されません"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: スクリーンモードの設定には対応していません"
+
+msgid "E49: Invalid scroll size"
+msgstr "E49: 無効なスクロール量です"
+
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' オプションが空です"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign のデータを読込めませんでした"
+
+msgid "E72: Close error on swap file"
+msgstr "E72: スワップファイルのクローズ時エラーです"
+
+msgid "E73: tag stack empty"
+msgstr "E73: タグスタックが空です"
+
+msgid "E74: Command too complex"
+msgstr "E74: コマンドが複雑過ぎます"
+
+msgid "E75: Name too long"
+msgstr "E75: 名前が長過ぎます"
+
+msgid "E76: Too many ["
+msgstr "E76: [ が多過ぎます"
+
+msgid "E77: Too many file names"
+msgstr "E77: ファイル名が多過ぎます"
+
+msgid "E488: Trailing characters"
+msgstr "E488: 余分な文字が後ろにあります"
+
+msgid "E78: Unknown mark"
+msgstr "E78: 未知のマーク"
+
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: ワイルドカードを展開できません"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' は 'winminheight' より小さくできません"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
+
+msgid "E80: Error while writing"
+msgstr "E80: 書込み中のエラー"
+
+msgid "Zero count"
+msgstr "ゼロカウント"
+
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: スクリプト以外で<SID>が使われました"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: 無効な式を受け取りました"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: 領域が保護されているので, 変更できません"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部エラーです: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します"
+
+msgid "E749: empty buffer"
+msgstr "E749: バッファが空です"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: 検索パターンか区切り記号が不正です"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: オプション '%s' は設定されていません"
+
+msgid "E850: Invalid register name"
+msgstr "E850: 無効なレジスタ名です"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "上まで検索したので下に戻ります"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "下まで検索したので上に戻ります"
+
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "暗号キーが必要です: \"%s\""
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject属性を消せません"
+
+msgid "softspace must be an integer"
+msgstr "softspace は integer でなければなりません"
+
+msgid "invalid attribute"
+msgstr "無効な属性です"
+
+msgid "writelines() requires list of strings"
+msgstr "writelines() には文字列のリストが必要です"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/Oオブジェクトの初期化エラー"
+
+msgid "no such buffer"
+msgstr "そのようなバッファはありません"
+
+msgid "empty keys are not allowed"
+msgstr "空のキーは許可されていません"
+
+msgid "failed to add key to dictionary"
+msgstr "辞書へのキーの追加に失敗しました"
+
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "DictionaryObject属性を消せません"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "固定された辞書は変更できません"
+
+msgid "Only boolean objects are allowed"
+msgstr "booleanオブジェクトだけが許可されています"
+
+msgid "Cannot set this attribute"
+msgstr "この属性は設定できません"
+
+msgid "no such key in dictionary"
+msgstr "辞書にそのようなキーはありません"
+
+msgid "dict is locked"
+msgstr "辞書はロックされています"
+
+msgid "internal error: failed to get vim list item"
+msgstr "内部エラー: vimのリスト要素の取得に失敗しました"
+
+msgid "list is locked"
+msgstr "リストはロックされています"
+
+msgid "Failed to add item to list"
+msgstr "リストへの要素追加に失敗しました"
+
+msgid "internal error: no vim list item"
+msgstr "内部エラー: vimのリスト要素がありません"
+
+msgid "can only assign lists to slice"
+msgstr "スライスにはリストだけが代入できます"
+
+msgid "internal error: failed to add item to list"
+msgstr "内部エラー: リストへの要素追加に失敗しました"
+
+msgid "can only concatenate with lists"
+msgstr "リストとのみ接続できます"
+
+msgid "Cannot modify fixed list"
+msgstr "固定されたリストは変更できません"
+
+msgid "'self' argument must be a dictionary"
+msgstr "'self' 引数は辞書型の値でなければなりません"
+
+msgid "failed to run function"
+msgstr "関数の実行に失敗しました"
+
+msgid "attempt to refer to deleted window"
+msgstr "削除されたウィンドウを参照しようとしました"
+
+msgid "readonly attribute"
+msgstr "読込専用属性"
+
+msgid "cursor position outside buffer"
+msgstr "カーソル位置がバッファの外側です"
+
+#, c-format
+msgid "<window object (deleted) at %p>"
+msgstr "<ウィンドウオブジェクト (消去済み) %p>"
+
+#, c-format
+msgid "<window object (unknown) at %p>"
+msgstr "<ウィンドウオブジェクト (不明) %p>"
+
+#, c-format
+msgid "<window %d>"
+msgstr "<ウィンドウ %d>"
+
+msgid "no such window"
+msgstr "そのようなウィンドウはありません"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "削除されたバッファを参照しようとしました"
+
+msgid "unable to convert to vim structure"
+msgstr "vimの構造体に変換できません"
+
+msgid "NULL reference passed"
+msgstr "NULL参照が渡されました"
+
+msgid "internal error: invalid value type"
+msgstr "内部エラー: 無効な値型です"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 391e56ec7..bc2ee9023 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,7 +3,7 @@
# Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed.
#
-# Last Change: 15-Jun-2012.
+# Last Change: 24-Feb-2013.
#
# Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -12,10 +12,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim 7.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-15 08:50+0900\n"
-"PO-Revision-Date: 2012-06-15 09:45+0900\n"
+"POT-Creation-Date: 2013-02-24 12:38+0900\n"
+"PO-Revision-Date: 2013-02-24 13:30+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
+"Language: Japanese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=cp932\n"
"Content-Transfer-Encoding: 8-bit\n"
@@ -109,7 +110,7 @@ msgstr "W14: x: t@CXg"
#, c-format
msgid "E92: Buffer %ld not found"
-msgstr "E92: obt@ %ld "
+msgstr "E92: obt@ %ld "
#, c-format
msgid "E93: More than one match for %s"
@@ -234,7 +235,7 @@ msgstr ""
#, c-format
msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: obt@ \"%s\" "
+msgstr "E102: obt@ \"%s\" "
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
@@ -247,7 +248,7 @@ msgid "E104: Escape not allowed in digraph"
msgstr "E104: Escapegp"
msgid "E544: Keymap file not found"
-msgstr "E544: L[}bvt@C"
+msgstr "E544: L[}bvt@C"
msgid "E105: Using :loadkeymap not in a sourced file"
msgstr "E105: :source t@CO :loadkeymap g"
@@ -369,7 +370,7 @@ msgid "E121: Undefined variable: %s"
msgstr "E121: `: %s"
msgid "E111: Missing ']'"
-msgstr "E111: ']' "
+msgstr "E111: ']' "
#, c-format
msgid "E686: Argument of %s must be a List"
@@ -489,7 +490,7 @@ msgid "E804: Cannot use '%' with Float"
msgstr "E804: '%' _gg"
msgid "E110: Missing ')'"
-msgstr "E110: ')' "
+msgstr "E110: ')' "
msgid "E695: Cannot index a Funcref"
msgstr "E695: Q^CfbNX"
@@ -596,7 +597,7 @@ msgstr "filter() "
#, c-format
msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld s:"
+msgstr "+-%s%3ld s: "
#, c-format
msgid "E700: Unknown function: %s"
@@ -727,10 +728,14 @@ msgstr "E123: `: %s"
msgid "E124: Missing '(': %s"
msgstr "E124: '(' : %s"
+msgid "E862: Cannot use g: here"
+msgstr "E862: g: g"
+
#, c-format
msgid "E125: Illegal argument: %s"
msgstr "E125: s: %s"
+#, c-format
msgid "E853: Duplicate argument name: %s"
msgstr "E853: d: %s"
@@ -960,7 +965,7 @@ msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
msgstr "%s u? (y/n/a/q/l/^E/^Y)"
msgid "(Interrupted) "
-msgstr "()"
+msgstr "() "
msgid "1 match"
msgstr "1 Y"
@@ -991,7 +996,7 @@ msgstr "E148: globalR}hK\\w"
#, c-format
msgid "Pattern found in every line: %s"
-msgstr "p^[Ss: %s"
+msgstr "p^[Ss: %s"
msgid ""
"\n"
@@ -1015,7 +1020,7 @@ msgstr "E149: cO %s wv"
#, c-format
msgid "Sorry, help file \"%s\" not found"
-msgstr "cOwvt@C \"%s\" "
+msgstr "cOwvt@C \"%s\" "
#, c-format
msgid "E150: Not a directory: %s"
@@ -1069,7 +1074,7 @@ msgstr "E157: signｯq: %ld"
# Added at 27-Jan-2004.
msgid " (NOT FOUND)"
-msgstr " ()"
+msgstr " ()"
msgid " (not supported)"
msgstr " (T|[g)"
@@ -1094,7 +1099,7 @@ msgstr "u[N|Cg \"%s%s\" s %ld"
#, c-format
msgid "E161: Breakpoint not found: %s"
-msgstr "E161: u[N|Cg: %s"
+msgstr "E161: u[N|Cg: %s"
msgid "No breakpoints defined"
msgstr "u[N|Cg`"
@@ -1143,7 +1148,7 @@ msgstr "\"%s\" "
#, c-format
msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' : \"%s\""
+msgstr "'runtimepath' : \"%s\""
msgid "Source Vim script"
msgstr "VimXNvg"
@@ -1317,8 +1322,8 @@ msgid "unknown"
msgstr "s"
#, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: J[XL[ %s "
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: J[XL[ '%s' "
msgid "Greetings, Vim user!"
msgstr "Vim gA!"
@@ -1669,7 +1674,7 @@ msgid "[READ ERRORS]"
msgstr "[G[]"
msgid "Can't find temp file for conversion"
-msgstr "Kvt@C"
+msgstr "Kvt@C"
msgid "Conversion with 'charconvert' failed"
msgstr "'charconvert' ｸs"
@@ -1725,7 +1730,7 @@ msgid "E460: The resource fork would be lost (add ! to override)"
msgstr "E460: \\[XtH[Nｸ (! )"
msgid "E214: Can't find temp file for writing"
-msgstr "E214: pt@C"
+msgstr "E214: pt@C"
msgid "E213: Cannot convert (add ! to write without conversion)"
msgstr "E213: (! )"
@@ -1950,7 +1955,7 @@ msgstr ""
#, c-format
msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <obt@=%d>: obt@"
+msgstr "E680: <obt@=%d>: obt@ "
msgid "E217: Can't execute autocommands for ALL events"
msgstr "E217: SCxgautocommandﾀs"
@@ -1990,7 +1995,7 @@ msgstr "E351: 'foldmethod' "
#, c-format
msgid "+--%3ld lines folded "
-msgstr "+--%3ld s"
+msgstr "+--%3ld s "
msgid "E222: Add to read buffer"
msgstr "E222: obt@"
@@ -2015,365 +2020,14 @@ msgid "E227: mapping already exists for %s"
msgstr "E227: %s }bsO"
msgid "No abbreviation found"
-msgstr "Zk"
+msgstr "Zk"
msgid "No mapping found"
-msgstr "}bsO"
+msgstr "}bsO"
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: s[h"
-msgid "--No lines in buffer--"
-msgstr "--obt@s--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: R}hf"
-
-msgid "E471: Argument required"
-msgstr "E471: Kv"
-
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ / ? & "
-
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: R}hC; <CR>ﾀs, CTRL-C"
-
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: fBNg^Oexrc/vimrcR}h"
-
-msgid "E171: Missing :endif"
-msgstr "E171: :endif "
-
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry "
-
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile "
-
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor "
-
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while :endwhile "
-
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor :for "
-
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: t@C (! )"
-
-msgid "E472: Command failed"
-msgstr "E472: R}hｸs"
-
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: mtHgZbg: %s"
-
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: mtHg: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: tHg \"%s\" "
-
-msgid "E473: Internal error"
-msgstr "E473: G["
-
-msgid "Interrupted"
-msgstr ""
-
-msgid "E14: Invalid address"
-msgstr "E14: AhX"
-
-msgid "E474: Invalid argument"
-msgstr "E474: "
-
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: : %s"
-
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ｮ: %s"
-
-msgid "E16: Invalid range"
-msgstr "E16: "
-
-msgid "E476: Invalid command"
-msgstr "E476: R}h"
-
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" fBNg"
-
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() Cuoｸs"
-
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: Cu %s [h"
-
-#, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: Cu %s [h"
-
-msgid "E19: Mark has invalid line number"
-msgstr "E19: }[Nsw"
-
-msgid "E20: Mark not set"
-msgstr "E20: }[N"
-
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' It, X"
-
-msgid "E22: Scripts nested too deep"
-msgstr "E22: XNvgq["
-
-msgid "E23: No alternate file"
-msgstr "E23: t@C"
-
-msgid "E24: No such abbreviation"
-msgstr "E24: Zk"
-
-msgid "E477: No ! allowed"
-msgstr "E477: ! "
-
-msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: GUIgps\\: RpC"
-
-msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: wuCgps\\: RpC\n"
-
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: yVAgps\\: RpC\n"
-
-msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr "E800: ArAgps\\: RpC\n"
-
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: nCCgO[v: %s"
-
-msgid "E29: No inserted text yet"
-msgstr "E29: eLXg}"
-
-msgid "E30: No previous command line"
-msgstr "E30: OR}hs"
-
-msgid "E31: No such mapping"
-msgstr "E31: }bsO"
-
-msgid "E479: No match"
-msgstr "E479: Y"
-
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Y: %s"
-
-msgid "E32: No file name"
-msgstr "E32: t@C"
-
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: K\\uﾀs"
-
-msgid "E34: No previous command"
-msgstr "E34: R}hﾀs"
-
-msgid "E35: No previous regular expression"
-msgstr "E35: K\\ﾀs"
-
-msgid "E481: No range allowed"
-msgstr "E481: w"
-
-msgid "E36: Not enough room"
-msgstr "E36: [e"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: %s Oo^T[o"
-
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: t@C %s "
-
-msgid "E483: Can't get temp file name"
-msgstr "E483: t@CO"
-
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: t@C \"%s\" J"
-
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: t@C %s "
-
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: X (! Xj)"
-
-msgid "E38: Null argument"
-msgstr "E38: "
-
-msgid "E39: Number expected"
-msgstr "E39: lv"
-
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: G[t@C %s J"
-
-msgid "E233: cannot open display"
-msgstr "E233: fBXvCJ"
-
-msgid "E41: Out of memory!"
-msgstr "E41: s!"
-
-msgid "Pattern not found"
-msgstr "p^["
-
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: p^[: %s"
-
-msgid "E487: Argument must be positive"
-msgstr "E487: l"
-
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: OfBNg"
-
-msgid "E42: No Errors"
-msgstr "E42: G["
-
-msgid "E776: No location list"
-msgstr "E776: Xg"
-
-msgid "E43: Damaged match string"
-msgstr "E43: Yj"
-
-msgid "E44: Corrupted regexp program"
-msgstr "E44: sK\\vO"
-
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' IvV (! )"
-
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: p \"%s\" l"
-
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Th{bNX \"%s\" l"
-
-msgid "E47: Error while reading errorfile"
-msgstr "E47: G[t@CG["
-
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: Th{bNX"
-
-msgid "E523: Not allowed here"
-msgstr "E523: "
-
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: XN[[h"
-
-msgid "E49: Invalid scroll size"
-msgstr "E49: XN["
-
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' IvV"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign f[^"
-
-msgid "E72: Close error on swap file"
-msgstr "E72: Xbvt@CN[YG["
-
-msgid "E73: tag stack empty"
-msgstr "E73: ^OX^bN"
-
-msgid "E74: Command too complex"
-msgstr "E74: R}hG"
-
-msgid "E75: Name too long"
-msgstr "E75: O"
-
-msgid "E76: Too many ["
-msgstr "E76: [ "
-
-msgid "E77: Too many file names"
-msgstr "E77: t@C"
-
-msgid "E488: Trailing characters"
-msgstr "E488: ]"
-
-msgid "E78: Unknown mark"
-msgstr "E78: m}[N"
-
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ChJ[hWJ"
-
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' 'winminheight' "
-
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' 'winminwidth' "
-
-msgid "E80: Error while writing"
-msgstr "E80: G["
-
-msgid "Zero count"
-msgstr "[JEg"
-
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: XNvgO<SID>g"
-
-msgid "E449: Invalid expression received"
-msgstr "E449: ｮ"
-
-msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: , X"
-
-msgid "E744: NetBeans does not allow changes in read-only files"
-msgstr "E744: NetBeans pt@CX"
-
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: G[: %s"
-
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: p^[ 'maxmempattern' gp"
-
-msgid "E749: empty buffer"
-msgstr "E749: obt@"
-
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: p^[Ls"
-
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Ot@Cobt@"
-
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: IvV '%s' "
-
-msgid "E850: Invalid register name"
-msgstr "E850: WX^"
-
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr ""
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr ""
-
-#, c-format
-msgid "Need encryption key for \"%s\""
-msgstr "L[Kv: \"%s\""
-
msgid "E851: Failed to create a new process for the GUI"
msgstr "E851: GUIpvZXNｸs"
@@ -2404,7 +2058,7 @@ msgid "No match at cursor, finding next"
msgstr "J[\\u}b`, "
msgid "<cannot open> "
-msgstr "<J>"
+msgstr "<J> "
#, c-format
msgid "E616: vim_SelFile: can't get font %s"
@@ -2541,7 +2195,7 @@ msgstr "AhD(&U)"
#, c-format
msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: ^Cg \"%s\" EBhE"
+msgstr "E671: ^Cg \"%s\" EBhE"
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
@@ -2719,14 +2373,14 @@ msgid "E456: Can't open file \"%s\""
msgstr "E456: t@C \"%s\" J"
msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: PostScript\\[Xt@C \"prolog.ps\" "
+msgstr "E456: PostScript\\[Xt@C \"prolog.ps\" "
msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: PostScript\\[Xt@C \"cidfont.ps\" "
+msgstr "E456: PostScript\\[Xt@C \"cidfont.ps\" "
#, c-format
msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: PostScript\\[Xt@C \"%s.ps\" "
+msgstr "E456: PostScript\\[Xt@C \"%s.ps\" "
#, c-format
msgid "E620: Unable to convert to print encoding \"%s\""
@@ -2770,7 +2424,7 @@ msgid "E562: Usage: cstag <ident>"
msgstr "E562: gp@: cstag <ident>"
msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: ^O"
+msgstr "E257: cstag: ^O"
#, c-format
msgid "E563: stat(%s) error: %d"
@@ -2863,7 +2517,7 @@ msgstr "E568: dcscopef[^x[X"
#, c-format
msgid "E261: cscope connection %s not found"
-msgstr "E261: cscope %s "
+msgstr "E261: cscope %s "
#, c-format
msgid "cscope connection %s closed"
@@ -2941,6 +2595,9 @@ msgstr "s}"
msgid "string cannot contain newlines"
msgstr "s"
+msgid "error converting Scheme values to Vim"
+msgstr "SchemelVimG["
+
msgid "Vim error: ~a"
msgstr "Vim G[: ~a"
@@ -2959,6 +2616,10 @@ msgstr "Os"
msgid "not allowed in the Vim sandbox"
msgstr "Th{bNX"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Cu %s [h"
+
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
"R}h, : PerlCu[h."
@@ -2971,6 +2632,9 @@ msgstr ""
msgid "E836: This Vim cannot execute :python after using :py3"
msgstr "E836: Vim :py3 g :python g"
+msgid "only string keys are allowed"
+msgstr "L["
+
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
@@ -2982,14 +2646,11 @@ msgstr ""
msgid "E659: Cannot invoke Python recursively"
msgstr "E659: Python AIﾀs"
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: ｮ]LpythonIuWFNg"
-msgid "softspace must be an integer"
-msgstr "softspace integer "
-
-msgid "invalid attribute"
-msgstr ""
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: pythonIuWFNgviml"
#, c-format
msgid "<buffer object (deleted) at %p>"
@@ -2998,6 +2659,12 @@ msgstr "<obt@IuWFNg () %p>"
msgid "E837: This Vim cannot execute :py3 after using :python"
msgstr "E837: Vim :python g :py3 g"
+msgid "E860: Eval did not return a valid python 3 object"
+msgstr "E860: ｮ]Lpython 3IuWFNg"
+
+msgid "E861: Failed to convert returned python 3 object to vim value"
+msgstr "E861: python 3IuWFNgviml"
+
msgid "E265: $_ must be an instance of String"
msgstr "E265: $_ CX^X"
@@ -3054,7 +2721,7 @@ msgid "Show source of"
msgstr "\\[X\\ｦ"
msgid "Find symbol"
-msgstr "V{"
+msgstr "V{"
msgid "Browse class"
msgstr "NXQ"
@@ -3145,7 +2812,7 @@ msgid "line number out of range"
msgstr "Os"
msgid "unknown flag: "
-msgstr "mtO:"
+msgstr "mtO: "
msgid "unknown vimOption"
msgstr "m vimOption "
@@ -3175,7 +2842,7 @@ msgstr ""
msgid "cannot register callback command: buffer/window reference not found"
msgstr ""
-"R[obNR}ho^: obt@/EBhEQ"
+"R[obNR}ho^: obt@/EBhEQ"
""
msgid ""
@@ -3290,7 +2957,7 @@ msgstr ""
"gp@:"
msgid " vim [arguments] "
-msgstr " vim []"
+msgstr " vim [] "
msgid ""
"\n"
@@ -3670,7 +3337,7 @@ msgstr ""
"# t@C}[N (V):\n"
msgid "Missing '>'"
-msgstr "'>' "
+msgstr "'>' "
msgid "E543: Not a valid codepage"
msgstr "E543: R[hy[W"
@@ -3739,7 +3406,7 @@ msgstr "E304: ml_upd_block0(): ubN 0 ??"
#, c-format
msgid "E305: No swap file found for %s"
-msgstr "E305: %s Xbvt@C"
+msgstr "E305: %s Xbvt@C"
msgid "Enter number of swap file to use (0 to quit): "
msgstr "gpXbvt@C(0 I): "
@@ -4013,7 +3680,7 @@ msgstr "E315: ml_get: lnum: %ld"
#, c-format
msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: s %ld "
+msgstr "E316: ml_get: s %ld "
msgid "E317: pointer block id wrong 3"
msgstr "E317: |C^ubNID 3"
@@ -4032,7 +3699,7 @@ msgstr "ubN 1 ?"
#, c-format
msgid "E320: Cannot find line %ld"
-msgstr "E320: s %ld "
+msgstr "E320: s %ld "
msgid "E317: pointer block id wrong"
msgstr "E317: |C^ubNID"
@@ -4196,7 +3863,7 @@ msgstr "E333: j[pXj[ACe"
#, c-format
msgid "E334: Menu not found: %s"
-msgstr "E334: j[: %s"
+msgstr "E334: j[: %s"
#, c-format
msgid "E335: Menu not defined for %s mode"
@@ -4206,7 +3873,7 @@ msgid "E336: Menu path must lead to a sub-menu"
msgstr "E336: j[pXTuj["
msgid "E337: Menu not found - check menu names"
-msgstr "E337: j[ - j[mF"
+msgstr "E337: j[ - j[mF"
#, c-format
msgid "Error detected while processing %s:"
@@ -4430,6 +4097,7 @@ msgstr "E838: NetBeansGUI"
msgid "E511: netbeans already connected"
msgstr "E511: NetBeans"
+#, c-format
msgid "E505: %s is read-only (add ! to override)"
msgstr "E505: %s p ( ! )"
@@ -4484,11 +4152,11 @@ msgid "%ld lines to indent... "
msgstr "%ld sCfg... "
msgid "1 line indented "
-msgstr "1 sCfg"
+msgstr "1 sCfg "
#, c-format
msgid "%ld lines indented "
-msgstr "%ld sCfg"
+msgstr "%ld sCfg "
msgid "E748: No previously used register"
msgstr "E748: WX^gp"
@@ -4599,7 +4267,7 @@ msgid "E521: Number required after ="
msgstr "E521: = Kv"
msgid "E522: Not found in termcap"
-msgstr "E522: termcap "
+msgstr "E522: termcap "
#, c-format
msgid "E539: Illegal character <%s>"
@@ -4973,7 +4641,7 @@ msgid ""
"External commands will not pause after completion.\n"
"See :help win32-vimrun for more information."
msgstr ""
-"VIMRUN.EXE $PATH .\n"
+"VIMRUN.EXE $PATH .\n"
"OR}hI~.\n"
" :help win32-vimrun Q."
@@ -5208,11 +4876,11 @@ msgstr "E383: : %s"
#, c-format
msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: Y: %s"
+msgstr "E384: Y: %s"
#, c-format
msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: Y: %s"
+msgstr "E385: Y: %s"
msgid "E386: Expected '?' or '/' after ';'"
msgstr "E386: ';' '?' '/' "
@@ -5222,10 +4890,10 @@ msgstr " (OY)"
#. cursor at status line
msgid "--- Included files "
-msgstr "--- CN[ht@C"
+msgstr "--- CN[ht@C "
msgid "not found "
-msgstr " "
+msgstr " "
msgid "in path ---\n"
msgstr "pX ----\n"
@@ -5234,7 +4902,7 @@ msgid " (Already listed)"
msgstr " ()"
msgid " NOT FOUND"
-msgstr " "
+msgstr " "
#, c-format
msgid "Scanning included file: %s"
@@ -5248,16 +4916,16 @@ msgid "E387: Match is on current line"
msgstr "E387: sY"
msgid "All included files were found"
-msgstr "SCN[ht@C"
+msgstr "SCN[ht@C"
msgid "No included files"
msgstr "CN[ht@C"
msgid "E388: Couldn't find definition"
-msgstr "E388: `"
+msgstr "E388: `"
msgid "E389: Couldn't find pattern"
-msgstr "E389: p^["
+msgstr "E389: p^["
msgid "Substitute "
msgstr "Substitute "
@@ -5480,7 +5148,7 @@ msgstr "s %6d, P %6d - %s"
#, c-format
msgid "Duplicate word in %s line %d: %s"
-msgstr "%s %d s dP: %s"
+msgstr "%s %d s dP: %s"
#, c-format
msgid "First duplicate word in %s line %d: %s"
@@ -5620,7 +5288,7 @@ msgstr "E752: Xyuﾀs"
#, c-format
msgid "E753: Not found: %s"
-msgstr "E753: : %s"
+msgstr "E753: : %s"
#, c-format
msgid "E778: This does not look like a .sug file: %s"
@@ -5696,10 +5364,10 @@ msgid "E392: No such syntax cluster: %s"
msgstr "E392: \\NX^: %s"
msgid "minimal "
-msgstr "minimal"
+msgstr "minimal "
msgid "maximal "
-msgstr "maximal"
+msgstr "maximal "
msgid "; match "
msgstr "; Y "
@@ -5718,7 +5386,7 @@ msgstr "E393: O[v"
#, c-format
msgid "E394: Didn't find region item for %s"
-msgstr "E394: %s vf"
+msgstr "E394: %s vf"
msgid "E397: Filename required"
msgstr "E397: t@CKv"
@@ -5746,7 +5414,7 @@ msgstr "E400: NX^w"
#, c-format
msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: p^[: %s"
+msgstr "E401: p^[: %s"
#, c-format
msgid "E402: Garbage after pattern: %s"
@@ -5788,7 +5456,7 @@ msgstr "E679: syncolor.vim Aoo"
#, c-format
msgid "E411: highlight group not found: %s"
-msgstr "E411: nCCgO[v: %s"
+msgstr "E411: nCCgO[v: %s"
#, c-format
msgid "E412: Not enough arguments: \":highlight link %s\""
@@ -5858,7 +5526,7 @@ msgstr "E425: Y^O"
#, c-format
msgid "E426: tag not found: %s"
-msgstr "E426: ^O: %s"
+msgstr "E426: ^O: %s"
msgid " # pri kind tag"
msgstr " # pri kind tag"
@@ -5927,10 +5595,10 @@ msgid "E433: No tags file"
msgstr "E433: ^Ot@C"
msgid "E434: Can't find tag pattern"
-msgstr "E434: ^Op^["
+msgstr "E434: ^Op^["
msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: ^OP!"
+msgstr "E435: ^OP!"
#, c-format
msgid "Duplicate field name: %s"
@@ -5946,10 +5614,10 @@ msgid "E557: Cannot open termcap file"
msgstr "E557: termcapt@CJ"
msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: terminfo[Gg"
+msgstr "E558: terminfo[Gg"
msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: termcap[Gg"
+msgstr "E559: termcap[Gg"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
@@ -6061,7 +5729,7 @@ msgstr "VX"
#, c-format
msgid "E830: Undo number %ld not found"
-msgstr "E830: AhD %ld "
+msgstr "E830: AhD %ld "
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: s"
@@ -6396,7 +6064,7 @@ msgid "Running modeless, typed text is inserted"
msgstr "[hﾀs, ^Cv}"
msgid "menu Edit->Global Settings->Toggle Insert Mode "
-msgstr "j[ WS}(Sﾒ)[h"
+msgstr "j[ WS}(Sﾒ)[h "
msgid " for two modes "
msgstr " [hL "
@@ -6458,3 +6126,486 @@ msgstr "E446: J[\\t@C"
#, c-format
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: path \"%s\" t@C"
+
+msgid "Edit with &multiple Vims"
+msgstr "VimW (&M)"
+
+msgid "Edit with single &Vim"
+msgstr "1VimW (&V)"
+
+msgid "Diff with Vim"
+msgstr "Vim\\ｦ"
+
+msgid "Edit with &Vim"
+msgstr "VimW (&V)"
+
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "NVimW - "
+
+msgid "Edits the selected file(s) with Vim"
+msgstr "It@CVimW"
+
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "vZXｸs: gvimPATHmF!"
+
+msgid "gvimext.dll error"
+msgstr "gvimext.dll G["
+
+msgid "Path length too long!"
+msgstr "pX!"
+
+msgid "--No lines in buffer--"
+msgstr "--obt@s--"
+
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: R}hf"
+
+msgid "E471: Argument required"
+msgstr "E471: Kv"
+
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ / ? & "
+
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: R}hC; <CR>ﾀs, CTRL-C"
+
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: fBNg^Oexrc/vimrcR}h"
+
+msgid "E171: Missing :endif"
+msgstr "E171: :endif "
+
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry "
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile "
+
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor "
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while :endwhile "
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor :for "
+
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: t@C (! )"
+
+msgid "E472: Command failed"
+msgstr "E472: R}hｸs"
+
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: mtHgZbg: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: mtHg: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: tHg \"%s\" "
+
+msgid "E473: Internal error"
+msgstr "E473: G["
+
+msgid "Interrupted"
+msgstr ""
+
+msgid "E14: Invalid address"
+msgstr "E14: AhX"
+
+msgid "E474: Invalid argument"
+msgstr "E474: "
+
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: : %s"
+
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: ｮ: %s"
+
+msgid "E16: Invalid range"
+msgstr "E16: "
+
+msgid "E476: Invalid command"
+msgstr "E476: R}h"
+
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" fBNg"
+
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() Cuoｸs"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Cu %s [h"
+
+msgid "E19: Mark has invalid line number"
+msgstr "E19: }[Nsw"
+
+msgid "E20: Mark not set"
+msgstr "E20: }[N"
+
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' It, X"
+
+msgid "E22: Scripts nested too deep"
+msgstr "E22: XNvgq["
+
+msgid "E23: No alternate file"
+msgstr "E23: t@C"
+
+msgid "E24: No such abbreviation"
+msgstr "E24: Zk"
+
+msgid "E477: No ! allowed"
+msgstr "E477: ! "
+
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUIgps\\: RpC"
+
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: wuCgps\\: RpC\n"
+
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: yVAgps\\: RpC\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ArAgps\\: RpC\n"
+
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: nCCgO[v: %s"
+
+msgid "E29: No inserted text yet"
+msgstr "E29: eLXg}"
+
+msgid "E30: No previous command line"
+msgstr "E30: OR}hs"
+
+msgid "E31: No such mapping"
+msgstr "E31: }bsO"
+
+msgid "E479: No match"
+msgstr "E479: Y"
+
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: Y: %s"
+
+msgid "E32: No file name"
+msgstr "E32: t@C"
+
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: K\\uﾀs"
+
+msgid "E34: No previous command"
+msgstr "E34: R}hﾀs"
+
+msgid "E35: No previous regular expression"
+msgstr "E35: K\\ﾀs"
+
+msgid "E481: No range allowed"
+msgstr "E481: w"
+
+msgid "E36: Not enough room"
+msgstr "E36: EBhE\\"
+
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s Oo^T[o"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: t@C %s "
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: t@CO"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: t@C \"%s\" J"
+
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: t@C %s "
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: X (! Xj)"
+
+msgid "E38: Null argument"
+msgstr "E38: "
+
+msgid "E39: Number expected"
+msgstr "E39: lv"
+
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: G[t@C %s J"
+
+msgid "E233: cannot open display"
+msgstr "E233: fBXvCJ"
+
+msgid "E41: Out of memory!"
+msgstr "E41: s!"
+
+msgid "Pattern not found"
+msgstr "p^["
+
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: p^[: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: l"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: OfBNg"
+
+msgid "E42: No Errors"
+msgstr "E42: G["
+
+msgid "E776: No location list"
+msgstr "E776: Xg"
+
+msgid "E43: Damaged match string"
+msgstr "E43: Yj"
+
+msgid "E44: Corrupted regexp program"
+msgstr "E44: sK\\vO"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' IvV (! )"
+
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: p \"%s\" l"
+
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: Th{bNX \"%s\" l"
+
+msgid "E47: Error while reading errorfile"
+msgstr "E47: G[t@CG["
+
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: Th{bNX"
+
+msgid "E523: Not allowed here"
+msgstr "E523: "
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: XN[[h"
+
+msgid "E49: Invalid scroll size"
+msgstr "E49: XN["
+
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' IvV"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign f[^"
+
+msgid "E72: Close error on swap file"
+msgstr "E72: Xbvt@CN[YG["
+
+msgid "E73: tag stack empty"
+msgstr "E73: ^OX^bN"
+
+msgid "E74: Command too complex"
+msgstr "E74: R}hG"
+
+msgid "E75: Name too long"
+msgstr "E75: O"
+
+msgid "E76: Too many ["
+msgstr "E76: [ "
+
+msgid "E77: Too many file names"
+msgstr "E77: t@C"
+
+msgid "E488: Trailing characters"
+msgstr "E488: ]"
+
+msgid "E78: Unknown mark"
+msgstr "E78: m}[N"
+
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: ChJ[hWJ"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' 'winminheight' "
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' 'winminwidth' "
+
+msgid "E80: Error while writing"
+msgstr "E80: G["
+
+msgid "Zero count"
+msgstr "[JEg"
+
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: XNvgO<SID>g"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: ｮ"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: , X"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans pt@CX"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: G[: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: p^[ 'maxmempattern' gp"
+
+msgid "E749: empty buffer"
+msgstr "E749: obt@"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: p^[Ls"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Ot@Cobt@"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: IvV '%s' "
+
+msgid "E850: Invalid register name"
+msgstr "E850: WX^"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr ""
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr ""
+
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "L[Kv: \"%s\""
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject"
+
+msgid "softspace must be an integer"
+msgstr "softspace integer "
+
+msgid "invalid attribute"
+msgstr ""
+
+msgid "writelines() requires list of strings"
+msgstr "writelines() XgKv"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/OIuWFNgG["
+
+msgid "no such buffer"
+msgstr "obt@"
+
+msgid "empty keys are not allowed"
+msgstr "L["
+
+msgid "failed to add key to dictionary"
+msgstr "ｫL[ｸs"
+
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "DictionaryObject"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "ｫX"
+
+msgid "Only boolean objects are allowed"
+msgstr "booleanIuWFNg"
+
+msgid "Cannot set this attribute"
+msgstr ""
+
+msgid "no such key in dictionary"
+msgstr "ｫL["
+
+msgid "dict is locked"
+msgstr "ｫbN"
+
+msgid "internal error: failed to get vim list item"
+msgstr "G[: vimXgvfｸs"
+
+msgid "list is locked"
+msgstr "XgbN"
+
+msgid "Failed to add item to list"
+msgstr "Xgvfｸs"
+
+msgid "internal error: no vim list item"
+msgstr "G[: vimXgvf"
+
+msgid "can only assign lists to slice"
+msgstr "XCXXg"
+
+msgid "internal error: failed to add item to list"
+msgstr "G[: Xgvfｸs"
+
+msgid "can only concatenate with lists"
+msgstr "Xg"
+
+msgid "Cannot modify fixed list"
+msgstr "XgX"
+
+msgid "'self' argument must be a dictionary"
+msgstr "'self' ｫ^l"
+
+msgid "failed to run function"
+msgstr "ﾀsｸs"
+
+msgid "attempt to refer to deleted window"
+msgstr "EBhEQ"
+
+msgid "readonly attribute"
+msgstr "p"
+
+msgid "cursor position outside buffer"
+msgstr "J[\\uobt@O"
+
+#, c-format
+msgid "<window object (deleted) at %p>"
+msgstr "<EBhEIuWFNg () %p>"
+
+#, c-format
+msgid "<window object (unknown) at %p>"
+msgstr "<EBhEIuWFNg (s) %p>"
+
+#, c-format
+msgid "<window %d>"
+msgstr "<EBhE %d>"
+
+msgid "no such window"
+msgstr "EBhE"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "obt@Q"
+
+msgid "unable to convert to vim structure"
+msgstr "vim\\"
+
+msgid "NULL reference passed"
+msgstr "NULLQn"
+
+msgid "internal error: invalid value type"
+msgstr "G[: l^"
View Lorry Controller Status