diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index bceb6800efb93ff6ce5cdb5145187ba213ac4686..ec6686cb382dc87af94eaf279e3b6fb1e5f55ed2 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.3. Last change: 2010 Oct 18
+*eval.txt* For Vim version 7.3. Last change: 2010 Oct 27
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4009,7 +4009,7 @@ maparg({name}[, {mode} [, {abbr} [, {dict}]]]) *maparg()*
"lhs" The {lhs} of the mapping.
"rhs" The {rhs} of the mapping as typed.
"silent" 1 for a |:map-silent| mapping, else 0.
- "noremap" 1 if the {rhs} of the mapping is remappable.
+ "noremap" 1 if the {rhs} of the mapping is not remappable.
"expr" 1 for an expression mapping (|:map-<expr>|).
"buffer" 1 for a buffer local mapping (|:map-local|).
"mode" Modes for which the mapping is defined. In
@@ -4018,8 +4018,8 @@ maparg({name}[, {mode} [, {abbr} [, {dict}]]]) *maparg()*
" " Normal, Visual and Operator-pending
"!" Insert and Commandline mode
(|mapmpde-ic|)
- "sid" the Script local ID, used for <sid> mappings
- (|<SID>|)
+ "sid" The script local ID, used for <sid> mappings
+ (|<SID>|).
The mappings local to the current buffer are checked first,
then the global mappings.
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index 161911a41c6a6b252e753f8ee057e90b827d95fe..bac0bb6aa767914636ddb916f9aa4a4d270a7895 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt* For Vim version 7.3. Last change: 2010 Jul 20
+*if_ruby.txt* For Vim version 7.3. Last change: 2010 Oct 27
VIM REFERENCE MANUAL by Shugo Maeda
@@ -40,6 +40,9 @@ downloading Ruby there.
wasn't compiled in. To avoid errors, see
|script-here|.
+Command to try it out: >
+ :ruby print "Hello" # this is a comment
+
Example Vim script: >
function! RedGem()
@@ -187,12 +190,12 @@ $curbuf The current buffer object.
==============================================================================
6. Dynamic loading *ruby-dynamic*
-On MS-Windows the Ruby library can be loaded dynamically. The |:version|
-output then includes |+ruby/dyn|.
+On MS-Windows and Unix the Ruby library can be loaded dynamically. The
+|:version| output then includes |+ruby/dyn|.
-This means that Vim will search for the Ruby DLL file only when needed. When
-you don't use the Ruby interface you don't need it, thus you can use Vim
-without this DLL file.
+This means that Vim will search for the Ruby DLL file or shared library only
+when needed. When you don't use the Ruby interface you don't need it, thus
+you can use Vim even though this library file is not on your system.
You need to install the right version of Ruby for this to work. You can find
the package to download from:
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index aa11ba787c957de387a4ac0da6f0833e9c9b20bf..3c0f8d326e20c56422c598763318407eaa91b924 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.3. Last change: 2010 Sep 29
+*insert.txt* For Vim version 7.3. Last change: 2010 Oct 27
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -382,6 +382,10 @@ mappings it's often better to use <Esc> (first put an "x" in the text, <Esc>
will then always put the cursor on it). Or use CTRL-\ CTRL-O, but then
beware of the cursor possibly being beyond the end of the line.
+The CTRL-O command takes you to Normal mode. If you then use a command enter
+Insert mode again it doesn't nest. Thus when typing "a<C-O>a" and then <Esc>
+takes you back to Normal mode, you do not need to type <Esc> twice.
+
The shifted cursor keys are not available on all terminals.
Another side effect is that a count specified before the "i" or "a" command is
@@ -1043,7 +1047,8 @@ be relatively short. The "info" item can be longer, it will be displayed in
the preview window when "preview" appears in 'completeopt'. The "info" item
will also remain displayed after the popup menu has been removed. This is
useful for function arguments. Use a single space for "info" to remove
-existing text in the preview window.
+existing text in the preview window. The size of the preview window is three
+lines, but 'previewheight' is used when it has a value of 1 or 2.
The "kind" item uses a single letter to indicate the kind of completion. This
may be used to show the completion differently (different color or icon).
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 63375a7a636b0dc2b4e7025651ebcd8095aeb8ee..12bedd5912bd81ae1b13f26a1f60881d53e35c87 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2010 Oct 20
+*options.txt* For Vim version 7.3. Last change: 2010 Oct 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3089,6 +3089,10 @@ A jump table for the options with a short description can be found at |Q_op|.
Specifies for which type of commands folds will be opened, if the
command moves the cursor into a closed fold. It is a comma separated
list of items.
+ NOTE: When the command is part of a mapping this option is not used.
+ Add the |zv| command to the mapping to get the same effect.
+ (rationale: the mapping may want to control opening folds itself)
+
item commands ~
all any
block "(", "{", "[[", "[{", etc.
@@ -3103,8 +3107,6 @@ A jump table for the options with a short description can be found at |Q_op|.
Also for |[s| and |]s|.
tag jumping to a tag: ":ta", CTRL-T, etc.
undo undo or redo: "u" and CTRL-R
- When the command is part of a mapping this option is not used. Add
- the |zv| command to the mapping to get the same effect.
When a movement command is used for an operator (e.g., "dl" or "y%")
this option is not used. This means the operator will include the
whole closed fold.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index c74b00a6802217a26ff8f2a201fefed2f7140a2d..eb7bb8bc9ea45ad3e98695a408ba45c20162eadf 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -8086,6 +8086,7 @@ v:val eval.txt /*v:val*
v:var eval.txt /*v:var*
v:version eval.txt /*v:version*
v:warningmsg eval.txt /*v:warningmsg*
+v:windowid eval.txt /*v:windowid*
v_! change.txt /*v_!*
v_$ visual.txt /*v_$*
v_: cmdline.txt /*v_:*
@@ -8360,6 +8361,7 @@ window-size term.txt /*window-size*
window-size-functions usr_41.txt /*window-size-functions*
window-tag windows.txt /*window-tag*
window-variable eval.txt /*window-variable*
+windowid-variable eval.txt /*windowid-variable*
windows windows.txt /*windows*
windows-3.1 os_win32.txt /*windows-3.1*
windows-intro windows.txt /*windows-intro*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index dcf33c94b21590c59bdc16db97fd7dfbedb7a7b8..aa4c207b1c4910d430c08c01e0a05a58ab3f7f53 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.3. Last change: 2010 Oct 20
+*todo.txt* For Vim version 7.3. Last change: 2010 Oct 27
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,6 +30,8 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs*
-------------------- Known bugs and current work -----------------------
+Segfault with command line abbreviation. (Randy Morris, 2010 Oct 25)
+
'cursorline' is displayed too short when there are concealed characters and
'list' is set, 'listchars' at default value. (Dennis Preiser, 2010 Aug 15)
@@ -45,16 +47,8 @@ Windows keys not set properly on Windows 7? (cncyber, 2010 Aug 26)
This line hangs Vim, because of syntax HL:
call append(line, "INFO ....12....18....24....30....36....42....48....54....60....66....72....78%$")
-Patch to add v:windowid. (Christian J. Robinson, 2010 Oct 13, update by Lech
-Lorens, Oct 14)
-
-maparg() doesn't return the flags, such as <buffer>, <script>, <silent>.
-These are needed to save and restore a mapping.
-Also: the rhs string is not always correct. (Hari Krishna Dara, 2009 Sept 29)
-Patch by Christian Brabandt, 2010 Sep 17.
-
Building the MingW version without clipboard but with multi-byte doesn't
-build. (Bill Lam, 2010 Sep 18)
+work. (Bill Lam, 2010 Sep 18)
Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5)
@@ -62,17 +56,12 @@ Using ":break" or something else that stops executing commands inside a
":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct
15)
-Patch to fix warning for accessing mediumVersion. (Dominique Pelle, 2010 Aug
-18)
-
Patch for 2html to support 'fileencoding'. (Benjamin Fritz, 2010 Sep 10)
-
-Patch to use 'previewheight' for popup menu. (Benjamin Haskell, 2010 Sep 29)
+Beta testing finished now?
Three patches for undo persistence. (Christian Brabandt, 2010 Sep 4)
-ml_get error for using :copen in a custom complete function. (Xavier
-Deguillard, 2010 Oct 19) Other way to reproduce it by Lech Lorens, Oct 20.
+Patch to adjust mzscheme to support racket. (Sergey Khorev, 2010 Oct 24)
string() can't parse back "inf" and "nan". Fix documentation or fix code?
(ZyX, 2010 Aug 23)
@@ -80,8 +69,14 @@ string() can't parse back "inf" and "nan". Fix documentation or fix code?
Patch to use "--as-needed" instead of the link.sh functionality. (Kirill A.
Shutemov, 2010 Aug 25)
+ml_get error for using :copen in a custom complete function. (Xavier
+Deguillard, 2010 Oct 19) Other way to reproduce it by Lech Lorens, Oct 20.
+Patch from Lech: Oct 20. More problems from Lech, Oct 21.
+
Patch to fix complete(). (Kikuchan, 2010 Oct 15)
+maparg() does not show the <script> flag. How to restore the script ID?
+
Ruby: Patch to load Gem module. Why is this needed? (Yasuhiro Matsumoto, 2010
Oct 6)
@@ -102,8 +97,11 @@ it: Pablo Contreras, 2010 Oct 12 Windows XP and 7. Font is never freed?
GTK: drawing a double-width combining character over single-width characters
doesn't look right. (Dominique Pelle, 2010 Aug 8)
+GTK: tear-off menu does not work. (Kurt Sonnenmoser, 2010 Oct 25)
+
Using ":call" inside "if 0" does not see that a function returns a Dict and
gives error for "." as string concatenation. (Yasuhiro Matsumoto, 2010 Oct 20)
+Patch: Oct 20.
Copy/paste between Vim and Google chrome doesn't work well for multi-byte
characters. (Ben Haskell, 2010 Sep 17)
@@ -128,13 +126,23 @@ Included, but also need a change to configure.
setpos() does not restore cursor position after :normal. (Tyru, 2010 Aug 11)
+7 The 'directory' option supports changing path separators to "%" to make
+ file names unique, also support this for 'backupdir'. (Mikolaj Machowski)
+ Patch by Christian Brabandt, 2010 Oct 21.
+
getpos()/setpos() don't include curswant. getpos() could return a fifth
element. setpos() could accept an optional fifth element.
Patch by Christian Brabandt, 2010 Sep 6. Check that new argument is optional
and that it's documented.
+With "tw=55 fo+=a" typing space before ) doesn't work well. (Scott Mcdermott,
+2010 Oct 24)
+
Messages in message.txt are highlighted as examples.
+When using cp850 the NBSP (0xff) is not drawn correctly. (Brett Stahlman, 2010
+Oct 22) 'isprint' is set to "@,161-255".
+
Test 73 fails on MS-Windows when compiled with DJGPP and run twice. How to
delete the Xfind directory? Add an rmdir() function, just like we have
mkdir().
@@ -1879,11 +1887,6 @@ Macintosh:
works.
8 A very long message in confirm() can't be quit. Make this possible with
CTRL-C.
-7 clip_x11_own_selection() uses CurrentTime, that is not allowed. VNC X
- server has a problem with this. (Mark Waggoner) Remembering the timestamp
- of events isn't always possible. We don't get them in an xterm. GTK
- doesn't obtain the selection again when the timestamp differs, thus it
- won't work for GTK anyway.
8 When the clipboard isn't supported: ":yank*" gives a confusing error
message. Specifically mention that the register name is invalid.
8 "gf" always excludes trailing punctuation characters. file_name_in_line()
@@ -4278,8 +4281,6 @@ Writing files:
8 'backupskip' doesn't write a backup file at all, a bit dangerous for some
applications. Add 'backupelsewhere' to write a backup file in another
directory? Or add a flag to 'backupdir'?
-7 The 'directory' option supports changing path separators to "%" to make
- file names unique, also support this for 'backupdir'. (Mikolaj Machowski)
6 Add an option to write a new, numbered, backup file each time. Like
'patchmode', e.g., 'backupmode'.
6 Make it possible to write 'patchmode' files to a different directory.
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 4b4104ecdd7d0e10f687980f6fb879a3f1135d84..b806a31e40369ad03798d47cfb19b73ea25ba2a7 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt* For Vim version 7.3. Last change: 2010 Sep 30
+*undo.txt* For Vim version 7.3. Last change: 2010 Oct 21
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -239,7 +239,9 @@ Vim saves undo trees in a separate undo file, one for each edited file, using
a simple scheme that maps filesystem paths directly to undo files. Vim will
detect if an undo file is no longer synchronized with the file it was written
for (with a hash of the file contents) and ignore it when the file was changed
-after the undo file was written, to prevent corruption.
+after the undo file was written, to prevent corruption. An undo file is also
+ignored if its owner differs from the owner of the edited file. Set 'verbose'
+to get a message about that.
Undo files are normally saved in the same directory as the file. This can be
changed with the 'undodir' option.
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index e808c8f638e495277be46520f6dea5a3b36237a0..31d71c13b93ea2f2ccff79868fbb266bec58e998 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,8 +3,8 @@
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
" Former Maintainers: Gerfried Fuchs <alfie@ist.org>
" Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2010 May 06
-" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debchangelog.vim
+" Last Change: 2010 Oct 21
+" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debchangelog.vim
" Standard syntax initialization
if version < 600
@@ -19,7 +19,7 @@ syn case ignore
" Define some common expressions we can use later on
syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ "
syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
-syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(etch|lenny)-%(backports|volatile)|%(dapper|hardy|jaunty|karmic|lucid|maverick)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
+syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(lenny|squeeze)-%(backports%(-sloppy)=|volatile)|%(dapper|hardy|jaunty|karmic|lucid|maverick|natty)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
syn match debchangelogVersion contained "(.\{-})"
syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 73407328fd61ddfa3b462dd4262b34a428993a62..5a52dc9e7d80de23e424a64bcbcd7fd275b6fb9d 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,8 +3,8 @@
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
" Former Maintainers: Gerfried Fuchs <alfie@ist.org>
" Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2009 Aug 17
-" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debcontrol.vim
+" Last Change: 2010 Oct 21
+" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debcontrol.vim
" Standard syntax initialization
if version < 600
@@ -27,7 +27,7 @@ syn match debControlSpace " "
syn match debcontrolArchitecture contained "\%(all\|any\|alpha\|amd64\|arm\%(e[bl]\)\=\|avr32\|hppa\|i386\|ia64\|lpia\|m32r\|m68k\|mips\%(el\)\=\|powerpc\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc\%(64\)\=\|hurd-i386\|kfreebsd-\%(i386\|amd64\|gnu\)\|knetbsd-i386\|kopensolaris-i386\|netbsd-\%(alpha\|i386\)\)"
syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
-syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
+syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
syn match debcontrolPackageType contained "u\?deb"
syn match debcontrolVariable contained "\${.\{-}}"
syn match debcontrolDmUpload contained "\cyes"
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index bd539819717e45969dc9253fd9e4dcd7803ccd64..f3de367f607eb9ea51cd02f24377e03c30da0a5c 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,8 +2,8 @@
" Language: Debian sources.list
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
" Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2010 May 06
-" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debsources.vim
+" Last Change: 2010 Oct 21
+" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debsources.vim
" Standard syntax initialization
if version < 600
@@ -23,7 +23,7 @@ syn match debsourcesComment /#.*/ contains=@Spell
" Match uri's
syn match debsourcesUri +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' <>"]\++
-syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(etch\|lenny\|squeeze\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|dapper\|hardy\|jaunty\|karmic\|lucid\|maverick\)\([-[:alnum:]_./]*\)+
+syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(lenny\|squeeze\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|dapper\|hardy\|jaunty\|karmic\|lucid\|maverick\|natty\)\([-[:alnum:]_./]*\)+
" Associate our matches and regions with pretty colours
hi def link debsourcesLine Error
diff --git a/src/po/eo.po b/src/po/eo.po
index 0da75bda819d3306a8b9030b998b058640671b8e..c42981e9c3d652447b74b130b8d47f55890244e8 100644
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -23,8 +23,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Esperanto)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-06 21:08+0200\n"
-"PO-Revision-Date: 2010-08-06 21:34+0200\n"
+"POT-Creation-Date: 2010-10-23 21:37+0200\n"
+"PO-Revision-Date: 2010-10-23 21:42+0200\n"
"Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -186,7 +186,6 @@ msgstr "Subo"
msgid "Top"
msgstr "Supro"
-#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -854,7 +853,6 @@ msgstr "Skribas dosieron viminfo \"%s\""
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# Tiu dosiero viminfo estis kreita de Vim %s.\n"
-#, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -862,7 +860,6 @@ msgstr ""
"# Vi povas redakti Äin se vi estas singarda.\n"
"\n"
-#, c-format
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# Valoro de 'encoding' kiam tiu dosiero estis kreita\n"
@@ -974,7 +971,6 @@ msgstr "E148: Regulesprimo mankas el global"
msgid "Pattern found in every line: %s"
msgstr "Ŝablono trovita en ĉiuj linioj: %s"
-#, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -2609,10 +2605,7 @@ msgid "not allowed in the Vim sandbox"
msgstr "nepermesita en sabloludejo de Vim"
msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836: Pitono: Ne eblas uzi :py kaj :py3 en la sama seanco"
-
-msgid "E837: This Vim cannot execute :py3 after using :python"
-msgstr "E837: Pitono: Ne eblas uzi :py kaj :py3 en la sama seanco"
+msgstr "E836: Vim ne povas plenumi :python post uzo de :py3"
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
@@ -2637,6 +2630,9 @@ msgstr "nevalida atributo"
msgid "<buffer object (deleted) at %p>"
msgstr "<bufra objekto (forviÅita) ĉe %p>"
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: Vim ne povas plenumi :py3 post uzo de :python"
+
msgid "E265: $_ must be an instance of String"
msgstr "E265: $_ devas esti apero de Ĉeno"
@@ -3190,12 +3186,6 @@ msgstr "-display <ekrano>\tLanĉi vim sur <ekrano>"
msgid "-iconic\t\tStart vim iconified"
msgstr "-iconic\t\tLanĉi vim piktograme"
-msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <nomo>\t\tUzi rimedon kvazaÅ vim estus <nomo>"
-
-msgid "\t\t\t (Unimplemented)\n"
-msgstr "\t\t\t (Nerealigita)\n"
-
msgid "-background <color>\tUse <color> for the background (also: -bg)"
msgstr "-background <koloro>\tUzi <koloro>-n por la fona koloro (ankaÅ: -bg)"
@@ -3322,7 +3312,6 @@ msgstr ""
"\n"
"ÅanÄo linio kol teksto"
-#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -3331,7 +3320,6 @@ msgstr ""
"# Markoj de dosiero:\n"
#. Write the jumplist with -'
-#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3339,7 +3327,6 @@ msgstr ""
"\n"
"# Saltlisto (plej novaj unue):\n"
-#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -4008,7 +3995,6 @@ msgstr "Vim: konservo de dosieroj...\n"
msgid "Vim: Finished.\n"
msgstr "Vim: Finita.\n"
-#, c-format
msgid "ERROR: "
msgstr "ERARO: "
@@ -4110,6 +4096,9 @@ msgstr "lego el kontaktoskatolo de Netbeans"
msgid "E658: NetBeans connection lost for buffer %ld"
msgstr "E658: Konekto de NetBeans perdita por bufro %ld"
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans ne estas subtenata kun tiu grafika interfaco"
+
msgid "E511: netbeans already connected"
msgstr "E511: nebeans jam konektata"
@@ -5379,9 +5368,6 @@ msgstr " liniavancoj"
msgid "E395: contains argument not accepted here"
msgstr "E395: La argumento \"contains\" ne akcepteblas tie"
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: La argumento \"containedin\" ne akcepteblas tie"
-
msgid "E393: group[t]here not accepted here"
msgstr "E393: La argumento \"group[t]here\" ne akcepteblas tie"
diff --git a/src/po/fr.po b/src/po/fr.po
index 9d5035a6c8de26fc17d255d7ef7bdbc88410a09f..bef8b4f091ec2d20820a3631ed69d9f534dee4d9 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Français)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-06 21:08+0200\n"
-"PO-Revision-Date: 2010-08-06 21:31+0200\n"
+"POT-Creation-Date: 2010-10-23 21:37+0200\n"
+"PO-Revision-Date: 2010-10-23 21:41+0200\n"
"Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,6 @@ msgstr "Bas"
msgid "Top"
msgstr "Haut"
-#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -979,7 +978,6 @@ msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# Ce fichier viminfo a été généré par Vim %s.\n"
# AB - Les deux versions, bien que différentes, se valent.
-#, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -987,7 +985,6 @@ msgstr ""
"# Vous pouvez l'éditer, mais soyez prudent.\n"
"\n"
-#, c-format
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# 'encoding' dans lequel ce fichier a été écrit\n"
@@ -1135,7 +1132,6 @@ msgstr "Motif trouv
# à internationalisation. J'attends que les deux autres messages soient
# traduisibles pour traduire celui-ci.
# DB - TODO : Qu'en est-il à présent ?
-#, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -2828,10 +2824,8 @@ msgid "not allowed in the Vim sandbox"
msgstr "non autorisé dans le bac à sable"
msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836: Python : impossible d'utiliser :py et :py3 dans la même session"
-
-msgid "E837: This Vim cannot execute :py3 after using :python"
-msgstr "E837: Python : impossible d'utiliser :py et :py3 dans la même session"
+msgstr ""
+"E836: Vim ne peut pas exécuter :python après avoir utilisé :py3"
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
@@ -2856,6 +2850,10 @@ msgstr "attribut invalide"
msgid "<buffer object (deleted) at %p>"
msgstr "<objet tampon (effacé) à %p>"
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr ""
+"E837: Vim ne peut pas exécuter :py3 après avoir utilisé :python"
+
msgid "E265: $_ must be an instance of String"
msgstr "E265: $_ doit être une instance de chaîne (String)"
@@ -3408,12 +3406,6 @@ msgstr "-display <
msgid "-iconic\t\tStart vim iconified"
msgstr "-iconic\t\tIconifier Vim au démarrage"
-msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <nom>\t\tEmployer les ressources comme si Vim s'appelait <nom>"
-
-msgid "\t\t\t (Unimplemented)\n"
-msgstr "\t\t\t (non implémenté)\n"
-
msgid "-background <color>\tUse <color> for the background (also: -bg)"
msgstr ""
"-background <coul>\tUtiliser <couleur> pour l'arrière-plan\t (abrv : -bg)"
@@ -3542,7 +3534,6 @@ msgstr ""
"\n"
"modif ligne col fichier/texte"
-#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -3551,7 +3542,6 @@ msgstr ""
"# Marques dans le fichier :\n"
#. Write the jumplist with -'
-#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3559,7 +3549,6 @@ msgstr ""
"\n"
"# Liste de sauts (le plus récent en premier) :\n"
-#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -4236,7 +4225,6 @@ msgstr "Vim : pr
msgid "Vim: Finished.\n"
msgstr "Vim : Fini.\n"
-#, c-format
msgid "ERROR: "
msgstr "ERREUR : "
@@ -4339,6 +4327,9 @@ msgstr "read sur la socket Netbeans"
msgid "E658: NetBeans connection lost for buffer %ld"
msgstr "E658: Connexion NetBeans perdue pour le tampon %ld"
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans n'est pas supporté avec cette interface graphique"
+
msgid "E511: netbeans already connected"
msgstr "E511: netbeans déjà connecté"
@@ -5624,9 +5615,6 @@ msgstr " coupures de ligne"
msgid "E395: contains argument not accepted here"
msgstr "E395: L'argument « contains » n'est pas accepté ici"
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: L'argument « containedin » n'est pas accepté ici"
-
msgid "E393: group[t]here not accepted here"
msgstr "E393: L'argument « group[t]here » n'est pas accepté ici"