Update message for :python/:py3 usage with approximate translations.

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index dd85914847739e6e4b8fbf4f32f1b488b5ce7e49..56faa6849301d9b8c8440ed21b5204b2132d6f10 100644 (file)
--- 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 e1dff7f4dd75d524011e4e9cda0f2570703b739a..0da75bda819d3306a8b9030b998b058640671b8e 100644 (file)
--- 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 62ecf5d79dfb182e895b8fb54710fe9945d49455..6a2a69a60a8d325596e8e46fcbd42f8fa7f7d52c 100644 (file)
--- 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 käyttää komentoja :py ja :py3 samassa istunnossa"
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Python: Ei voi käyttää komentoja :py ja :py3 samassa istunnossa"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: Python: Ei voi käyttää 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 b5b9f24eac517471100fd9df7e129cde8e2d00df..9d5035a6c8de26fc17d255d7ef7bdbc88410a09f 100644 (file)
--- 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 même session"
+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"
 
 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 4026f99571b22441100336677c3c84de4a0fc763..baf7231d104a3a17dc32e7335177d3c550562303 100644 (file)
--- 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 0d56e994de44a5abce97d17d5268d07614cdc3a6..facbd14e3587f9a47554e169faa2531647d37d31 100644 (file)
--- 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 77bf351c7902a0695e1968fb3f2765f0405555a2..b5f649a661845c76ea2c00a554ec50b97f5f0cfe 100644 (file)
--- 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 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.po b/src/po/pl.po
index 64717c557f889515fe68043bcce00271d5e07834..30ed4dc7256ccb78669e07bacc86bc33d4486aeb 100644 (file)
--- 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 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/sk.cp1250.po b/src/po/sk.cp1250.po
index 201ef072b5020d8d7ebc83de9287ff0ef9232733..bc1efda86b05d1c939ed3b3aa8ec462a0a9f3541 100644 (file)
--- 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 polo\9eke"
+msgid "E783: duplicate char in MAP entry"
+msgstr "E783: duplicitný znak v MAP polo\9eke"
 
 #, c-format
 msgid "E390: Illegal argument: %s"

diff --git a/src/po/sk.po b/src/po/sk.po
index 52172f433ed9884e114c56e9e58a1ac8641820cc..b59b0144b9dbab8da82482cde9f4c67f34878290 100644 (file)
--- 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 polo¾ke"
+msgid "E783: duplicate char in MAP entry"
+msgstr "E783: duplicitný znak v MAP polo¾ke"
 
 #, c-format
 msgid "E390: Illegal argument: %s"

diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index 8ddfd269aa68f532e551caf075d8d89cd3b31977..8516458015dd13c24d715815c0394b85e6cfc00d 100644 (file)
--- 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 78805065a4eb0c1a18624c56b620db992a6dd92f..fb624e7405a99412f212b0a352d0d6d55be7adb7 100644 (file)
--- 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 "