Translation updates

Source-Git-URL: git://git.postgresql.org/git/pgtranslation/messages.git
Source-Git-Hash: 17bf3e8564abf600274789fcc90e72532d5e7c05

9 files changed, 1215 insertions, 715 deletions

diff --git a/src/pl/plpython/po/de.po b/src/pl/plpython/po/de.po
index 3d42bd3e507..42d985c76d6 100644
--- a/src/pl/plpython/po/de.po
+++ b/src/pl/plpython/po/de.po
@@ -1,16 +1,16 @@
 # German message translation file for plpython
-# Copyright (C) 2009 - 2015 PostgreSQL Global Development Group
+# Copyright (C) 2009 - 2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Peter Eisentraut <[email protected]>, 2009 - 2015.
+# Peter Eisentraut <[email protected]>, 2009 - 2016.
 #
 # Use these quotes: „%s“
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-01-09 16:07+0000\n"
-"PO-Revision-Date: 2015-01-09 23:06-0500\n"
+"POT-Creation-Date: 2016-05-04 01:37+0000\n"
+"PO-Revision-Date: 2016-05-03 23:20-0400\n"
 "Last-Translator: Peter Eisentraut <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "Language: de\n"
@@ -19,204 +19,204 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plpy_cursorobject.c:98
+#: plpy_cursorobject.c:101
 #, c-format
 msgid "plpy.cursor expected a query or a plan"
 msgstr "plpy.cursor hat eine Anfrage oder einen Plan erwartet"
 
-#: plpy_cursorobject.c:171
+#: plpy_cursorobject.c:179
 #, c-format
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor nimmt eine Sequenz als zweites Argument"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:195 plpy_spi.c:229
 #, c-format
 msgid "could not execute plan"
 msgstr "konnte Plan nicht ausführen"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:198 plpy_spi.c:232
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "Sequenz aus %d Argument erwartet, aber %d erhalten: %s"
 msgstr[1] "Sequenz aus %d Argumenten erwartet, aber %d erhalten: %s"
 
-#: plpy_cursorobject.c:340
+#: plpy_cursorobject.c:354
 #, c-format
 msgid "iterating a closed cursor"
 msgstr "Iteration mit einem geschlossenen Cursor"
 
-#: plpy_cursorobject.c:348 plpy_cursorobject.c:413
+#: plpy_cursorobject.c:362 plpy_cursorobject.c:427
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "Iteration mit einem Cursor in einer abgebrochenen Transaktionen"
 
-#: plpy_cursorobject.c:405
+#: plpy_cursorobject.c:419
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "Lesen aus einem geschlossenen Cursor"
 
-#: plpy_cursorobject.c:482
+#: plpy_cursorobject.c:467 plpy_spi.c:438
+#, c-format
+msgid "query result has too many rows to fit in a Python list"
+msgstr "Anfrageergebnis hat zu viele Zeilen, um in eine Python-Liste zu passen"
+
+#: plpy_cursorobject.c:508
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "Schließen eines Cursors in einer abgebrochenen Subtransaktion"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:127 plpy_elog.c:128 plpy_plpymodule.c:513
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:91
+#: plpy_exec.c:140
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "nicht unterstützter Rückgabemodus für Funktion mit Mengenergebnis"
 
-#: plpy_exec.c:92
+#: plpy_exec.c:141
 #, c-format
 msgid "PL/Python set-returning functions only support returning one value per call."
 msgstr "PL/Python unterstützt für Funktionen mit Mengenergebnis nur das Zurückgeben von einem Wert pro Aufruf."
 
-#: plpy_exec.c:104
+#: plpy_exec.c:154
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "zurückgegebenes Objekt kann nicht iteriert werden"
 
-#: plpy_exec.c:105
+#: plpy_exec.c:155
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "PL/Python-Funktionen mit Mengenergebnis müssen ein iterierbares Objekt zurückgeben."
 
-#: plpy_exec.c:130
+#: plpy_exec.c:169
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "Fehler beim Auslesen des nächsten Elements vom Iterator"
 
-#: plpy_exec.c:165
+#: plpy_exec.c:210
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "PL/Python-Funktion mit Rückgabetyp „void“ hat nicht None zurückgegeben"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:374 plpy_exec.c:400
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "unerwarteter Rückgabewert von Triggerprozedur"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:375
 #, c-format
 msgid "Expected None or a string."
 msgstr "Erwartete None oder eine Zeichenkette."
 
-#: plpy_exec.c:305
+#: plpy_exec.c:390
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "PL/Python-Funktion gab in einem DELETE-Trigger \"MODIFY\" zurück -- ignoriert"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:401
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Erwartete None, \"OK\", \"SKIP\" oder \"MODIFY\"."
 
-#: plpy_exec.c:397
+#: plpy_exec.c:482
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() fehlgeschlagen, beim Einrichten der Argumente"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:486
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() fehlgeschlagen, beim Einrichten der Argumente"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:498
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "Funktion, die einen Record zurückgibt, in einem Zusammenhang aufgerufen, der Typ record nicht verarbeiten kann"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:714
 #, c-format
 msgid "while creating return value"
 msgstr "beim Erzeugen des Rückgabewerts"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:738
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "konnte neues Dictionary nicht erzeugen, beim Aufbauen der Triggerargumente"
 
-#: plpy_exec.c:663
+#: plpy_exec.c:927
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] wurde gelöscht, kann Zeile nicht ändern"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:932
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] ist kein Dictionary"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:957
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "Dictionary-Schlüssel auf Position %d in TD[\"new\"] ist keine Zeichenkette"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:964
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "in TD[\"new\"] gefundener Schlüssel „%s“ existiert nicht als Spalte in der den Trigger auslösenden Zeile"
 
-#: plpy_exec.c:777
+#: plpy_exec.c:1044
 #, c-format
 msgid "while modifying trigger row"
 msgstr "beim Ändern der Triggerzeile"
 
-#: plpy_exec.c:838
+#: plpy_exec.c:1105
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "Abbruch einer Subtransaktion, die nicht beendet wurde, wird erzwungen"
 
-#: plpy_main.c:93
+#: plpy_main.c:125
 #, c-format
-msgid "Python major version mismatch in session"
-msgstr "unpassende Python-Hauptversion für diese Sitzung"
+msgid "multiple Python libraries are present in session"
+msgstr "in dieser Sitzung sind mehrere Python-Bibliotheken präsent"
 
-#: plpy_main.c:94
+#: plpy_main.c:126
 #, c-format
-msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
-msgstr "Diese Sitzung hat zuvor Python-Hauptversion %d verwendet und versucht nun Python-Hauptversion %d zu verwenden."
+msgid "Only one Python major version can be used in one session."
+msgstr "Nur eine Python-Hauptversion kann in einer Sitzung verwendet werden."
 
-#: plpy_main.c:96
-#, c-format
-msgid "Start a new session to use a different Python major version."
-msgstr "Starten Sie eine neue Sitzung, um eine andere Python-Hauptversion zu verwenden."
-
-#: plpy_main.c:111
+#: plpy_main.c:142
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "nicht abgefangener Fehler bei der Initialisierung"
 
-#: plpy_main.c:134
+#: plpy_main.c:165
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "konnte Modul „__main__“ nicht importieren"
 
-#: plpy_main.c:139
+#: plpy_main.c:170
 #, c-format
 msgid "could not create globals"
 msgstr "konnte globale Objekte nicht erzeugen"
 
-#: plpy_main.c:143
+#: plpy_main.c:174
 #, c-format
 msgid "could not initialize globals"
 msgstr "konnte globale Objekte nicht initialisieren"
 
-#: plpy_main.c:347
+#: plpy_main.c:389
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "PL/Python-Funktion „%s“"
 
-#: plpy_main.c:354
+#: plpy_main.c:396
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "anonymer PL/Python-Codeblock"
 
-#: plpy_planobject.c:126
+#: plpy_planobject.c:123
 #, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status nimmt keine Argumente"
@@ -236,41 +236,58 @@ msgstr "konnte das Modul „spiexceptions“ nicht hinzufügen"
 msgid "could not create the base SPI exceptions"
 msgstr "konnte die SPI-Basisausnahmen nicht erzeugen"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "konnte SPI-Ausnahmen nicht erzeugen"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:421
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "konnte Argumente in plpy.elog nicht entpacken"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:430
 msgid "could not parse error message in plpy.elog"
 msgstr "konnte Fehlermeldung in plpy.elog nicht parsen"
 
-#: plpy_procedure.c:200
+#: plpy_plpymodule.c:446
+#, fuzzy, c-format
+#| msgid "type \"%s\" is already defined"
+msgid "the message is already specified"
+msgstr "Typ „%s“ ist bereits definiert"
+
+#: plpy_plpymodule.c:469
+#, fuzzy, c-format
+#| msgid "%s: invalid argument for option %s\n"
+msgid "'%s' is an invalid keyword argument for this function"
+msgstr "%s: ungültiges Argument für Option %s\n"
+
+#: plpy_plpymodule.c:477 plpy_plpymodule.c:480
+#, c-format
+msgid "invalid SQLSTATE code"
+msgstr "ungültiger SQLSTATE-Code"
+
+#: plpy_procedure.c:232
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "Triggerfunktionen können nur als Trigger aufgerufen werden"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:237
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python-Funktionen können keinen Rückgabetyp %s haben"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:318
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python-Funktionen können Typ %s nicht annehmen"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:414
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "konnte PL/Python-Funktion „%s“ nicht kompilieren"
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:417
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "konnte anonymen PL/Python-Codeblock nicht kompilieren"
@@ -280,152 +297,142 @@ msgstr "konnte anonymen PL/Python-Codeblock nicht kompilieren"
 msgid "command did not produce a result set"
 msgstr "Befehl hat keine Ergebnismenge erzeugt"
 
-#: plpy_spi.c:57
+#: plpy_spi.c:60
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "zweites Argument von plpy.prepare muss eine Sequenz sein"
 
-#: plpy_spi.c:106
+#: plpy_spi.c:118
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: Typname auf Position %d ist keine Zeichenkette"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare unterstützt keine zusammengesetzten Datentypen"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:194
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute hat eine Anfrage oder einen Plan erwartet"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:213
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute nimmt eine Sequenz als zweites Argument"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:337
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan fehlgeschlagen: %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:379
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute fehlgeschlagen: %s"
 
-#: plpy_subxactobject.c:122
+#: plpy_subxactobject.c:123
 #, c-format
 msgid "this subtransaction has already been entered"
 msgstr "diese Subtransaktion wurde bereits begonnen"
 
-#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#: plpy_subxactobject.c:129 plpy_subxactobject.c:187
 #, c-format
 msgid "this subtransaction has already been exited"
 msgstr "diese Subtransaktion wurde bereits beendet"
 
-#: plpy_subxactobject.c:174
+#: plpy_subxactobject.c:181
 #, c-format
 msgid "this subtransaction has not been entered"
 msgstr "diese Subtransaktion wurde nicht begonnen"
 
-#: plpy_subxactobject.c:186
+#: plpy_subxactobject.c:193
 #, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "es gibt keine Subtransaktion zu beenden"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:286
 #, c-format
 msgid "could not create new dictionary"
 msgstr "konnte neues Dictionary nicht erzeugen"
 
-#: plpy_typeio.c:411
-#, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python unterstützt die Umwandlung in Arrays von Zeilentypen nicht."
-
-#: plpy_typeio.c:540
+#: plpy_typeio.c:560
 #, c-format
 msgid "could not import a module for Decimal constructor"
 msgstr "konnte kein Modul für den „Decimal“-Konstruktor importieren"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:564
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "kein Attribut „Decimal“ im Modul"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:570
 #, c-format
 msgid "conversion from numeric to Decimal failed"
 msgstr "Umwandlung von numeric in Decimal fehlgeschlagen"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:645
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "kann mehrdimensionales Array nicht in Python-Liste umwandeln"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:646
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python unterstützt nur eindimensionale Arrays."
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:652
 #, c-format
 msgid "could not create new Python list"
 msgstr "konnte neue Python-Liste nicht erzeugen"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:711
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "konnte Bytes-Darstellung eines Python-Objektes nicht erzeugen"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:822
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "konnte Zeichenkettendarstellung eines Python-Objektes nicht erzeugen"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:833
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "konnte Python-Objekt nicht in cstring umwandeln: Python-Zeichenkettendarstellung enthält anscheinend Null-Bytes"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:879
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "Rückgabewert von Funktion mit Array-Rückgabetyp ist keine Python-Sequenz"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:1000
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "Schlüssel „%s“ nicht in Mapping gefunden"
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:1001
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Um einen NULL-Wert in einer Spalte zurückzugeben, muss der Wert None mit einem nach der Spalte benannten Schlüssel in das Mapping eingefügt werden."
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1052
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "Länge der zurückgegebenen Sequenz hat nicht mit der Anzahl der Spalten in der Zeile übereingestimmt"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1163
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "Attribut „%s“ existiert nicht in Python-Objekt"
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1164
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Um einen NULL-Wert in einer Spalte zurückzugeben, muss das zurückzugebende Objekt ein nach der Spalte benanntes Attribut mit dem Wert None haben."
 
-#: plpy_util.c:72
+#: plpy_util.c:36
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "konnte Python-Unicode-Objekt nicht in Bytes umwandeln"
 
-#: plpy_util.c:78
+#: plpy_util.c:42
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "konnte kodierte Zeichenkette nicht in Bytes umwandeln"
diff --git a/src/pl/plpython/po/es.po b/src/pl/plpython/po/es.po
index 8dcb8938764..003b4caafb0 100644
--- a/src/pl/plpython/po/es.po
+++ b/src/pl/plpython/po/es.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plpython (PostgreSQL 9.4)\n"
+"Project-Id-Version: plpython (PostgreSQL 9.6)\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2014-12-15 05:37+0000\n"
-"PO-Revision-Date: 2014-12-15 16:56-0300\n"
+"POT-Creation-Date: 2016-05-02 20:07+0000\n"
+"PO-Revision-Date: 2016-05-03 12:17-0300\n"
 "Last-Translator: Carlos Chapi <[email protected]>\n"
 "Language-Team: PgSQL-es-Ayuda <[email protected]>\n"
 "Language: es\n"
@@ -21,205 +21,206 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.7.1\n"
 
-#: plpy_cursorobject.c:98
+#: plpy_cursorobject.c:101
 #, c-format
 msgid "plpy.cursor expected a query or a plan"
 msgstr "plpy.cursor espera una consulta o un plan"
 
-#: plpy_cursorobject.c:171
+#: plpy_cursorobject.c:179
 #, c-format
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor lleva una secuencia como segundo argumento"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:195 plpy_spi.c:229
 #, c-format
 msgid "could not execute plan"
 msgstr "no se pudo ejecutar el plan"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:198 plpy_spi.c:232
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "Se esperaba una secuencia de %d argumento, se obtuvo %d: %s"
 msgstr[1] "Se esperaba una secuencia de %d argumentos, se obtuvo %d: %s"
 
-#: plpy_cursorobject.c:340
+#: plpy_cursorobject.c:354
 #, c-format
 msgid "iterating a closed cursor"
 msgstr "iterando un cursor cerrado"
 
-#: plpy_cursorobject.c:348 plpy_cursorobject.c:413
+#: plpy_cursorobject.c:362 plpy_cursorobject.c:427
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "iterando un cursor en una subtransacción abortada"
 
-#: plpy_cursorobject.c:405
+#: plpy_cursorobject.c:419
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "haciendo «fetch» en un cursor cerrado"
 
-#: plpy_cursorobject.c:482
+#: plpy_cursorobject.c:467 plpy_spi.c:438
+#, c-format
+msgid "query result has too many rows to fit in a Python list"
+msgstr ""
+
+#: plpy_cursorobject.c:508
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "cerrando un cursor en una subtransacción abortada"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:127 plpy_elog.c:128 plpy_plpymodule.c:513
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:91
+#: plpy_exec.c:140
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "modo de retorno de conjunto de función no soportado"
 
-#: plpy_exec.c:92
+#: plpy_exec.c:141
 #, c-format
-msgid "PL/Python set-returning functions only support returning only value per call."
+msgid "PL/Python set-returning functions only support returning one value per call."
 msgstr "Las funciones PL/Python que retornan conjuntos sólo permiten retornar un valor por invocación."
 
-#: plpy_exec.c:104
+#: plpy_exec.c:154
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "objeto retornado no puede ser iterado"
 
-#: plpy_exec.c:105
+#: plpy_exec.c:155
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "Los funciones PL/Python que retornan conjuntos deben retornar un objeto iterable."
 
-#: plpy_exec.c:130
+#: plpy_exec.c:169
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "error extrayendo el próximo elemento del iterador"
 
-#: plpy_exec.c:165
+#: plpy_exec.c:210
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "función PL/Python con tipo de retorno «void» no retorna None"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:374 plpy_exec.c:400
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "valor de retorno no esperado desde el procedimiento disparador"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:375
 #, c-format
 msgid "Expected None or a string."
 msgstr "Se esperaba None o una cadena."
 
-#: plpy_exec.c:305
+#: plpy_exec.c:390
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "función de disparador de PL/Python retorno «MODIFY» en un disparador de tipo DELETE -- ignorado"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:401
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Se esperaba None, «OK», «SKIP» o «MODIFY»."
 
-#: plpy_exec.c:397
+#: plpy_exec.c:482
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() falló, mientras se inicializaban los argumentos"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:486
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() falló, mientras se inicializaban los argumentos"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:498
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "se llamó una función que retorna un registro en un contexto que no puede aceptarlo"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:714
 #, c-format
 msgid "while creating return value"
 msgstr "mientras se creaba el valor de retorno"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:738
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "no se pudo crear un nuevo diccionario mientras se construían los argumentos de disparador"
 
-#: plpy_exec.c:663
+#: plpy_exec.c:927
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] borrado, no se puede modicar el registro"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:932
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] no es un diccionario"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:957
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "el nombre del atributo de TD[\"new\"] en la posición %d no es una cadena"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:964
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "la llave «%s» en TD[\"new\"] no existe como columna en la fila disparadora"
 
-#: plpy_exec.c:777
+#: plpy_exec.c:1044
 #, c-format
 msgid "while modifying trigger row"
 msgstr "mientras se modificaba la fila de disparador"
 
 # FIXME not very happy with this
-#: plpy_exec.c:838
+#: plpy_exec.c:1105
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "abortando una subtransacción que no se ha cerrado"
 
-#: plpy_main.c:93
-#, c-format
-msgid "Python major version mismatch in session"
-msgstr "las versiones mayores de Python no coinciden en esta sesión"
-
-#: plpy_main.c:94
+#: plpy_main.c:125
 #, c-format
-msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
-msgstr "Esta sesión ha usado previamente la versión mayor de Python %d, y ahora está intentando usar la versión mayor %d."
+msgid "multiple Python libraries are present in session"
+msgstr ""
 
-#: plpy_main.c:96
-#, c-format
-msgid "Start a new session to use a different Python major version."
-msgstr "Inicie una nueva sesión para usar una versión mayor de Python diferente."
+#: plpy_main.c:126
+#, fuzzy, c-format
+#| msgid "Python major version mismatch in session"
+msgid "Only one Python major version can be used in one session."
+msgstr "las versiones mayores de Python no coinciden en esta sesión"
 
-#: plpy_main.c:111
+#: plpy_main.c:142
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "error no capturado en la inicialización"
 
-#: plpy_main.c:134
+#: plpy_main.c:165
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "no se pudo importar el módulo «__main__»"
 
-#: plpy_main.c:139
+#: plpy_main.c:170
 #, c-format
 msgid "could not create globals"
 msgstr "no se pudo crear las globales"
 
-#: plpy_main.c:143
+#: plpy_main.c:174
 #, c-format
 msgid "could not initialize globals"
 msgstr "no se pudo inicializar las globales"
 
-#: plpy_main.c:347
+#: plpy_main.c:389
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "función PL/Python «%s»"
 
-#: plpy_main.c:354
+#: plpy_main.c:396
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "bloque de código anónimo de PL/Python"
 
-#: plpy_planobject.c:126
+#: plpy_planobject.c:123
 #, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status no lleva argumentos"
@@ -239,41 +240,58 @@ msgstr "no se pudo importar el módulo spiexceptions"
 msgid "could not create the base SPI exceptions"
 msgstr "no se pudo crear las excepciones SPI basales"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "no se pudo generar excepciones SPI"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:421
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "no se pudo desempaquetar los argumentos de plpy.elog"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:430
 msgid "could not parse error message in plpy.elog"
 msgstr "no se pudo analizar el mensaje de error de plpy.elog"
 
-#: plpy_procedure.c:200
+#: plpy_plpymodule.c:446
+#, fuzzy, c-format
+#| msgid "type \"%s\" is already defined"
+msgid "the message is already specified"
+msgstr "el tipo «%s» ya está definido"
+
+#: plpy_plpymodule.c:469
+#, fuzzy, c-format
+#| msgid "%s: invalid argument for option %s\n"
+msgid "'%s' is an invalid keyword argument for this function"
+msgstr "%s: argumento no válido para la opción %s\n"
+
+#: plpy_plpymodule.c:477 plpy_plpymodule.c:480
+#, c-format
+msgid "invalid SQLSTATE code"
+msgstr "código SQLSTATE no válido"
+
+#: plpy_procedure.c:232
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:237
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "las funciones PL/Python no pueden retornar el tipo %s"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:318
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "la funciones PL/Python no pueden aceptar el tipo %s"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:414
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "no se pudo compilar la función PL/Python «%s»"
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:417
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "no se pudo compilar el bloque anónimo PL/Python"
@@ -283,152 +301,154 @@ msgstr "no se pudo compilar el bloque anónimo PL/Python"
 msgid "command did not produce a result set"
 msgstr "la orden no produjo un conjunto de resultados"
 
-#: plpy_spi.c:57
+#: plpy_spi.c:60
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "el segundo argumento de plpy.prepare debe ser una secuencia"
 
-#: plpy_spi.c:106
+#: plpy_spi.c:118
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: el nombre de tipo en la posición %d no es una cadena"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare no soporta tipos compuestos"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:194
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera una consulta o un plan"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:213
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute lleva una secuencia como segundo argumento"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:337
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "falló SPI_execute_plan: %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:379
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "falló SPI_execute: %s"
 
-#: plpy_subxactobject.c:122
+#: plpy_subxactobject.c:123
 #, c-format
 msgid "this subtransaction has already been entered"
 msgstr "ya se ha entrado en esta subtransacción"
 
-#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#: plpy_subxactobject.c:129 plpy_subxactobject.c:187
 #, c-format
 msgid "this subtransaction has already been exited"
 msgstr "ya se ha salido de esta subtransacción"
 
-#: plpy_subxactobject.c:174
+#: plpy_subxactobject.c:181
 #, c-format
 msgid "this subtransaction has not been entered"
 msgstr "no se ha entrado en esta subtransacción"
 
-#: plpy_subxactobject.c:186
+#: plpy_subxactobject.c:193
 #, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "no hay una subtransacción de la cual salir"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:286
 #, c-format
 msgid "could not create new dictionary"
 msgstr "no se pudo crear un nuevo diccionario"
 
-#: plpy_typeio.c:411
-#, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python no soporta la conversión de arrays a tipos de registro."
-
-#: plpy_typeio.c:540
+#: plpy_typeio.c:560
 #, c-format
 msgid "could not import a module for Decimal constructor"
 msgstr "no se pudo importar un módulo para el constructor Decimal"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:564
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "no se encontró atributo Decimal en el módulo"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:570
 #, c-format
 msgid "conversion from numeric to Decimal failed"
 msgstr "falló la conversión de numeric a Decimal"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:645
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "no se puede convertir array multidimensional a una lista Python"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:646
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python sólo soporta arrays unidimensionales."
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:652
 #, c-format
 msgid "could not create new Python list"
 msgstr "no se pudo crear una nueva lista Python"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:711
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "no se pudo crear la representación de cadena de bytes de Python"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:822
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "no se pudo crear la representación de cadena de texto del objeto de Python"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:833
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "no se pudo convertir el objeto Python a un cstring: la representación de cadena Python parece tener bytes nulos (\\0)"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:879
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "el valor de retorno de la función con tipo de retorno array no es una secuencia Python"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:1000
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la llave «%s» no fue encontrada en el mapa"
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:1001
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Para retornar null en una columna, agregue el valor None al mapa, con llave llamada igual que la columna."
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1052
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "el tamaño de la secuencia retornada no concuerda con el número de columnas de la fila"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1163
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "el atributo «%s» no existe en el objeto Python"
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1164
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Para retornar null en una columna, haga que el objeto retornado tenga un atributo llamado igual que la columna, con valor None."
 
-#: plpy_util.c:72
+#: plpy_util.c:36
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "no se pudo convertir el objeto Unicode de Python a bytes"
 
-#: plpy_util.c:78
+#: plpy_util.c:42
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "no se pudo extraer bytes desde la cadena codificada"
+
+#~ msgid "PL/Python does not support conversion to arrays of row types."
+#~ msgstr "PL/Python no soporta la conversión de arrays a tipos de registro."
+
+#~ msgid "plpy.prepare does not support composite types"
+#~ msgstr "plpy.prepare no soporta tipos compuestos"
+
+#~ msgid "Start a new session to use a different Python major version."
+#~ msgstr "Inicie una nueva sesión para usar una versión mayor de Python diferente."
+
+#~ msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
+#~ msgstr "Esta sesión ha usado previamente la versión mayor de Python %d, y ahora está intentando usar la versión mayor %d."
diff --git a/src/pl/plpython/po/fr.po b/src/pl/plpython/po/fr.po
index 6c7e535ead6..37c50119f2f 100644
--- a/src/pl/plpython/po/fr.po
+++ b/src/pl/plpython/po/fr.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-02-08 09:07+0000\n"
-"PO-Revision-Date: 2015-02-08 11:08+0100\n"
+"POT-Creation-Date: 2016-05-08 21:07+0000\n"
+"PO-Revision-Date: 2016-05-09 10:33+0200\n"
 "Last-Translator: Guillaume Lelarge <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "Language: fr\n"
@@ -17,222 +17,218 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: plpy_cursorobject.c:98
+#: plpy_cursorobject.c:101
 #, c-format
 msgid "plpy.cursor expected a query or a plan"
 msgstr "plpy.cursor attendait une requ�te ou un plan"
 
-#: plpy_cursorobject.c:171
+#: plpy_cursorobject.c:179
 #, c-format
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor prends une s�quence dans son second argument"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:195 plpy_spi.c:229
 #, c-format
 msgid "could not execute plan"
 msgstr "n'a pas pu ex�cuter le plan"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:198 plpy_spi.c:232
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "S�quence attendue de %d argument, %d obtenu : %s"
 msgstr[1] "S�quence attendue de %d arguments, %d obtenus : %s"
 
-#: plpy_cursorobject.c:340
+#: plpy_cursorobject.c:354
 #, c-format
 msgid "iterating a closed cursor"
 msgstr "it�ration d'un curseur ferm�"
 
-#: plpy_cursorobject.c:348 plpy_cursorobject.c:413
+#: plpy_cursorobject.c:362 plpy_cursorobject.c:427
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "it�ration d'un curseur dans une sous-transaction annul�e"
 
-#: plpy_cursorobject.c:405
+#: plpy_cursorobject.c:419
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "r�cup�rer � partir d'un curseur ferm�"
 
-#: plpy_cursorobject.c:482
+#: plpy_cursorobject.c:467 plpy_spi.c:438
+#, c-format
+msgid "query result has too many rows to fit in a Python list"
+msgstr "le r�sultat de la requ�te contient trop de lignes pour �tre int�gr� dans une liste Python"
+
+#: plpy_cursorobject.c:508
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "fermeture d'un curseur dans une sous-transaction annul�e"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:127 plpy_elog.c:128 plpy_plpymodule.c:513
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:91
+#: plpy_exec.c:140
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "mode de retour non support� pour la fonction SET"
 
-#: plpy_exec.c:92
+#: plpy_exec.c:141
 #, c-format
 msgid "PL/Python set-returning functions only support returning one value per call."
 msgstr ""
 "les fonctions PL/python renvoyant des ensembles supportent seulement une\n"
 "valeur renvoy�e par appel."
 
-#: plpy_exec.c:104
+#: plpy_exec.c:154
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "l'objet renvoy� ne supporte pas les it�rations"
 
-#: plpy_exec.c:105
+#: plpy_exec.c:155
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "les fonctions PL/python renvoyant des ensembles doivent renvoyer un objet\n"
 "it�rable"
 
-#: plpy_exec.c:130
+#: plpy_exec.c:169
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "erreur lors de la r�cup�ration du prochain �l�ment de l'it�rateur"
 
-#: plpy_exec.c:165
+#: plpy_exec.c:210
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "la fonction PL/python avec un code de retour � void � ne renvoyait pas None"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:374 plpy_exec.c:400
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "valeur de retour inattendue de la proc�dure trigger"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:375
 #, c-format
 msgid "Expected None or a string."
 msgstr "Attendait None ou une cha�ne de caract�res."
 
-#: plpy_exec.c:305
+#: plpy_exec.c:390
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr ""
 "la fonction trigger PL/python a renvoy� � MODIFY � dans un trigger DELETE\n"
 "-- ignor�"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:401
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Attendait None, � OK �, � SKIP � ou � MODIFY �."
 
-#: plpy_exec.c:397
+#: plpy_exec.c:482
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "�chec de PyList_SetItem() lors de l'initialisation des arguments"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:486
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "�chec de PyDict_SetItemString() lors de l'initialisation des arguments"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:498
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr ""
 "fonction renvoyant le type record appel�e dans un contexte qui ne peut pas\n"
 "accepter le type record"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:714
 #, c-format
 msgid "while creating return value"
 msgstr "lors de la cr�ation de la valeur de retour"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:738
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr ""
 "n'a pas pu cr�er un nouveau dictionnaire lors de la construction des\n"
 "arguments du trigger"
 
-#: plpy_exec.c:663
+#: plpy_exec.c:927
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] supprim�, ne peut pas modifier la ligne"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:932
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] n'est pas un dictionnaire"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:957
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "la cl� TD[\"new\"] � la position ordinale %d n'est pas une cha�ne"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:964
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr ""
 "la cl� � %s � trouv�e dans TD[\"new\"]  n'existe pas comme colonne\n"
 "de la ligne impact�e par le trigger"
 
-#: plpy_exec.c:777
+#: plpy_exec.c:1044
 #, c-format
 msgid "while modifying trigger row"
 msgstr "lors de la modification de la ligne du trigger"
 
-#: plpy_exec.c:838
+#: plpy_exec.c:1105
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "annulation forc�e d'une sous-transaction qui n'a jamais �t� quitt�e"
 
-#: plpy_main.c:93
+#: plpy_main.c:125
 #, c-format
-msgid "Python major version mismatch in session"
-msgstr "Diff�rence de version majeure de Python dans la session"
+msgid "multiple Python libraries are present in session"
+msgstr "plusieurs biblioth�ques Python sont pr�sentes dans la session"
 
-#: plpy_main.c:94
+#: plpy_main.c:126
 #, c-format
-msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
-msgstr ""
-"Cette session a auparavant utilis� la version majeure %d de Python et elle\n"
-"essaie maintenant d'utiliser la version majeure %d."
+msgid "Only one Python major version can be used in one session."
+msgstr "Seule une version majeure de Python peut �tre utilis�e dans une session."
 
-#: plpy_main.c:96
-#, c-format
-msgid "Start a new session to use a different Python major version."
-msgstr ""
-"Lancez une nouvelle session pour utiliser une version majeure diff�rente de\n"
-"Python."
-
-#: plpy_main.c:111
+#: plpy_main.c:142
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "erreur non r�cup�r�e dans l'initialisation"
 
-#: plpy_main.c:134
+#: plpy_main.c:165
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "n'a pas pu importer le module � __main__ �"
 
-#: plpy_main.c:139
+#: plpy_main.c:170
 #, c-format
 msgid "could not create globals"
 msgstr "n'a pas pu cr�er les globales"
 
-#: plpy_main.c:143
+#: plpy_main.c:174
 #, c-format
 msgid "could not initialize globals"
 msgstr "n'a pas pu initialiser les variables globales"
 
-#: plpy_main.c:347
+#: plpy_main.c:389
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "fonction PL/python � %s �"
 
-#: plpy_main.c:354
+#: plpy_main.c:396
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "bloc de code PL/Python anonyme"
 
-#: plpy_planobject.c:126
+#: plpy_planobject.c:123
 #, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status ne prends pas d'arguments"
@@ -252,41 +248,56 @@ msgstr "n'a pas pu ajouter le module � spiexceptions �"
 msgid "could not create the base SPI exceptions"
 msgstr "n'a pas pu cr�er les exceptions SPI de base"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "n'a pas pu g�n�rer les exceptions SPI"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:421
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "n'a pas pu d�baller les arguments dans plpy.elog"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:430
 msgid "could not parse error message in plpy.elog"
 msgstr "n'a pas pu analyser le message d'erreur dans plpy.elog"
 
-#: plpy_procedure.c:200
+#: plpy_plpymodule.c:446
+#, c-format
+msgid "the message is already specified"
+msgstr "le message est d�j� sp�cifi�"
+
+#: plpy_plpymodule.c:469
+#, c-format
+msgid "'%s' is an invalid keyword argument for this function"
+msgstr "'%s' est une argument mot-cl� invalide pour cette fonction"
+
+#: plpy_plpymodule.c:477 plpy_plpymodule.c:480
+#, c-format
+msgid "invalid SQLSTATE code"
+msgstr "code SQLSTATE invalide"
+
+#: plpy_procedure.c:232
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions trigger peuvent seulement �tre appel�es par des triggers"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:237
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "les fonctions PL/python ne peuvent pas renvoyer le type %s"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:318
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "les fonctions PL/python ne peuvent pas accepter le type %s"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:414
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "n'a pas pu compiler la fonction PL/python � %s �"
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:417
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "n'a pas pu compiler le bloc de code anonyme PL/python"
@@ -296,162 +307,158 @@ msgstr "n'a pas pu compiler le bloc de code anonyme PL/python"
 msgid "command did not produce a result set"
 msgstr "la commande n'a pas fourni d'ensemble de r�sultats"
 
-#: plpy_spi.c:57
+#: plpy_spi.c:60
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "le second argument de plpy.prepare doit �tre une s�quence"
 
-#: plpy_spi.c:106
+#: plpy_spi.c:118
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare : le nom du type sur la position ordinale %d n'est pas une cha�ne"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare ne supporte pas les types composites"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:194
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.prepare attendait une requ�te ou un plan"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:213
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute prends une s�quence dans son second argument"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:337
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "�chec de SPI_execute_plan : %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:379
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "�chec de SPI_execute : %s"
 
-#: plpy_subxactobject.c:122
+#: plpy_subxactobject.c:123
 #, c-format
 msgid "this subtransaction has already been entered"
 msgstr "cette sous-transaction est en cours d'utilisation"
 
-#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#: plpy_subxactobject.c:129 plpy_subxactobject.c:187
 #, c-format
 msgid "this subtransaction has already been exited"
 msgstr "d�j� sorti de cette sous-transaction"
 
-#: plpy_subxactobject.c:174
+#: plpy_subxactobject.c:181
 #, c-format
 msgid "this subtransaction has not been entered"
 msgstr "cette sous-transaction n'a jamais �t� utilis�e"
 
-#: plpy_subxactobject.c:186
+#: plpy_subxactobject.c:193
 #, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "il n'y a pas de transaction � quitter"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:286
 #, c-format
 msgid "could not create new dictionary"
 msgstr "n'a pas pu cr�er le nouveau dictionnaire"
 
-#: plpy_typeio.c:411
-#, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python ne supporte pas les conversions vers des tableaux de types row."
-
-#: plpy_typeio.c:540
+#: plpy_typeio.c:560
 #, c-format
 msgid "could not import a module for Decimal constructor"
 msgstr "n'a pas pu importer un module pour le constructeur Decimal"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:564
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "pas d'attribut Decimal dans le module"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:570
 #, c-format
 msgid "conversion from numeric to Decimal failed"
 msgstr "�chec de la conversion numeric vers Decimal"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:645
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "ne peut pas convertir un tableau multidimensionnel en liste Python"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:646
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python supporte seulement les tableaux uni-dimensionnels."
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:652
 #, c-format
 msgid "could not create new Python list"
 msgstr "n'a pas pu cr�er la nouvelle liste Python"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:711
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "n'a pas pu cr�er une repr�sentation octets de l'objet Python"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:822
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "n'a pas pu cr�er une repr�sentation cha�ne de caract�res de l'objet Python"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:833
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "n'a pas pu convertir l'objet Python en csting : la repr�sentation de la cha�ne Python contient des octets nuls"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:879
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "la valeur de retour de la fonction de type tableau n'est pas une s�quence Python"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:1000
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la cl� � %s � introuvable dans la correspondance"
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:1001
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr ""
 "Pour renvoyer NULL dans une colonne, ajoutez la valeur None � la\n"
 "correspondance de la cl� nomm�e d'apr�s la colonne."
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1052
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr ""
 "la longueur de la s�quence renvoy�e ne correspondait pas au nombre de\n"
 "colonnes dans la ligne"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1163
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "l'attribut � %s � n'existe pas dans l'objet Python"
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1164
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr ""
 "Pour renvoyer NULL dans une colonne, faites en sorte que l'objet renvoy� ait\n"
 "un attribut nomm� suivant la colonne de valeur None."
 
-#: plpy_util.c:72
+#: plpy_util.c:36
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "n'a pas pu convertir l'objet Unicode Python en octets"
 
-#: plpy_util.c:78
+#: plpy_util.c:42
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "n'a pas pu extraire les octets de la cha�ne encod�e"
 
+#~ msgid "plpy.prepare does not support composite types"
+#~ msgstr "plpy.prepare ne supporte pas les types composites"
+
+#~ msgid "PL/Python does not support conversion to arrays of row types."
+#~ msgstr "PL/Python ne supporte pas les conversions vers des tableaux de types row."
+
 #~ msgid "unrecognized error in PLy_spi_execute_fetch_result"
 #~ msgstr "erreur inconnue dans PLy_spi_execute_fetch_result"
 
@@ -501,3 +508,16 @@ msgstr "n'a pas pu extraire les octets de la cha�ne encod�e"
 
 #~ msgid "PL/Python function \"%s\" could not execute plan"
 #~ msgstr "la fonction PL/python � %s � n'a pas pu ex�cuter un plan"
+
+#~ msgid "Start a new session to use a different Python major version."
+#~ msgstr ""
+#~ "Lancez une nouvelle session pour utiliser une version majeure diff�rente de\n"
+#~ "Python."
+
+#~ msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
+#~ msgstr ""
+#~ "Cette session a auparavant utilis� la version majeure %d de Python et elle\n"
+#~ "essaie maintenant d'utiliser la version majeure %d."
+
+#~ msgid "Python major version mismatch in session"
+#~ msgstr "Diff�rence de version majeure de Python dans la session"
diff --git a/src/pl/plpython/po/it.po b/src/pl/plpython/po/it.po
index 97616e31c26..173d182bb36 100644
--- a/src/pl/plpython/po/it.po
+++ b/src/pl/plpython/po/it.po
@@ -17,10 +17,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plpython (PostgreSQL) 9.4\n"
+"Project-Id-Version: plpython (PostgreSQL) 9.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2014-07-30 04:07+0000\n"
-"PO-Revision-Date: 2014-07-30 22:35+0100\n"
+"POT-Creation-Date: 2016-04-17 00:07+0000\n"
+"PO-Revision-Date: 2016-04-17 20:40+0100\n"
 "Last-Translator: Daniele Varrazzo <[email protected]>\n"
 "Language-Team: Gruppo traduzioni ITPUG <[email protected]>\n"
 "Language: it\n"
@@ -30,204 +30,204 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: plpy_cursorobject.c:98
+#: plpy_cursorobject.c:101
 #, c-format
 msgid "plpy.cursor expected a query or a plan"
 msgstr "plpy.cursor richiede una query o un piano"
 
-#: plpy_cursorobject.c:171
+#: plpy_cursorobject.c:179
 #, c-format
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor richiede una sequenza come secondo argomento"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:195 plpy_spi.c:229
 #, c-format
 msgid "could not execute plan"
 msgstr "esecuzione del piano fallita"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:198 plpy_spi.c:232
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "Attesa sequenza di %d argomento, ricevuti %d: %s"
 msgstr[1] "Attesa sequenza di %d argomenti, ricevuti %d: %s"
 
-#: plpy_cursorobject.c:340
+#: plpy_cursorobject.c:354
 #, c-format
 msgid "iterating a closed cursor"
 msgstr "iterazione di un cursore chiuso"
 
-#: plpy_cursorobject.c:348 plpy_cursorobject.c:413
+#: plpy_cursorobject.c:362 plpy_cursorobject.c:427
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "iterazione di un cursore in una sotto-transazione interrotta"
 
-#: plpy_cursorobject.c:405
+#: plpy_cursorobject.c:419
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "lettura da un cursore chiuso"
 
-#: plpy_cursorobject.c:482
+#: plpy_cursorobject.c:467 plpy_spi.c:438
+#, c-format
+msgid "query result has too many rows to fit in a Python list"
+msgstr "il risultato della query ha troppe righe per una lista Python"
+
+#: plpy_cursorobject.c:508
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "chiusura di un cursore in una sotto-transazione interrotta"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:127 plpy_elog.c:128 plpy_plpymodule.c:513
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:91
+#: plpy_exec.c:140
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "modalità di ritorno della funzione set non supportata"
 
-#: plpy_exec.c:92
+#: plpy_exec.c:141
 #, c-format
-msgid "PL/Python set-returning functions only support returning only value per call."
-msgstr "le funzioni PL/Python che restituiscono insiemi supportano solo la restituzione di un solo valore per chiamata."
+msgid "PL/Python set-returning functions only support returning one value per call."
+msgstr "Le funzioni PL/Python che restituiscono insiemi supportano la restituzione di un solo valore per chiamata."
 
-#: plpy_exec.c:104
+#: plpy_exec.c:154
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "l'oggetto restituito non può essere iterato"
 
-#: plpy_exec.c:105
+#: plpy_exec.c:155
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
-msgstr "le funzioni PL/Python che restituiscono insiemi devono restituire un oggetto iterabile"
+msgstr "Le funzioni PL/Python che restituiscono insiemi devono restituire un oggetto iterabile."
 
-#: plpy_exec.c:130
+#: plpy_exec.c:169
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "errore nell'ottenere l'elemento successivo dall'iteratore"
 
-#: plpy_exec.c:165
+#: plpy_exec.c:210
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "la funzione PL/Python che restituisce \"void\" non ha restituito None"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:374 plpy_exec.c:400
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "la prodedura trigger ha restituito un valore inatteso"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:375
 #, c-format
 msgid "Expected None or a string."
 msgstr "Atteso None o una stringa."
 
-#: plpy_exec.c:305
+#: plpy_exec.c:390
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "la funzione trigger PL/Python ha restituito \"MODIFY\" in un trigger DELETE -- ignorato"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:401
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Atteso None, \"OK\", \"SKIP\", o \"MODIFY\"."
 
-#: plpy_exec.c:397
+#: plpy_exec.c:482
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() è fallita durante l'impostazione degli argomenti"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:486
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() è fallita durante l'impostazione degli argomenti"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:498
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "la funzione che restituisce un record è chiamata in un contesto che non può accettare il tipo record"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:714
 #, c-format
 msgid "while creating return value"
 msgstr "durante la creazione del valore da restituire"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:738
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "creazione del nuovo dizionario nella costruzione degli argomenti del trigger fallita"
 
-#: plpy_exec.c:663
+#: plpy_exec.c:927
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] cancellato, non è possibile modificare la riga"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:932
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] non è un dizionario"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:957
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "la chiave di dizionario TD[\"new\"] alla posizione %d non è una stringa"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:964
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "la chiave \"%s\" trovata in TD[\"new\"] non esiste come colonna nella riga del trigger"
 
-#: plpy_exec.c:777
+#: plpy_exec.c:1044
 #, c-format
 msgid "while modifying trigger row"
 msgstr "durante la modifica della riga trigger"
 
-#: plpy_exec.c:838
+#: plpy_exec.c:1105
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "interruzione forzata di una sotto-transazione che non è terminata"
 
-#: plpy_main.c:93
+#: plpy_main.c:125
 #, c-format
-msgid "Python major version mismatch in session"
-msgstr "mancata corrispondenza della versione maggiore di Python nella sessione"
+msgid "multiple Python libraries are present in session"
+msgstr "c'è più di una libreria Python presente nella sessione"
 
-#: plpy_main.c:94
+#: plpy_main.c:126
 #, c-format
-msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
-msgstr "Questa sessione ha precedentemente usato Python con versione maggiore %d e ora sta tentando di usare Python con versione maggiore %d."
+msgid "Only one Python major version can be used in one session."
+msgstr "Solo una versione maggiore di Python può essere usata in una sessione."
 
-#: plpy_main.c:96
-#, c-format
-msgid "Start a new session to use a different Python major version."
-msgstr "Avvia una nuova sessione per usa una versione maggiore di Python diversa."
-
-#: plpy_main.c:111
+#: plpy_main.c:142
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "errore non catturato durante l'inizializzazione"
 
-#: plpy_main.c:134
+#: plpy_main.c:165
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "importazione del modulo \"__main__\""
 
-#: plpy_main.c:139
+#: plpy_main.c:170
 #, c-format
 msgid "could not create globals"
 msgstr "creazione delle variabili globali fallita"
 
-#: plpy_main.c:143
+#: plpy_main.c:174
 #, c-format
 msgid "could not initialize globals"
 msgstr "inizializzazione delle variabili globali fallita"
 
-#: plpy_main.c:347
+#: plpy_main.c:389
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "funzione PL/Python \"%s\""
 
-#: plpy_main.c:354
+#: plpy_main.c:396
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "blocco di codice anonimo in PL/Python"
 
-#: plpy_planobject.c:126
+#: plpy_planobject.c:123
 #, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status non accetta argomenti"
@@ -247,41 +247,56 @@ msgstr "aggiunta del modulo spiexceptions fallita"
 msgid "could not create the base SPI exceptions"
 msgstr "creazione delle eccezioni SPI di base fallita"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "generazione delle eccezioni SPI fallita"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:421
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "non è stato possibile espandere gli argomenti in plpy.elog"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:430
 msgid "could not parse error message in plpy.elog"
 msgstr "non è stato possibile interpretare il messaggio di errore in plpy.elog"
 
-#: plpy_procedure.c:200
+#: plpy_plpymodule.c:446
+#, c-format
+msgid "the message is already specified"
+msgstr "il messaggio è già specificato"
+
+#: plpy_plpymodule.c:469
+#, c-format
+msgid "'%s' is an invalid keyword argument for this function"
+msgstr "'%s' è un nome di argomento non valido per questa funzione"
+
+#: plpy_plpymodule.c:477 plpy_plpymodule.c:480
+#, c-format
+msgid "invalid SQLSTATE code"
+msgstr "codice SQLSTATE non valido"
+
+#: plpy_procedure.c:232
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "le funzioni trigger possono essere chiamate esclusivamente da trigger"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:237
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "le funzioni PL/Python non possono restituire il tipo %s"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:318
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "le funzioni PL/Python non possono accettare il tipo %s"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:414
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "compilazione della funzione PL/Python \"%s\" fallita"
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:417
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "compilazione del blocco di codice anonimo PL/Python fallita"
@@ -291,152 +306,142 @@ msgstr "compilazione del blocco di codice anonimo PL/Python fallita"
 msgid "command did not produce a result set"
 msgstr "il comando non ha prodotto risultati"
 
-#: plpy_spi.c:57
+#: plpy_spi.c:60
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "il secondo argomento di plpy.prepare deve essere una sequenza"
 
-#: plpy_spi.c:106
+#: plpy_spi.c:118
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: il nome del tipo nella posizione %d non è una stringa"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare non supporta tipi compositi"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:194
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute si aspetta una query o un plan"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:213
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute richiede una sequenza come secondo argomento"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:337
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan ha fallito: %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:379
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute ha fallito: %s"
 
-#: plpy_subxactobject.c:122
+#: plpy_subxactobject.c:123
 #, c-format
 msgid "this subtransaction has already been entered"
 msgstr "si è già entrati in questa sotto-transazione"
 
-#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#: plpy_subxactobject.c:129 plpy_subxactobject.c:187
 #, c-format
 msgid "this subtransaction has already been exited"
 msgstr "si è già usciti da questa sotto-transazione"
 
-#: plpy_subxactobject.c:174
+#: plpy_subxactobject.c:181
 #, c-format
 msgid "this subtransaction has not been entered"
 msgstr "non si è entrati in questa sotto-transazione"
 
-#: plpy_subxactobject.c:186
+#: plpy_subxactobject.c:193
 #, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "non c'è nessuna transazione da cui uscire"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:286
 #, c-format
 msgid "could not create new dictionary"
 msgstr "creazione del nuovo dizionario fallita"
 
-#: plpy_typeio.c:411
-#, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python non supporta la conversione in array di tipi riga."
-
-#: plpy_typeio.c:540
+#: plpy_typeio.c:560
 #, c-format
 msgid "could not import a module for Decimal constructor"
 msgstr "importazione di un modulo per il costrutto Decimal fallita"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:564
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "attributo Decimal non trovato nel modulo"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:570
 #, c-format
 msgid "conversion from numeric to Decimal failed"
 msgstr "conversione da numeric a Decimal fallita"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:645
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "non è possibile convertire array multidimensionali a liste Python"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:646
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python supporta solo array monodimensionali."
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:652
 #, c-format
 msgid "could not create new Python list"
 msgstr "creazione della nuova lista Python fallita"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:711
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "creazione della rappresentazione in byte dell'oggetto Python fallita"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:822
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "creazione della rappresentazione stringa dell'oggetto Python fallita"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:833
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "conversione dell'oggetto Python in cstring fallita: la rappresentazione stringa Python sembra contenere byte null"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:879
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "il valore restituito dalla funzione con tipo restituito array non è una sequenza Python"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:1000
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la chiave \"%s\" non è stata trovata nel dizionario"
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:1001
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Per restituire null in una colonna, inserire nella mappa il valore None con una chiave chiamata come la colonna."
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1052
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "la lunghezza della sequenza ritornata non rispetta il numero di colonne presenti nella riga"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1163
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "l'attributo \"%s\" non esiste nell'oggetto Python"
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1164
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Per restituire null in una colonna, l'oggetto restituito deve avere un attributo chiamato come la colonna con valore None."
 
-#: plpy_util.c:72
+#: plpy_util.c:36
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "conversione dell'oggetto Unicode Python in byte fallita"
 
-#: plpy_util.c:78
+#: plpy_util.c:42
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "estrazione dei byte dalla stringa codificata fallita"
diff --git a/src/pl/plpython/po/ko.po b/src/pl/plpython/po/ko.po
new file mode 100644
index 00000000000..3b388e24e9f
--- /dev/null
+++ b/src/pl/plpython/po/ko.po
@@ -0,0 +1,440 @@
+# LANGUAGE message translation file for plpython
+# Copyright (C) 2015 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: plpython (PostgreSQL) 9.5\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2015-12-22 15:41+0900\n"
+"PO-Revision-Date: 2015-12-22 17:57+0900\n"
+"Last-Translator: Ioseph Kim <[email protected]>\n"
+"Language-Team: Korean <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: plpy_cursorobject.c:98
+#, c-format
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor 객체는 쿼리나 plpy.prepare 객체를 인자로 사용합니다"
+
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor 객체의 인자로 plpy.prepare 객체를 사용한 경우 두번째 인자는 prepare 객체의 매개변수가 있어야 합니다."
+
+#: plpy_cursorobject.c:187 plpy_spi.c:217
+#, c-format
+msgid "could not execute plan"
+msgstr "plpy.prepare 객체를 실행할 수 없음"
+
+#: plpy_cursorobject.c:190 plpy_spi.c:220
+#, c-format
+msgid "Expected sequence of %d argument, got %d: %s"
+msgid_plural "Expected sequence of %d arguments, got %d: %s"
+msgstr[0] "%d 개의 인자가 필요한데, %d개의 인자를 지정했음: %s"
+
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "이미 닫긴 커서에서 다음 자료를 요구하고 있음"
+
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:413
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "중지된 서브 트랜잭션에 있는 커서에서 다음 자료를 요구하고 있음"
+
+#: plpy_cursorobject.c:405
+#, c-format
+msgid "fetch from a closed cursor"
+msgstr "닫긴 커서에서 fetch"
+
+#: plpy_cursorobject.c:482
+#, c-format
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "중지된 서브트랜잭션에서 커서를 닫고 있음"
+
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plpy_exec.c:91
+#, c-format
+msgid "unsupported set function return mode"
+msgstr "지원하지 않는 집합 함수 리턴 모드"
+
+#: plpy_exec.c:92
+#, c-format
+msgid ""
+"PL/Python set-returning functions only support returning one value per call."
+msgstr ""
+"PL/Python 집합-반환 함수는 한번의 호출에 대해서 하나의 값만 반환할 수 있습니다."
+
+#: plpy_exec.c:104
+#, c-format
+msgid "returned object cannot be iterated"
+msgstr "반환하는 객체가 iterable 형이 아님"
+
+#: plpy_exec.c:105
+#, c-format
+msgid "PL/Python set-returning functions must return an iterable object."
+msgstr "PL/Python 집합-반환 함수는 iterable 객체를 반환해야 합니다."
+
+#: plpy_exec.c:130
+#, c-format
+msgid "error fetching next item from iterator"
+msgstr "iterator에서 다음 아이템을 가져올 수 없음"
+
+#: plpy_exec.c:165
+#, c-format
+msgid "PL/Python function with return type \"void\" did not return None"
+msgstr "반환 자료형이 \"void\"인 PL/Python 함수가 return None으로 끝나지 않았음"
+
+#: plpy_exec.c:291 plpy_exec.c:317
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "트리거 프로시져가 예상치 못한 값을 반환했습니다"
+
+#: plpy_exec.c:292
+#, c-format
+msgid "Expected None or a string."
+msgstr "None 이나 문자열이 있어야합니다."
+
+#: plpy_exec.c:307
+#, c-format
+msgid ""
+"PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
+msgstr ""
+"PL/Python 트리거 함수가 DELETE 트리거에서 \"MODIFY\"를 반환했음 -- 무시함"
+
+#: plpy_exec.c:318
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "None, \"OK\", \"SKIP\", 또는 \"MODIFY\"를 사용해야 함."
+
+#: plpy_exec.c:399
+#, c-format
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "PyList_SetItem() 함수가 인자 설정하는 중 실패"
+
+#: plpy_exec.c:403
+#, c-format
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "PyDict_SetItemString() 함수가 인자 설정하는 중 실패"
+
+#: plpy_exec.c:415
+#, c-format
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"반환 자료형이 record인데 함수가 그 자료형으로 반환하지 않음"
+
+#: plpy_exec.c:453
+#, c-format
+msgid "while creating return value"
+msgstr "반환값을 만들고 있은 중"
+
+#: plpy_exec.c:477
+#, c-format
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "트리거 인자를 구성하는 중 새 딕션너리를 만들 수 없음"
+
+#: plpy_exec.c:666
+#, c-format
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] 변수가 삭제되었음, 로우를 수정할 수 없음"
+
+#: plpy_exec.c:671
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] 변수가 딕션너리 형태가 아님"
+
+#: plpy_exec.c:696
+#, c-format
+msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
+msgstr "%d 번째 TD[\"new\"] 딕션너리 키가 문자열이 아님"
+
+#: plpy_exec.c:703
+#, c-format
+msgid ""
+"key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
+"row"
+msgstr ""
+"로우 트리거 작업에서 칼럼으로 사용되는 \"%s\" 키가 TD[\"new\"] 변수에 없음."
+
+#: plpy_exec.c:783
+#, c-format
+msgid "while modifying trigger row"
+msgstr "로우 변경 트리거 작업 도중"
+
+#: plpy_exec.c:844
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "서브트랜잭션이 중지됨으로 강제로 중지됨"
+
+#: plpy_main.c:93
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "세션에서 Python 메이져 버전이 일치하지 않습니다"
+
+#: plpy_main.c:94
+#, c-format
+msgid ""
+"This session has previously used Python major version %d, and it is now "
+"attempting to use Python major version %d."
+msgstr ""
+"이 세션은 이전에 %d 버전을 사용했는데, 지금은 %d 버전을 사용하려고 합니다."
+
+#: plpy_main.c:96
+#, c-format
+msgid "Start a new session to use a different Python major version."
+msgstr "Python 메이져 버전을 달리 사용하려면 새 세션으로 시작하세요."
+
+#: plpy_main.c:111
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "plpy 모듈 초기화 실패"
+
+#: plpy_main.c:134
+#, c-format
+msgid "could not import \"__main__\" module"
+msgstr "\"__main__\" 모듈은 임포트 할 수 없음"
+
+#: plpy_main.c:139
+#, c-format
+msgid "could not create globals"
+msgstr "전역변수들을 만들 수 없음"
+
+#: plpy_main.c:143
+#, c-format
+msgid "could not initialize globals"
+msgstr "전역변수들을 초기화 할 수 없음"
+
+#: plpy_main.c:348
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "\"%s\" PL/Python 함수"
+
+#: plpy_main.c:355
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr ""
+
+#: plpy_planobject.c:126
+#, c-format
+msgid "plan.status takes no arguments"
+msgstr "plan.status의 인자가 없습니다."
+
+#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#, c-format
+msgid "could not import \"plpy\" module"
+msgstr "\"plpy\" 모듈을 임포트 할 수 없음"
+
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "spiexceptions 모듈을 추가할 수 없음"
+
+#: plpy_plpymodule.c:217
+#, c-format
+msgid "could not create the base SPI exceptions"
+msgstr "기본 SPI 예외처리를 만들 수 없음"
+
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "SPI 예외처리를 생성할 수 없음"
+
+#: plpy_plpymodule.c:387
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "잘못된 인자로 구성된 plpy.elog"
+
+#: plpy_plpymodule.c:395
+msgid "could not parse error message in plpy.elog"
+msgstr "plpy.elog 에서 오류 메시지를 분석할 수 없음"
+
+#: plpy_procedure.c:213
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr "트리거 함수는 트리거로만 호출될 수 있음"
+
+#: plpy_procedure.c:218
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "PL/Python 함수는 %s 자료형을 반환할 수 없음"
+
+#: plpy_procedure.c:300
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "PL/Python 함수는 %s 자료형을 사용할 수 없음"
+
+#: plpy_procedure.c:398
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "\"%s\" PL/Python 함수를 컴파일 할 수 없음"
+
+#: plpy_procedure.c:401
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "anonymous PL/Python 코드 블록을 컴파일 할 수 없음"
+
+#: plpy_resultobject.c:145 plpy_resultobject.c:165 plpy_resultobject.c:185
+#, c-format
+msgid "command did not produce a result set"
+msgstr "명령의 결과값이 없음"
+
+#: plpy_spi.c:57
+#, c-format
+msgid "second argument of plpy.prepare must be a sequence"
+msgstr "plpy.prepare 함수의 두번째 인자는 Python 시퀀스형이어야 함"
+
+#: plpy_spi.c:106
+#, c-format
+msgid "plpy.prepare: type name at ordinal position %d is not a string"
+msgstr "plpy.prepare: %d 번째 인자의 자료형이 문자열이 아님"
+
+#: plpy_spi.c:182
+#, c-format
+msgid "plpy.execute expected a query or a plan"
+msgstr "plpy.execute 함수의 인자는 쿼리문이나 plpy.prepare 객체여야 함"
+
+#: plpy_spi.c:201
+#, c-format
+msgid "plpy.execute takes a sequence as its second argument"
+msgstr "plpy.execut 함수의 두번째 인자는 python 시퀀스형이 와야함"
+
+#: plpy_spi.c:325
+#, c-format
+msgid "SPI_execute_plan failed: %s"
+msgstr "SPI_execute_plan 실패: %s"
+
+#: plpy_spi.c:367
+#, c-format
+msgid "SPI_execute failed: %s"
+msgstr "SPI_execute 실패: %s"
+
+#: plpy_subxactobject.c:122
+#, c-format
+msgid "this subtransaction has already been entered"
+msgstr "이 서브트랜잭션은 이미 시작되었음"
+
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#, c-format
+msgid "this subtransaction has already been exited"
+msgstr "이 서브트랜잭션은 이미 끝났음"
+
+#: plpy_subxactobject.c:174
+#, c-format
+msgid "this subtransaction has not been entered"
+msgstr "이 서브트랜잭션이 시작되지 않았음"
+
+#: plpy_subxactobject.c:186
+#, c-format
+msgid "there is no subtransaction to exit from"
+msgstr "종료할 서브트랜잭션이 없음, 위치:"
+
+#: plpy_typeio.c:302
+#, c-format
+msgid "could not create new dictionary"
+msgstr "새 디렉터리를 만들 수 없음"
+
+#: plpy_typeio.c:564
+#, c-format
+msgid "could not import a module for Decimal constructor"
+msgstr "Decimal 자료형 처리를 위해 모듈을 임포트 할 수 없음"
+
+#: plpy_typeio.c:568
+#, c-format
+msgid "no Decimal attribute in module"
+msgstr "모듈안에 Decimal 속성이 없음"
+
+#: plpy_typeio.c:574
+#, c-format
+msgid "conversion from numeric to Decimal failed"
+msgstr "numeric 형을 Decimal 형으로 변환할 수 없음"
+
+#: plpy_typeio.c:649
+#, c-format
+msgid "cannot convert multidimensional array to Python list"
+msgstr "다중 차원 배열은 Python 리스트로 변환할 수 없음"
+
+#: plpy_typeio.c:650
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python에서는 1차원 배열만 지원함"
+
+#: plpy_typeio.c:656
+#, c-format
+msgid "could not create new Python list"
+msgstr "새 Python 리스트를 만들 수 없음"
+
+#: plpy_typeio.c:715
+#, c-format
+msgid "could not create bytes representation of Python object"
+msgstr "Python 객체를 bytea 자료형으로 변환할 수 없음"
+
+#: plpy_typeio.c:820
+#, c-format
+msgid "could not create string representation of Python object"
+msgstr "Python 객체를 문자열 자료형으로 변환할 수 없음"
+
+#: plpy_typeio.c:831
+#, c-format
+msgid ""
+"could not convert Python object into cstring: Python string representation "
+"appears to contain null bytes"
+msgstr ""
+"Python 객체를 cstring 형으로 변환할 수 없음: Python string 변수에 null"
+"문자열이 포함되어 있음"
+
+#: plpy_typeio.c:877
+#, c-format
+msgid ""
+"return value of function with array return type is not a Python sequence"
+msgstr ""
+"배열형으로 넘길 자료형이 Python 시퀀스형이 아님"
+
+#: plpy_typeio.c:992
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "맵 안에 \"%s\" 키가 없음"
+
+#: plpy_typeio.c:993
+#, c-format
+msgid ""
+"To return null in a column, add the value None to the mapping with the key "
+"named after the column."
+msgstr ""
+
+#: plpy_typeio.c:1044
+#, c-format
+msgid "length of returned sequence did not match number of columns in row"
+msgstr "반환되는 시퀀스형 변수의 길이가 로우의 칼럼수와 일치하지 않음"
+
+#: plpy_typeio.c:1155
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "Python 객체 가운데 \"%s\" 속성이 없음"
+
+#: plpy_typeio.c:1156
+#, c-format
+msgid ""
+"To return null in a column, let the returned object have an attribute named "
+"after column with value None."
+msgstr ""
+
+#: plpy_util.c:72
+#, c-format
+msgid "could not convert Python Unicode object to bytes"
+msgstr "Python 유니코드 객체를 UTF-8 문자열로 변환할 수 없음"
+
+#: plpy_util.c:78
+#, c-format
+msgid "could not extract bytes from encoded string"
+msgstr "해당 인코드 문자열을 Python에서 사용할 수 없음"
diff --git a/src/pl/plpython/po/pl.po b/src/pl/plpython/po/pl.po
index 4a396e73f1c..7e37cf27801 100644
--- a/src/pl/plpython/po/pl.po
+++ b/src/pl/plpython/po/pl.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 # Begina Felicysym <[email protected]>, 2011, 2012.
-# grzegorz <[email protected]>, 2014.
+# grzegorz <[email protected]>, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: plpython (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2014-11-10 20:37+0000\n"
-"PO-Revision-Date: 2014-11-10 22:58+0200\n"
+"POT-Creation-Date: 2016-02-13 23:07+0000\n"
+"PO-Revision-Date: 2016-02-14 01:09+0200\n"
 "Last-Translator: grzegorz <[email protected]>\n"
 "Language-Team: [email protected]\n"
 "Language: pl\n"
@@ -29,12 +29,12 @@ msgstr "plpy.cursor oczekuje kwerendy lub planu"
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor przyjmuje sekwencję jako drugi argument"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:187 plpy_spi.c:217
 #, c-format
 msgid "could not execute plan"
 msgstr "nie można wykonać planu"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:190 plpy_spi.c:220
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -62,7 +62,7 @@ msgstr "pobranie z zamkniętego kursora"
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "zamknięcie kursora w przerwanej podtransakcji"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -74,8 +74,8 @@ msgstr "nieobsługiwany tryb zwracania przez funkcję grupy"
 
 #: plpy_exec.c:92
 #, c-format
-msgid "PL/Python set-returning functions only support returning only value per call."
-msgstr "funkcja zwracająca grupę PL/obsługuje tylko zwracanie jednej wartości w wywołaniu."
+msgid "PL/Python set-returning functions only support returning one value per call."
+msgstr "funkcje zwracające grupę PL/Python obsługuje tylko zwracanie jednej wartości w wywołaniu."
 
 #: plpy_exec.c:104
 #, c-format
@@ -97,122 +97,133 @@ msgstr "błąd pobierania następnego elementu z iteratora"
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "funkcja PL/Python zwracająca typ \"void\" nie zwróciła wartości None"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:291 plpy_exec.c:317
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "nieoczekiwana wartość zwracana przez procedury wyzwalacza"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:292
 #, c-format
 msgid "Expected None or a string."
 msgstr "Oczekiwano None lub ciąg znaków."
 
-#: plpy_exec.c:305
+#: plpy_exec.c:307
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "funkcja wyzwalacza PL/Python zwróciła \"MODIFY\" w wyzwalaczu DELETE -- zignorowano"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:318
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Oczekiwano None, \"OK\", \"SKIP\", lub \"MODIFY\"."
 
-#: plpy_exec.c:397
+#: plpy_exec.c:399
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "nie powiodło się PyList_SetItem() podczas ustawiania argumentów"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:403
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "nie powiodło się PyDict_SetItemString() podczas ustawiania argumentów"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:415
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "funkcja zwracająca rekord w wywołaniu, które nie akceptuje typów złożonych"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:453
 #, c-format
 msgid "while creating return value"
 msgstr "podczas tworzenia wartości zwracanej"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:477
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "nie można utworzyć nowego słownika w czasie tworzenia argumentów wyzwalacza"
 
-#: plpy_exec.c:663
+#: plpy_exec.c:666
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "usunięto TD[\"new\"], nie można zmienić wiersza"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:671
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] nie jest słownikiem"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:696
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "klucz słownika TD[\"new\"] na pozycji porządkowej %d nie jest ciągiem znaków"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:703
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "klucz \"%s\" znaleziony w TD[\"new\"] nie istnieje jako kolumna w wierszu obsługiwanym przez wyzwalacz"
 
-#: plpy_exec.c:777
+#: plpy_exec.c:783
 #, c-format
 msgid "while modifying trigger row"
 msgstr "podczas modyfikowania wiersza wyzwalacza"
 
-#: plpy_exec.c:838
+#: plpy_exec.c:844
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "wymuszone przerywanie podtransakcji, która nie została zakończona"
 
-#: plpy_main.c:93
+#: plpy_main.c:124
 #, c-format
 msgid "Python major version mismatch in session"
 msgstr "niezgodna wersja główna Python w sesji"
 
-#: plpy_main.c:94
+#: plpy_main.c:125
 #, c-format
 msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
 msgstr "Ta sesja używała poprzednio Python w głównej wersji %d, teraz próbuje użyć Python w głównej wersji %d."
 
-#: plpy_main.c:96
+#: plpy_main.c:127
 #, c-format
 msgid "Start a new session to use a different Python major version."
 msgstr "Uruchom nową sesję aby użyć innej głównej wersji Python."
 
-#: plpy_main.c:111
+#: plpy_main.c:150
+#, c-format
+msgid "multiple Python libraries are present in session"
+msgstr "kilka bibliotek Python jest dostępne w sesji"
+
+#: plpy_main.c:151
+#, c-format
+#| msgid "Python major version mismatch in session"
+msgid "Only one Python major version can be used in one session."
+msgstr "Tylko jedna podstawowa wersja Python może być używana w sesji."
+
+#: plpy_main.c:167
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "niewyłapany błąd w inicjacji"
 
-#: plpy_main.c:134
+#: plpy_main.c:190
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "nie można zaimportować modułu \"__main__\""
 
-#: plpy_main.c:139
+#: plpy_main.c:195
 #, c-format
 msgid "could not create globals"
 msgstr "nie można utworzyć zmiennych globalnych"
 
-#: plpy_main.c:143
+#: plpy_main.c:199
 #, c-format
 msgid "could not initialize globals"
 msgstr "nie można zainicjować zmiennych globalnych"
 
-#: plpy_main.c:347
+#: plpy_main.c:409
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "funkcja PL/Python \"%s\""
 
-#: plpy_main.c:354
+#: plpy_main.c:416
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "anonimowy blok kodu PL/Python"
@@ -237,41 +248,41 @@ msgstr "nie udało się dodać modułu spiexceptions"
 msgid "could not create the base SPI exceptions"
 msgstr "nie można stworzyć bazowych wyjątków SPI"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "nie można wygenerować wyjątków SPI"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:387
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "nie można rozpakować argumentów w plpy.elog"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:395
 msgid "could not parse error message in plpy.elog"
 msgstr "nie można przetworzyć komunikatu błędu w plpy.elog"
 
-#: plpy_procedure.c:200
+#: plpy_procedure.c:213
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "procedury wyzwalaczy mogą być wywoływane jedynie przez wyzwalacze"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:218
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "funkcje PL/Python nie mogą zwracać wartości typu %s"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:300
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "funkcje PL/Python nie obsługują typu %s"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:398
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "nie powiodła się kompilacja funkcji PL/Python \"%s\""
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:401
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "nie udało się skompilować anonimowego bloku kodu PL/Python"
@@ -291,27 +302,22 @@ msgstr "drugi argument plpy.prepare musi być sekwencją"
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: nazwa typu na pozycji porządkowej %d nie jest ciągiem znaków"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare nie obsługuje typów złożonych"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:182
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute oczekuje kwerendy lub planu"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:201
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute przyjmuje sekwencję jako drugi argument"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:325
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "nie powiódł się SPI_execute_plan: %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:367
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "nie powiódł się SPI_execute: %s"
@@ -336,89 +342,82 @@ msgstr "ta podtransakcja nie została wprowadzona"
 msgid "there is no subtransaction to exit from"
 msgstr "brak podtransakcji by z niej wyjść"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:302
 #, c-format
 msgid "could not create new dictionary"
 msgstr "nie można utworzyć nowego słownika"
 
-#: plpy_typeio.c:411
-#, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python nie obsługuje konwersji typów wierszowych na tablice."
-
-#: plpy_typeio.c:540
+#: plpy_typeio.c:564
 #, c-format
-#| msgid "could not import \"plpy\" module"
 msgid "could not import a module for Decimal constructor"
 msgstr "nie można zaimportować modułu dla konstruktora Decimal"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:568
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "brak atrybutu Decimal w module"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:574
 #, c-format
-#| msgid "conversion from wchar_t to server encoding failed: %m"
 msgid "conversion from numeric to Decimal failed"
 msgstr "konwersja z numeric na Decimal nie powiodła się"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:649
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "nie można skonwertować tablicy wielowymiarowej na listę Python"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:650
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python obsługuje tylko jednowymiarowe tablice."
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:656
 #, c-format
 msgid "could not create new Python list"
 msgstr "nie można utworzyć nowej listy Python"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:715
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "nie można utworzyć reprezentacji bajtowej obiektu Python"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:820
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "nie można utworzyć reprezentacji znakowej obiektu Python"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:831
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "nie można zmienić obiektu Python na cstring: reprezentacja ciągu znaków Python wydaje się zawierać puste bajty"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:877
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "wartość zwrócona przez funkcję zwracającą tablicę nie jest sekwencją Python"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:992
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "nie odnaleziono klucza \"%s\" w mapowaniu"
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:993
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Aby zwrócić null w kolumnie, dodaj wartość None do mapowania z kluczem nazwanym wedle kolumny."
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1044
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "długość zwróconej sekwencji nie jest równa liczbie kolumn w wierszu"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1155
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "atrybut \"%s\" nie istnieje w obiekcie Python"
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1156
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Aby zwrócić null w kolumnie, niech zwrócony obiekt posiada atrybut nazwany wedle kolumny z wartością None."
@@ -433,5 +432,11 @@ msgstr "nie można zmienić obiektu unikodowego Python na bajty"
 msgid "could not extract bytes from encoded string"
 msgstr "nie można wyciągnąć bajtów z kodowanego ciągu znaków"
 
+#~ msgid "plpy.prepare does not support composite types"
+#~ msgstr "plpy.prepare nie obsługuje typów złożonych"
+
+#~ msgid "PL/Python does not support conversion to arrays of row types."
+#~ msgstr "PL/Python nie obsługuje konwersji typów wierszowych na tablice."
+
 #~ msgid "unrecognized error in PLy_spi_execute_fetch_result"
 #~ msgstr "nierozpoznany błąd w PLy_spi_execute_fetch_result"
diff --git a/src/pl/plpython/po/pt_BR.po b/src/pl/plpython/po/pt_BR.po
index 0043bf7a33b..973cee5fdcf 100644
--- a/src/pl/plpython/po/pt_BR.po
+++ b/src/pl/plpython/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Brazilian Portuguese message translation file for plpython
 # Copyright (C) 2009 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Euler Taveira de Oliveira <[email protected]>, 2009-2014.
+# Euler Taveira de Oliveira <[email protected]>, 2009-2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2014-05-17 16:05-0300\n"
+"POT-Creation-Date: 2016-02-13 17:22-0300\n"
 "PO-Revision-Date: 2009-05-10 01:15-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <[email protected]>\n"
 "Language-Team: Brazilian Portuguese <[email protected]>\n"
@@ -27,12 +27,12 @@ msgstr "plpy.cursor esperava uma consulta ou um plano"
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor tem uma sequência como seu segundo argumento"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:187 plpy_spi.c:217
 #, c-format
 msgid "could not execute plan"
 msgstr "não pôde executar plano"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:190 plpy_spi.c:220
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -59,7 +59,7 @@ msgstr "busca em um cursor fechado"
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "fechando um cursor em uma subtransação abortada"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -71,7 +71,7 @@ msgstr "modo de retorno da função que retorna conjunto não é suportado"
 
 #: plpy_exec.c:92
 #, c-format
-msgid "PL/Python set-returning functions only support returning only value per call."
+msgid "PL/Python set-returning functions only support returning one value per call."
 msgstr "funções PL/Python que retornam conjunto só suportam retornar um valor por chamada."
 
 #: plpy_exec.c:104
@@ -94,122 +94,132 @@ msgstr "erro ao buscar próximo item do iterador"
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "função PL/Python com tipo de retorno \"void\" não retornou None"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:291 plpy_exec.c:317
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "função de gatilho retornou valor inesperado"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:292
 #, c-format
 msgid "Expected None or a string."
 msgstr "None ou uma cadeia de caracteres era esperado."
 
-#: plpy_exec.c:305
+#: plpy_exec.c:307
 #, c-format
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "função de gatilho PL/Python retornou \"MODIFY\" em um gatilho DELETE -- ignorado"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:318
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Era esperado None, \"OK\", \"SKIP\" ou \"MODIFY\"."
 
-#: plpy_exec.c:397
+#: plpy_exec.c:399
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() falhou ao definir argumentos"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:403
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() falhou ao definir argumentos"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:415
 #, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "função que retorna record foi chamada em um contexto que não pode aceitar tipo record"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:453
 #, c-format
 msgid "while creating return value"
 msgstr "ao criar valor de retorno"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:477
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "não pode criar novo dicionário ao construir argumentos do gatilho"
 
-#: plpy_exec.c:663
+#: plpy_exec.c:666
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] removido, não pode modificar registro"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:671
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] não é um dicionário"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:696
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "chave do dicionário TD[\"new\"] na posição %d não é uma cadeia de caracteres"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:703
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "chave \"%s\" encontrada em TD[\"new\"] não existe como uma coluna no registro do gatilho"
 
-#: plpy_exec.c:777
+#: plpy_exec.c:783
 #, c-format
 msgid "while modifying trigger row"
 msgstr "ao modificar registro de gatilho"
 
-#: plpy_exec.c:838
+#: plpy_exec.c:844
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "forçado a abortar subtransação que não foi concluída"
 
-#: plpy_main.c:93
+#: plpy_main.c:124
 #, c-format
 msgid "Python major version mismatch in session"
 msgstr "versão do Python não corresponde na sessão"
 
-#: plpy_main.c:94
+#: plpy_main.c:125
 #, c-format
 msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
 msgstr "Esta sessão utilizou Python versão %d, e agora está tentando utilizar Python versão %d."
 
-#: plpy_main.c:96
+#: plpy_main.c:127
 #, c-format
 msgid "Start a new session to use a different Python major version."
 msgstr "Inicie uma nova sessão para utilizar uma versão diferente do Python."
 
-#: plpy_main.c:111
+#: plpy_main.c:150
+#, c-format
+msgid "multiple Python libraries are present in session"
+msgstr "múltiplas bibliotecas do Python estão presentes na sessão"
+
+#: plpy_main.c:151
+#, c-format
+msgid "Only one Python major version can be used in one session."
+msgstr "Apenas uma versão do Python pode ser utilizada na sessão."
+
+#: plpy_main.c:167
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "erro não interceptado na inicialização"
 
-#: plpy_main.c:134
+#: plpy_main.c:190
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "não pôde importar módulo \"__main__\""
 
-#: plpy_main.c:139
+#: plpy_main.c:195
 #, c-format
 msgid "could not create globals"
 msgstr "não pôde criar globais"
 
-#: plpy_main.c:143
+#: plpy_main.c:199
 #, c-format
 msgid "could not initialize globals"
 msgstr "não pôde inicializar globais"
 
-#: plpy_main.c:347
+#: plpy_main.c:409
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "função PL/Python \"%s\""
 
-#: plpy_main.c:354
+#: plpy_main.c:416
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "bloco de código PL/Python anônimo"
@@ -234,41 +244,41 @@ msgstr "não pôde adicionar o módulo spiexceptions"
 msgid "could not create the base SPI exceptions"
 msgstr "não pôde criar as exceções base da SPI"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "não pôde gerar exceções da SPI"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:387
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "não pode desempacotar argumentos em plpy.elog"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:395
 msgid "could not parse error message in plpy.elog"
 msgstr "não pode analisar mensagem de erro em plpy.elog"
 
-#: plpy_procedure.c:200
+#: plpy_procedure.c:213
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "funções de gatilho só podem ser chamadas como gatilhos"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:218
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "funções PL/Python não podem retornar tipo %s"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:300
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "funções PL/Python não podem aceitar tipo %s"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:398
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "não pôde compilar função PL/Python \"%s\""
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:401
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "não pôde compilar bloco de código PL/Python anônimo"
@@ -288,27 +298,22 @@ msgstr "segundo argumento de plpy.prepare deve ser uma sequência"
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: nome do tipo na posição %d não é uma cadeia de caracteres"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare não suporta tipos compostos"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:182
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera uma consulta ou um plano"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:201
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute recebe uma sequência como segundo argumento"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:325
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan falhou: %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:367
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute falhou: %s"
@@ -333,87 +338,82 @@ msgstr "essa subtransação não foi iniciada"
 msgid "there is no subtransaction to exit from"
 msgstr "não há uma subtransação a ser concluída"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:302
 #, c-format
 msgid "could not create new dictionary"
 msgstr "não pôde criar novo dicionário"
 
-#: plpy_typeio.c:411
-#, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python não suporta conversão para matrizes de tipos row."
-
-#: plpy_typeio.c:540
+#: plpy_typeio.c:564
 #, c-format
 msgid "could not import a module for Decimal constructor"
 msgstr "não pôde importar módulo para construtor Decimal"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:568
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "nenhum atributo Decimal no módulo"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:574
 #, c-format
 msgid "conversion from numeric to Decimal failed"
 msgstr "conversão de numeric para Decimal falhou"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:649
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "não pode converter matriz multidimensional para lista Python"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:650
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python só suporta matrizes unidimensionais."
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:656
 #, c-format
 msgid "could not create new Python list"
 msgstr "não pôde criar nova lista Python"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:715
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "não pôde criar representação de bytes de um objeto Python"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:820
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "não pôde criar representação de cadeia de caracteres de um objeto Python"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:831
 #, c-format
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "não pôde converter objeto Python em cstring: representação de cadeia de caracteres Python parece conter bytes nulos"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:877
 #, c-format
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "valor de retorno da função do tipo matriz retorna tipo que não é uma sequência Python"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:992
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "chave \"%s\" não foi encontrada no mapeamento"
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:993
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Para retornar nulo em uma coluna, adicionar o valor None no mapeamento cuja chave é o nome da coluna."
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1044
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "tamanho da sequência retornada não combina com número de colunas no registro"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1155
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "atributo \"%s\" não existe no objeto Python"
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1156
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Para retornar nulo na coluna, deixe o objeto retornado ter um atributo cuja chave é o nome do coluna e o valor é None."
diff --git a/src/pl/plpython/po/ru.po b/src/pl/plpython/po/ru.po
index 11e7322c89a..49375ec669b 100644
--- a/src/pl/plpython/po/ru.po
+++ b/src/pl/plpython/po/ru.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-01-09 16:07+0000\n"
-"PO-Revision-Date: 2015-01-11 16:49+0300\n"
+"POT-Creation-Date: 2016-01-15 04:37+0000\n"
+"PO-Revision-Date: 2016-01-17 08:04+0300\n"
 "Last-Translator: Alexander Lakhin <[email protected]>\n"
-"Language-Team: Russian <[email protected]>\n"
+"Language-Team: Russian <[email protected]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: plpy_cursorobject.c:98
 #, c-format
@@ -34,12 +34,12 @@ msgstr "plpy.cursor ожидает запрос или план"
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor принимает в качестве второго аргумента последовательность"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:187 plpy_spi.c:217
 #, c-format
 msgid "could not execute plan"
 msgstr "нельзя выполнить план"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:190 plpy_spi.c:220
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -67,7 +67,7 @@ msgstr "выборка из закрытого курсора"
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "закрытие курсора в прерванной подтранзакции"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -107,17 +107,17 @@ msgstr "ошибка получения следующего элемента и
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "функция PL/Python с типом результата \"void\" вернула не None"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:291 plpy_exec.c:317
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "триггерная процедура вернула недопустимое значение"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:292
 #, c-format
 msgid "Expected None or a string."
 msgstr "Ожидалось None или строка."
 
-#: plpy_exec.c:305
+#: plpy_exec.c:307
 #, c-format
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
@@ -125,78 +125,78 @@ msgstr ""
 "триггерная функция PL/Python вернула \"MODIFY\" в триггере DELETE -- "
 "игнорируется"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:318
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Ожидалось None, \"OK\", \"SKIP\" или \"MODIFY\"."
 
-#: plpy_exec.c:397
+#: plpy_exec.c:399
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "ошибка в PyList_SetItem() при настройке аргументов"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:403
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "ошибка в PyDict_SetItemString() при настройке аргументов"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:415
 #, c-format
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "функция, возвращающая запись, вызвана в контексте, не допускающем этот тип"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:453
 #, c-format
 msgid "while creating return value"
 msgstr "при создании возвращаемого значения"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:477
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "не удалось создать словарь для передачи аргументов триггера"
 
-#: plpy_exec.c:663
+#: plpy_exec.c:666
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "элемент TD[\"new\"] удалён -- изменить строку нельзя"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:671
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] - не словарь"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:696
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "ключ словаря TD[\"new\"] с порядковым номером %d не является строкой"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:703
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
 "row"
 msgstr ""
-"ключу \"%s\", найденному в TD[\"new\"], не соответствует колонка в строке, "
+"ключу \"%s\", найденному в TD[\"new\"], не соответствует столбец в строке, "
 "обрабатываемой триггером"
 
-#: plpy_exec.c:777
+#: plpy_exec.c:783
 #, c-format
 msgid "while modifying trigger row"
 msgstr "при изменении строки в триггере"
 
-#: plpy_exec.c:838
+#: plpy_exec.c:844
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "принудительное прерывание незавершённой подтранзакции"
 
-#: plpy_main.c:93
+#: plpy_main.c:124
 #, c-format
 msgid "Python major version mismatch in session"
 msgstr "несовпадение базовой версии Python в сеансе"
 
-#: plpy_main.c:94
+#: plpy_main.c:125
 #, c-format
 msgid ""
 "This session has previously used Python major version %d, and it is now "
@@ -205,38 +205,48 @@ msgstr ""
 "В данном сеансе до этого использовался Python базовой версии %d, а сейчас "
 "планируется использовать Python версии %d."
 
-#: plpy_main.c:96
+#: plpy_main.c:127
 #, c-format
 msgid "Start a new session to use a different Python major version."
 msgstr ""
 "Чтобы переключиться на другую базовую версию Python, начните новый сеанс."
 
-#: plpy_main.c:111
+#: plpy_main.c:150
+#, c-format
+msgid "multiple Python libraries are present in session"
+msgstr "в сеансе представлено несколько библиотек Python"
+
+#: plpy_main.c:151
+#, c-format
+msgid "Only one Python major version can be used in one session."
+msgstr "В одном сеансе нельзя использовать Python разных старших версий."
+
+#: plpy_main.c:167
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "необработанная ошибка при инициализации"
 
-#: plpy_main.c:134
+#: plpy_main.c:190
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "не удалось импортировать модуль \"__main__\""
 
-#: plpy_main.c:139
+#: plpy_main.c:195
 #, c-format
 msgid "could not create globals"
 msgstr "не удалось создать глобальные данные"
 
-#: plpy_main.c:143
+#: plpy_main.c:199
 #, c-format
 msgid "could not initialize globals"
 msgstr "не удалось инициализировать глобальные данные"
 
-#: plpy_main.c:347
+#: plpy_main.c:409
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "функция PL/Python \"%s\""
 
-#: plpy_main.c:354
+#: plpy_main.c:416
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "анонимный блок кода PL/Python"
@@ -261,41 +271,41 @@ msgstr "не удалось добавить модуль spiexceptions"
 msgid "could not create the base SPI exceptions"
 msgstr "не удалось создать базовые объекты исключений SPI"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "не удалось сгенерировать исключения SPI"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:387
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "не удалось распаковать аргументы в plpy.elog"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:395
 msgid "could not parse error message in plpy.elog"
 msgstr "не удалось разобрать сообщение об ошибке в plpy.elog"
 
-#: plpy_procedure.c:200
+#: plpy_procedure.c:213
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызываться только в триггерах"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:218
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "функции PL/Python не могут возвращать тип %s"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:300
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "функции PL/Python не могут принимать тип %s"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:398
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "не удалось скомпилировать функцию PL/Python \"%s\""
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:401
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "не удалось скомпилировать анонимный блок кода PL/Python"
@@ -315,27 +325,22 @@ msgstr "вторым аргументом plpy.prepare должна быть п�
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: имя типа с порядковым номером %d не является строкой"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare не поддерживает составные типы"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:182
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute ожидает запрос или план"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:201
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute принимает в качестве второго аргумента последовательность"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:325
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "ошибка в SPI_execute_plan: %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:367
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "ошибка в SPI_execute: %s"
@@ -360,57 +365,52 @@ msgstr "эта подтранзакция ещё не начата"
 msgid "there is no subtransaction to exit from"
 msgstr "нет подтранзакции, которую нужно закончить"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:302
 #, c-format
 msgid "could not create new dictionary"
 msgstr "не удалось создать словарь"
 
-#: plpy_typeio.c:411
-#, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python не поддерживает преобразование в массивы кортежей."
-
-#: plpy_typeio.c:540
+#: plpy_typeio.c:564
 #, c-format
 msgid "could not import a module for Decimal constructor"
 msgstr "не удалось импортировать модуль для конструктора Decimal"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:568
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "в модуле нет атрибута Decimal"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:574
 #, c-format
 msgid "conversion from numeric to Decimal failed"
 msgstr "не удалось преобразовать numeric в Decimal"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:649
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "преобразовать многомерный массив в список Python нельзя"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:650
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python поддерживает только одномерные массивы."
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:656
 #, c-format
 msgid "could not create new Python list"
 msgstr "не удалось создать список Python"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:715
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "не удалось создать байтовое представление объекта Python"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:820
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "не удалось создать строковое представление объекта Python"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:831
 #, c-format
 msgid ""
 "could not convert Python object into cstring: Python string representation "
@@ -419,7 +419,7 @@ msgstr ""
 "не удалось преобразовать объект Python в cstring: похоже, представление "
 "строки Python содержит нулевые байты"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:877
 #, c-format
 msgid ""
 "return value of function with array return type is not a Python sequence"
@@ -427,38 +427,38 @@ msgstr ""
 "возвращаемое значение функции с результатом-массивом не является "
 "последовательностью"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:992
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "ключ \"%s\" не найден в сопоставлении"
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:993
 #, c-format
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
 msgstr ""
-"Чтобы присвоить колонке NULL, добавьте в сопоставление значение None с "
-"ключом-именем колонки."
+"Чтобы присвоить столбцу NULL, добавьте в сопоставление значение None с "
+"ключом-именем столбца."
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1044
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
-msgstr "длина возвращённой последовательности не равна числу колонок в строке"
+msgstr "длина возвращённой последовательности не равна числу столбцов в строке"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1155
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "в объекте Python не существует атрибут \"%s\""
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1156
 #, c-format
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
 msgstr ""
-"Чтобы присвоить колонке NULL, присвойте возвращаемому значению атрибут с "
-"именем колонки и значением None."
+"Чтобы присвоить столбцу NULL, присвойте возвращаемому значению атрибут с "
+"именем столбца и значением None."
 
 #: plpy_util.c:72
 #, c-format
@@ -470,6 +470,12 @@ msgstr "не удалось преобразовать объект Python Unico
 msgid "could not extract bytes from encoded string"
 msgstr "не удалось извлечь байты из кодированной строки"
 
+#~ msgid "plpy.prepare does not support composite types"
+#~ msgstr "plpy.prepare не поддерживает составные типы"
+
+#~ msgid "PL/Python does not support conversion to arrays of row types."
+#~ msgstr "PL/Python не поддерживает преобразование в массивы кортежей."
+
 #~ msgid "could not initialize plpy"
 #~ msgstr "не удалось инициализировать plpy"
 
diff --git a/src/pl/plpython/po/zh_CN.po b/src/pl/plpython/po/zh_CN.po
index e626ac2e314..df265067f1d 100644
--- a/src/pl/plpython/po/zh_CN.po
+++ b/src/pl/plpython/po/zh_CN.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2014-11-22 21:07+0000\n"
-"PO-Revision-Date: 2014-11-28 15:52+0800\n"
-"Last-Translator: Xiong He <[email protected]>\n"
+"POT-Creation-Date: 2015-11-26 18:37+0000\n"
+"PO-Revision-Date: 2015-12-02 14:49+0800\n"
+"Last-Translator: Yuwei Peng <[email protected]>\n"
 "Language-Team: Weibin <[email protected]>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: plpy_cursorobject.c:98
 #, c-format
@@ -28,12 +28,12 @@ msgstr "plpy.cursor期望一个查询或一个计划"
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor将一个序列作为它的第二个参数"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:223
+#: plpy_cursorobject.c:187 plpy_spi.c:217
 #, c-format
 msgid "could not execute plan"
 msgstr "无法执行计划"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:226
+#: plpy_cursorobject.c:190 plpy_spi.c:220
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -61,7 +61,7 @@ msgstr "从关闭的游标里获取结果"
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "在终止的子事务里关闭一个游标"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -73,9 +73,12 @@ msgstr "不支持集合函数返回模式"
 
 #: plpy_exec.c:92
 #, c-format
+#| msgid ""
+#| "PL/Python set-returning functions only support returning only value per "
+#| "call."
 msgid ""
-"PL/Python set-returning functions only support returning only value per call."
-msgstr "PL/Python集合返回函数只支持在每次调用时返回值."
+"PL/Python set-returning functions only support returning one value per call."
+msgstr "PL/Python集合返回函数只支持在每次调用时返回一个值。"
 
 #: plpy_exec.c:104
 #, c-format
@@ -97,81 +100,81 @@ msgstr "当从迭代器中取回下一个成员时出现错误"
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "返回类型为\"void\"的PL/Python函数不返回None"
 
-#: plpy_exec.c:289 plpy_exec.c:315
+#: plpy_exec.c:291 plpy_exec.c:317
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "在触发器存储过程出现非期望的返回值"
 
-#: plpy_exec.c:290
+#: plpy_exec.c:292
 #, c-format
 msgid "Expected None or a string."
 msgstr "期望空值或一个字符串"
 
-#: plpy_exec.c:305
+#: plpy_exec.c:307
 #, c-format
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "在DELETE触发器中的PL/Python 触发器函数返回 \"MODIFY\"  -- 忽略"
 
-#: plpy_exec.c:316
+#: plpy_exec.c:318
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "期望None, \"OK\", \"SKIP\", 或\"MODIFY\""
 
-#: plpy_exec.c:397
+#: plpy_exec.c:399
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "当设置参数的同时, 执行PyList_SetItem()失败"
 
-#: plpy_exec.c:401
+#: plpy_exec.c:403
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "当设置参数的同时, 执行PyDict_SetItemString()失败"
 
-#: plpy_exec.c:413
+#: plpy_exec.c:415
 #, c-format
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr "返回值类型是记录的函数在不接受使用记录类型的环境中调用"
 
-#: plpy_exec.c:451
+#: plpy_exec.c:453
 #, c-format
 msgid "while creating return value"
 msgstr "同时在创建返回值"
 
-#: plpy_exec.c:475
+#: plpy_exec.c:477
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "在构建触发器参数的同时无法创建新的字典."
 
-#: plpy_exec.c:663
+#: plpy_exec.c:666
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] 已删除，无法修改记录"
 
-#: plpy_exec.c:667
+#: plpy_exec.c:671
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"]不是一个字典"
 
-#: plpy_exec.c:691
+#: plpy_exec.c:696
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "在顺序位置%d的TD[\"new\"]字典键值不是字符串"
 
-#: plpy_exec.c:697
+#: plpy_exec.c:703
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
 "row"
 msgstr "在 TD[\"new\"]中找到的键 \"%s\"在正在触发的记录中不是作为列而存在."
 
-#: plpy_exec.c:777
+#: plpy_exec.c:783
 #, c-format
 msgid "while modifying trigger row"
 msgstr "同时正在修改触发器记录"
 
-#: plpy_exec.c:838
+#: plpy_exec.c:844
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "强行终止一个还未退出的子事务"
@@ -214,12 +217,12 @@ msgstr "无法创建全局变量"
 msgid "could not initialize globals"
 msgstr "无法初始化全局变量"
 
-#: plpy_main.c:347
+#: plpy_main.c:348
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "PL/Python函数\"%s\""
 
-#: plpy_main.c:354
+#: plpy_main.c:355
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "PL/Python匿名代码块"
@@ -245,41 +248,41 @@ msgstr "无法添加spiexceptions模块 "
 msgid "could not create the base SPI exceptions"
 msgstr "无法创建基本的SPI异常"
 
-#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "无法产生SPI异常"
 
-#: plpy_plpymodule.c:388
+#: plpy_plpymodule.c:387
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "无法解析plpy.elog中的参数"
 
-#: plpy_plpymodule.c:396
+#: plpy_plpymodule.c:395
 msgid "could not parse error message in plpy.elog"
 msgstr "无法解析在plpy.elog中的错误消息"
 
-#: plpy_procedure.c:200
+#: plpy_procedure.c:213
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "触发器函数只能以触发器的形式调用"
 
-#: plpy_procedure.c:205 plpy_typeio.c:409
+#: plpy_procedure.c:218
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python函数不能返回类型%s"
 
-#: plpy_procedure.c:287
+#: plpy_procedure.c:300
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python函数不能接受类型%s"
 
-#: plpy_procedure.c:383
+#: plpy_procedure.c:398
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "无法编译PL/Python函数\"%s\""
 
-#: plpy_procedure.c:386
+#: plpy_procedure.c:401
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "无法编译PL/Python中的匿名代码块"
@@ -299,27 +302,22 @@ msgstr "plpy.prepare的第二个参数必须是一个序列"
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: 在顺序位置%d的类型名称不是string"
 
-#: plpy_spi.c:138
-#, c-format
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare不支持使用组合类型"
-
-#: plpy_spi.c:188
+#: plpy_spi.c:182
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute期望一个查询或一个计划"
 
-#: plpy_spi.c:207
+#: plpy_spi.c:201
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute将一个序列作为它的第二个参数"
 
-#: plpy_spi.c:331
+#: plpy_spi.c:325
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "执行SPI_execute_plan失败: %s"
 
-#: plpy_spi.c:373
+#: plpy_spi.c:367
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute执行失败: %s"
@@ -344,94 +342,87 @@ msgstr "该子事务仍没有进入"
 msgid "there is no subtransaction to exit from"
 msgstr "没有子事务可以退出"
 
-#: plpy_typeio.c:294
+#: plpy_typeio.c:302
 #, c-format
 msgid "could not create new dictionary"
 msgstr "无法创建新的字典"
 
-#: plpy_typeio.c:411
+#: plpy_typeio.c:564
 #, c-format
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python不支持对行类型数组的转换。"
-
-#: plpy_typeio.c:540
-#, c-format
-#| msgid "could not import \"plpy\" module"
 msgid "could not import a module for Decimal constructor"
 msgstr "无法为十进制构造函数导入模块"
 
-#: plpy_typeio.c:544
+#: plpy_typeio.c:568
 #, c-format
 msgid "no Decimal attribute in module"
 msgstr "模块中没有小数位属性"
 
-#: plpy_typeio.c:550
+#: plpy_typeio.c:574
 #, c-format
-#| msgid "conversion from wchar_t to server encoding failed: %m"
 msgid "conversion from numeric to Decimal failed"
 msgstr "由numeric数值到Decimal小数转换失败"
 
-#: plpy_typeio.c:619
+#: plpy_typeio.c:649
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "无法将多维数组转换为Python列表"
 
-#: plpy_typeio.c:620
+#: plpy_typeio.c:650
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python只支持使用一维数组"
 
-#: plpy_typeio.c:626
+#: plpy_typeio.c:656
 #, c-format
 msgid "could not create new Python list"
 msgstr "无法创建新的Python列表"
 
-#: plpy_typeio.c:685
+#: plpy_typeio.c:715
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "无法创建Python对象的字节表达式"
 
-#: plpy_typeio.c:777
+#: plpy_typeio.c:820
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "无法创建Python对象的字符串表达式"
 
-#: plpy_typeio.c:788
+#: plpy_typeio.c:831
 #, c-format
 msgid ""
 "could not convert Python object into cstring: Python string representation "
 "appears to contain null bytes"
 msgstr "无法将Python对象转换为cstring: Python字符串表达式可能包含空字节"
 
-#: plpy_typeio.c:823
+#: plpy_typeio.c:877
 #, c-format
 msgid ""
 "return value of function with array return type is not a Python sequence"
 msgstr "带有数组返回类型的函数返回值不是一个Python序列"
 
-#: plpy_typeio.c:930
+#: plpy_typeio.c:992
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "在映射中没有找到键\"%s\""
 
-#: plpy_typeio.c:931
+#: plpy_typeio.c:993
 #, c-format
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
 msgstr "为了在一列中返回空值, 需要在列的后面对带有已命名键的映射添加值None"
 
-#: plpy_typeio.c:979
+#: plpy_typeio.c:1044
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "所返回序列的长度与在记录中列的数量不匹配"
 
-#: plpy_typeio.c:1087
+#: plpy_typeio.c:1155
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "在Python对象中不存在属性\"%s\""
 
-#: plpy_typeio.c:1088
+#: plpy_typeio.c:1156
 #, c-format
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
@@ -449,51 +440,57 @@ msgstr "无法将Python中以Unicode编码的对象转换为PostgreSQL服务器�
 msgid "could not extract bytes from encoded string"
 msgstr "无法从已编码字符串里提取相应字节码值"
 
-#~ msgid "PyCObject_AsVoidPtr() failed"
-#~ msgstr "执行PyCObject_AsVoidPtr()失败"
+#~ msgid "unrecognized error in PLy_spi_execute_fetch_result"
+#~ msgstr "在PLy_spi_execute_fetch_result中出现无法识别的错误"
 
-#~ msgid "PyCObject_FromVoidPtr() failed"
-#~ msgstr "执行PyCObject_FromVoidPtr()失败"
+#~ msgid "PL/Python function \"%s\" failed"
+#~ msgstr "PL/Python函数 \"%s\" 执行失败"
 
-#~ msgid "transaction aborted"
-#~ msgstr "事务终止"
+#~ msgid ""
+#~ "could not create string representation of Python object in PL/Python "
+#~ "function \"%s\" while creating return value"
+#~ msgstr ""
+#~ "在创建返回值时, 无法计算在PL/Python函数\"%s\"中Python对象的字符串表达式"
 
-#~ msgid "invalid arguments for plpy.prepare"
-#~ msgstr " plpy.prepare的无效参数"
+#~ msgid ""
+#~ "could not compute string representation of Python object in PL/Python "
+#~ "function \"%s\" while modifying trigger row"
+#~ msgstr ""
+#~ "在修改触发器记录的同时无法计算在PL/Python函数\"%s\"中Python对象的字符串表"
+#~ "达式"
 
-#~ msgid "unrecognized error in PLy_spi_prepare"
-#~ msgstr "在PLy_spi_prepare中无法识别的错误"
+#~ msgid "out of memory"
+#~ msgstr "内存用尽"
 
-#~ msgid "unrecognized error in PLy_spi_execute_plan"
-#~ msgstr "在PLy_spi_execute_plan中出现无法识别的错误"
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "无法创建存储过程缓存"
 
 #~ msgid "unrecognized error in PLy_spi_execute_query"
 #~ msgstr "在PLy_spi_execute_query中出现无法识别的错误"
 
-#~ msgid "could not create procedure cache"
-#~ msgstr "无法创建存储过程缓存"
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "在PLy_spi_execute_plan中出现无法识别的错误"
 
-#~ msgid "PL/Python: %s"
-#~ msgstr "PL/Python: %s"
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "在PLy_spi_prepare中无法识别的错误"
 
-#~ msgid "out of memory"
-#~ msgstr "内存用尽"
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr " plpy.prepare的无效参数"
 
-#~ msgid ""
-#~ "could not compute string representation of Python object in PL/Python "
-#~ "function \"%s\" while modifying trigger row"
-#~ msgstr ""
-#~ "在修改触发器记录的同时无法计算在PL/Python函数\"%s\"中Python对象的字符串表"
-#~ "达式"
+#~ msgid "transaction aborted"
+#~ msgstr "事务终止"
 
-#~ msgid ""
-#~ "could not create string representation of Python object in PL/Python "
-#~ "function \"%s\" while creating return value"
-#~ msgstr ""
-#~ "在创建返回值时, 无法计算在PL/Python函数\"%s\"中Python对象的字符串表达式"
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "执行PyCObject_FromVoidPtr()失败"
 
-#~ msgid "PL/Python function \"%s\" failed"
-#~ msgstr "PL/Python函数 \"%s\" 执行失败"
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "执行PyCObject_AsVoidPtr()失败"
 
-#~ msgid "unrecognized error in PLy_spi_execute_fetch_result"
-#~ msgstr "在PLy_spi_execute_fetch_result中出现无法识别的错误"
+#~ msgid "PL/Python does not support conversion to arrays of row types."
+#~ msgstr "PL/Python不支持对行类型数组的转换。"
+
+#~ msgid "plpy.prepare does not support composite types"
+#~ msgstr "plpy.prepare不支持使用组合类型"