diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index dd85914847..56faa68493 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -30,8 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Patch for :python + :py3. (James Vega, Roland Puntaier, 2010 Aug 12) - Patch for crash with cmdline editing functions. (Dominique Pelle, 2010 Aug 12) Have a close look at :find completion, anything that could be wrong? diff --git a/src/po/eo.po b/src/po/eo.po index e1dff7f4dd..0da75bda81 100644 --- a/src/po/eo.po +++ b/src/po/eo.po @@ -2608,8 +2608,11 @@ msgstr "numero de linio ekster limoj" msgid "not allowed in the Vim sandbox" msgstr "nepermesita en sabloludejo de Vim" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Pitono: Ne eblas uzi :py kaj :py3 en la sama seanco" +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" msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/fi.po b/src/po/fi.po index 62ecf5d79d..6a2a69a60a 100644 --- a/src/po/fi.po +++ b/src/po/fi.po @@ -2603,8 +2603,11 @@ msgstr "rivinumero arvoalueen ulkopuolelta" msgid "not allowed in the Vim sandbox" msgstr "ei sallittu Vimin hiekkalaatikossa" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python: Ei voi kytt komentoja :py ja :py3 samassa istunnossa" +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python: Ei voi kytt komentoja :py ja :py3 samassa istunnossa" + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python: Ei voi kytt komentoja :py ja :py3 samassa istunnossa" msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/fr.po b/src/po/fr.po index b5b9f24eac..9d5035a6c8 100644 --- a/src/po/fr.po +++ b/src/po/fr.po @@ -2827,8 +2827,11 @@ msgstr "num msgid "not allowed in the Vim sandbox" msgstr "non autoris dans le bac sable" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python : impossible d'utiliser :py et :py3 dans la mme session" +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python : impossible d'utiliser :py et :py3 dans la mme session" + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python : impossible d'utiliser :py et :py3 dans la mme session" msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/it.po b/src/po/it.po index 4026f99571..baf7231d10 100644 --- a/src/po/it.po +++ b/src/po/it.po @@ -2604,8 +2604,11 @@ msgstr "numero linea non nell'intervallo" msgid "not allowed in the Vim sandbox" msgstr "non ammesso in ambiente protetto" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python: Impossibile usare :py e :py3 nella stessa sessione" +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python: Impossibile usare :py e :py3 nella stessa sessione" + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python: Impossibile usare :py e :py3 nella stessa sessione" msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po index 0d56e994de..facbd14e35 100644 --- a/src/po/pl.UTF-8.po +++ b/src/po/pl.UTF-8.po @@ -2585,8 +2585,11 @@ msgstr "numer wiersza poza zakresem" msgid "not allowed in the Vim sandbox" msgstr "Niedozwolone w piaskownicy Vima" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python: nie można używać :py i :py3 w czasie jednej sesji" +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python: nie można używać :py i :py3 w czasie jednej sesji" + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python: nie można używać :py i :py3 w czasie jednej sesji" msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po index 77bf351c79..b5f649a661 100644 --- a/src/po/pl.cp1250.po +++ b/src/po/pl.cp1250.po @@ -2585,8 +2585,11 @@ msgstr "numer wiersza poza zakresem" msgid "not allowed in the Vim sandbox" msgstr "Niedozwolone w piaskownicy Vima" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python: nie mona uywa :py i :py3 w czasie jednej sesji" +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python: nie mona uywa :py i :py3 w czasie jednej sesji" + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python: nie mona uywa :py i :py3 w czasie jednej sesji" msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/pl.po b/src/po/pl.po index 64717c557f..30ed4dc725 100644 --- a/src/po/pl.po +++ b/src/po/pl.po @@ -2585,8 +2585,11 @@ msgstr "numer wiersza poza zakresem" msgid "not allowed in the Vim sandbox" msgstr "Niedozwolone w piaskownicy Vima" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python: nie mona uywa :py i :py3 w czasie jednej sesji" +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python: nie mona uywa :py i :py3 w czasie jednej sesji" + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python: nie mona uywa :py i :py3 w czasie jednej sesji" msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/sk.cp1250.po b/src/po/sk.cp1250.po index 201ef072b5..bc1efda86b 100644 --- a/src/po/sk.cp1250.po +++ b/src/po/sk.cp1250.po @@ -4791,8 +4791,8 @@ msgstr "E753: Nen #. This should have been checked when generating the .spl #. * file. -msgid "E999: duplicate char in MAP entry" -msgstr "E999: duplicitn znak v MAP poloke" +msgid "E783: duplicate char in MAP entry" +msgstr "E783: duplicitn znak v MAP poloke" #, c-format msgid "E390: Illegal argument: %s" diff --git a/src/po/sk.po b/src/po/sk.po index 52172f433e..b59b0144b9 100644 --- a/src/po/sk.po +++ b/src/po/sk.po @@ -4791,8 +4791,8 @@ msgstr "E753: Nen #. This should have been checked when generating the .spl #. * file. -msgid "E999: duplicate char in MAP entry" -msgstr "E999: duplicitn znak v MAP poloke" +msgid "E783: duplicate char in MAP entry" +msgstr "E783: duplicitn znak v MAP poloke" #, c-format msgid "E390: Illegal argument: %s" diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po index 8ddfd269aa..8516458015 100644 --- a/src/po/uk.cp1251.po +++ b/src/po/uk.cp1251.po @@ -2649,8 +2649,11 @@ msgstr " msgid "not allowed in the Vim sandbox" msgstr " Vim" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python: :py :py3 " +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python: :py :py3 " + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python: :py :py3 " msgid "" "E263: Sorry, this command is disabled, the Python library could not be " diff --git a/src/po/uk.po b/src/po/uk.po index 78805065a4..fb624e7405 100644 --- a/src/po/uk.po +++ b/src/po/uk.po @@ -2649,8 +2649,11 @@ msgstr "номер рядка за межами файлу" msgid "not allowed in the Vim sandbox" msgstr "не дозволено у пісочниці Vim" -msgid "E999: Python: Cannot use :py and :py3 in one session" -msgstr "E999: Python: Не можна використати :py і :py3 в одному сеансі" +msgid "E836: This Vim cannot execute :python after using :py3" +msgstr "E836: Python: Не можна використати :py і :py3 в одному сеансі" + +msgid "E837: This Vim cannot execute :py3 after using :python" +msgstr "E837: Python: Не можна використати :py і :py3 в одному сеансі" msgid "" "E263: Sorry, this command is disabled, the Python library could not be "