Translation updates

11 files changed, 3660 insertions, 1590 deletions

diff --git a/src/pl/plpython/po/cs.po b/src/pl/plpython/po/cs.po
new file mode 100644
index 00000000000..b2306f14669
--- /dev/null
+++ b/src/pl/plpython/po/cs.po
@@ -0,0 +1,460 @@
+# LANGUAGE message translation file for plpython
+# Copyright (C) 2012 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2012-09-18 16:39+0000\n"
+"PO-Revision-Date: 2012-09-19 01:51+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <[email protected]>\n"
+"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: plpy_cursorobject.c:98
+#, c-format
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor očekával dotaz nebo plán"
+
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor jako druhý argument očekává sekvenci"
+
+#: plpy_cursorobject.c:187 plpy_spi.c:222
+#, c-format
+msgid "could not execute plan"
+msgstr "nelze spustit plán"
+
+#: plpy_cursorobject.c:190 plpy_spi.c:225
+#, c-format
+msgid "Expected sequence of %d argument, got %d: %s"
+msgid_plural "Expected sequence of %d arguments, got %d: %s"
+msgstr[0] "Očekávána posloupnost %d argument, předáno %d: %s"
+msgstr[1] "Očekávána posloupnost %d argumentů, předáno %d: %s"
+msgstr[2] "Očekávána posloupnost %d argumentů, předáno %d: %s"
+
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "iterování uzavřeného kurzoru"
+
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "iterování kurzoru ve zrušené subtransakci"
+
+#: plpy_cursorobject.c:407
+#, c-format
+msgid "fetch from a closed cursor"
+msgstr "fetch ze zavřeného kurzoru"
+
+#: plpy_cursorobject.c:486
+#, c-format
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "uzavření kurzoru ve zrušené subtransakci"
+
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plpy_exec.c:90
+#, c-format
+msgid "unsupported set function return mode"
+msgstr "nepodporovaný návratový mód funkce vracející tabulku"
+
+#: plpy_exec.c:91
+#, c-format
+msgid ""
+"PL/Python set-returning functions only support returning only value per call."
+msgstr ""
+"PL/Python funkce vracející tabulku podporují pouze vracení hodnoty pro každé "
+"volání."
+
+#: plpy_exec.c:103
+#, c-format
+msgid "returned object cannot be iterated"
+msgstr "přes vrácený objekt nelze iterovat"
+
+#: plpy_exec.c:104
+#, c-format
+msgid "PL/Python set-returning functions must return an iterable object."
+msgstr "PL/Python funkce vracející tabulku musí vracet iterovatelný objekt."
+
+#: plpy_exec.c:129
+#, c-format
+msgid "error fetching next item from iterator"
+msgstr "chyba při načítání další položky z iterátoru"
+
+#: plpy_exec.c:164
+#, c-format
+msgid "PL/Python function with return type \"void\" did not return None"
+msgstr ""
+"PL/Python funkce s návratovým typem \"void\" nevrátila hodnotu \"None\""
+
+#: plpy_exec.c:288 plpy_exec.c:314
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "neočekávaná návratová hodnota z trigger procedury"
+
+#: plpy_exec.c:289
+#, c-format
+msgid "Expected None or a string."
+msgstr "Očekáváno None nebo řetězec."
+
+#: plpy_exec.c:304
+#, c-format
+msgid ""
+"PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
+msgstr ""
+"PL/Python trigger funkce vrátila \"MODIFY\" v DELETE triggeru -- ignorováno"
+
+#: plpy_exec.c:315
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Očekáváno None, \"OK\", \"SKIP\", nebo \"MODIFY\"."
+
+#: plpy_exec.c:396
+#, c-format
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "volání PyList_SetItem() selhalo během vytváření argumentů"
+
+#: plpy_exec.c:400
+#, c-format
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "volání PyDict_SetItemString() selhalo během přípravy argumentů"
+
+#: plpy_exec.c:412
+#, c-format
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"funkce vracející záznam byla zavolána z kontextu, který neumožňuje přijetí "
+"záznamu"
+
+#: plpy_exec.c:450
+#, c-format
+msgid "while creating return value"
+msgstr "během vytváření návratové hodnoty"
+
+#: plpy_exec.c:474
+#, c-format
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "během vytváření argumentů triggeru nelze vytvářet nový slovník"
+
+#: plpy_exec.c:664
+#, c-format
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] smazáno, nelze modifikovat řádek"
+
+#: plpy_exec.c:667
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] není slovník"
+
+#: plpy_exec.c:691
+#, c-format
+msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
+msgstr "TD[\"new\"] klíč slovníku na pozici %d není řetězec"
+
+#: plpy_exec.c:697
+#, c-format
+msgid ""
+"key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
+"row"
+msgstr ""
+"klíč \"%s\" nalezený v TD[\"new\"] neexistuje jako sloupec v triggering řádku"
+
+#: plpy_exec.c:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "během modifikace řádku triggeru"
+
+#: plpy_exec.c:839
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "vynucené ukončení subtransakce která nebyla dokončena"
+
+#: plpy_main.c:100
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "Rozpor mezi hlavními verzemi Pythonu v session"
+
+#: plpy_main.c:101
+#, c-format
+msgid ""
+"This session has previously used Python major version %d, and it is now "
+"attempting to use Python major version %d."
+msgstr ""
+"Tato session již dříve používala Python s hlavní verzí %d, a nyní se pokouší "
+"použít Python s hlavní verzí %d."
+
+#: plpy_main.c:103
+#, c-format
+msgid "Start a new session to use a different Python major version."
+msgstr "Spouští se nová session pro použití jiné hlavní verze Pythonu."
+
+#: plpy_main.c:118
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "nezachycená chyba v inicializaci"
+
+#: plpy_main.c:141
+#, c-format
+msgid "could not import \"__main__\" module"
+msgstr "nepodařilo se naimportovat \"__main__\" modul"
+
+#: plpy_main.c:146
+#, c-format
+msgid "could not create globals"
+msgstr "nepodařilo se vytvořit globals"
+
+#: plpy_main.c:150
+#, c-format
+msgid "could not initialize globals"
+msgstr "nepodařilo se inicializovat globální proměnné (globals)"
+
+#: plpy_main.c:347
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "PL/Python funkce \"%s\""
+
+#: plpy_main.c:354
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "PL/Python anonymní blok kódu"
+
+#: plpy_planobject.c:126
+#, c-format
+msgid "plan.status takes no arguments"
+msgstr "plan.status nepřijímá žádné argumenty"
+
+#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#, c-format
+#| msgid "could not import \"__main__\" module"
+msgid "could not import \"plpy\" module"
+msgstr "nepodařilo se naimportovat \"plpy\" modul"
+
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "nepodařilo se naimportovat \"__main__\" modul"
+
+#: plpy_plpymodule.c:217
+#, c-format
+msgid "could not create the base SPI exceptions"
+msgstr "nepodařilo se vygenerovat základní SPI výjimky"
+
+#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "nepodařilo se vygenerovat SPI výjimky"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "nepodařilo se rozbalit argumenty v plpy.elog"
+
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "nepodařilo se naparsovat chybovou hlášku v plpy.elog"
+
+#: plpy_procedure.c:194
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr ""
+"funkce pro obsluhu triggerů mohou být volané pouze prostřednictvím triggerů"
+
+#: plpy_procedure.c:199 plpy_typeio.c:406
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "PL/Python funkce nemohou vracet typ %s"
+
+#: plpy_procedure.c:281
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "PL/Python funkce nepodporují typ %s"
+
+#: plpy_procedure.c:377
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "nelze zkompiloval PL/Python funkci \"%s\""
+
+#: plpy_procedure.c:380
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "nelze zkompiloval anonymní PL/Python blok"
+
+#: plpy_resultobject.c:145 plpy_resultobject.c:165 plpy_resultobject.c:185
+#, c-format
+msgid "command did not produce a result set"
+msgstr "příkaz nevrátil žádný výsledek"
+
+#: plpy_spi.c:56
+#, c-format
+msgid "second argument of plpy.prepare must be a sequence"
+msgstr "druhý argument pro plpy.prepare musí být posloupnost"
+
+#: plpy_spi.c:105
+#, c-format
+msgid "plpy.prepare: type name at ordinal position %d is not a string"
+msgstr "plpy.prepare: název typu na pozici %d není řetězec"
+
+#: plpy_spi.c:137
+#, c-format
+msgid "plpy.prepare does not support composite types"
+msgstr "plpy.prepare nepodporuje složené typy"
+
+#: plpy_spi.c:187
+#, c-format
+msgid "plpy.execute expected a query or a plan"
+msgstr "plpy.execute očekávala dotaz nebo plán"
+
+#: plpy_spi.c:206
+#, c-format
+msgid "plpy.execute takes a sequence as its second argument"
+msgstr "plpy.execute jako druhý argument očekává posloupnost"
+
+#: plpy_spi.c:330
+#, c-format
+msgid "SPI_execute_plan failed: %s"
+msgstr "volání SPI_execute_plan selhalo: %s"
+
+#: plpy_spi.c:372
+#, c-format
+msgid "SPI_execute failed: %s"
+msgstr "volání SPI_execute selhalo: %s"
+
+#: plpy_spi.c:439
+#, c-format
+msgid "unrecognized error in PLy_spi_execute_fetch_result"
+msgstr "nerozpoznaná chyba v PLy_spi_execute_fetch_result"
+
+#: plpy_subxactobject.c:122
+#, c-format
+msgid "this subtransaction has already been entered"
+msgstr "tato subtransakce již byla zahájena"
+
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#, c-format
+msgid "this subtransaction has already been exited"
+msgstr "tato subtransakce již byla dokončena"
+
+#: plpy_subxactobject.c:174
+#, c-format
+msgid "this subtransaction has not been entered"
+msgstr "tato subtransakce nebyla zahájena"
+
+#: plpy_subxactobject.c:186
+#, c-format
+msgid "there is no subtransaction to exit from"
+msgstr "nenalezena subtransakce k ukončení"
+
+#: plpy_typeio.c:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "nepodařilo se vytvořit nový slovník"
+
+#: plpy_typeio.c:408
+#, c-format
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr "PL/Python nepodporuje konverzi na pole řádkových typů."
+
+#: plpy_typeio.c:584
+#, c-format
+msgid "cannot convert multidimensional array to Python list"
+msgstr "vícerozměrné pole nelze převést na Python seznam (list)"
+
+#: plpy_typeio.c:585
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python podporuje pouze jednorozměrná pole."
+
+#: plpy_typeio.c:591
+#, c-format
+msgid "could not create new Python list"
+msgstr "nelze vytvořit nový Python seznam"
+
+#: plpy_typeio.c:650
+#, c-format
+msgid "could not create bytes representation of Python object"
+msgstr "nepodařilo se vytvořit bytovou reprezentaci Python objektu"
+
+#: plpy_typeio.c:742
+#, c-format
+msgid "could not create string representation of Python object"
+msgstr "nepodařilo se vytvořit řetězcovou reprezentaci Python objektu"
+
+#: plpy_typeio.c:753
+#, c-format
+msgid ""
+"could not convert Python object into cstring: Python string representation "
+"appears to contain null bytes"
+msgstr ""
+"nepodařilo se převést Python objekt na cstring: zdá se že řetězcová "
+"reprezentace Python objektu obsahuje null byty"
+
+#: plpy_typeio.c:787
+#, c-format
+msgid ""
+"return value of function with array return type is not a Python sequence"
+msgstr ""
+"návratová hodnota funkce s návratovým typem pole není Python posloupnost "
+"(sequence)"
+
+#: plpy_typeio.c:886
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "klíč \"%s\" nenalezen v mapování"
+
+#: plpy_typeio.c:887
+#, c-format
+msgid ""
+"To return null in a column, add the value None to the mapping with the key "
+"named after the column."
+msgstr ""
+"Pro vrácení hodnoty null ve sloupci, přidejte do mapování hodnotu None s "
+"klíčem pojmenovaným jako sloupec."
+
+#: plpy_typeio.c:935
+#, c-format
+msgid "length of returned sequence did not match number of columns in row"
+msgstr "délka vrácené posloupnosti neodpovídala počtu sloupců v řádku"
+
+#: plpy_typeio.c:1043
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "atribut \"%s\" v Python objektu neexistuje"
+
+#: plpy_typeio.c:1044
+#, c-format
+msgid ""
+"To return null in a column, let the returned object have an attribute named "
+"after column with value None."
+msgstr ""
+"Pro vrácení null ve sloupci, nechť vracený objekt má atribut pojmenovaný po "
+"sloupcis hodnotou None."
+
+#: plpy_util.c:70
+#, c-format
+#| msgid ""
+#| "could not convert Python Unicode object to PostgreSQL server encoding"
+msgid "could not convert Python Unicode object to bytes"
+msgstr "nelze převést Python Unicode objekt na byty"
+
+#: plpy_util.c:75
+#, c-format
+#| msgid "could not generate SPI exceptions"
+msgid "could not extract bytes from encoded string"
+msgstr "nepodařilo se získat byty z kódovaného řetězce"
+
+#~ msgid "could not initialize plpy"
+#~ msgstr "nepodařilo se inicializovat plpy"
diff --git a/src/pl/plpython/po/de.po b/src/pl/plpython/po/de.po
index ebda63677ab..b9b2d99448a 100644
--- a/src/pl/plpython/po/de.po
+++ b/src/pl/plpython/po/de.po
@@ -1,18 +1,16 @@
 # German message translation file for plpython
-# Copyright (C) 2009 - 2011 PostgreSQL Global Development Group
+# Copyright (C) 2009 - 2013 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Peter Eisentraut <[email protected]>, 2009 - 2011.
+# Peter Eisentraut <[email protected]>, 2009 - 2013.
 #
-# pgtranslation Id: plpython.po,v 1.8 2011/05/21 21:37:56 petere Exp $
-#
-# Use these quotes: »%s«
+# Use these quotes: „%s“
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.1\n"
+"Project-Id-Version: PostgreSQL 9.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2011-05-20 22:39+0000\n"
-"PO-Revision-Date: 2011-05-22 00:22+0300\n"
+"POT-Creation-Date: 2012-08-22 22:09+0000\n"
+"PO-Revision-Date: 2013-03-04 21:46-0500\n"
 "Last-Translator: Peter Eisentraut <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "Language: de\n"
@@ -21,322 +19,403 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plpython.c:475
+#: plpy_cursorobject.c:98
 #, c-format
-msgid "PL/Python function \"%s\""
-msgstr "PL/Python-Funktion »%s«"
-
-#: plpython.c:482
-msgid "PL/Python anonymous code block"
-msgstr "anonymer PL/Python-Codeblock"
-
-#: plpython.c:489
-msgid "while modifying trigger row"
-msgstr "beim Ändern der Triggerzeile"
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor hat eine Anfrage oder einen Plan erwartet"
 
-#: plpython.c:496
-msgid "while creating return value"
-msgstr "beim Erzeugen des Rückgabewerts"
-
-#: plpython.c:707 plpython.c:733
-msgid "unexpected return value from trigger procedure"
-msgstr "unerwarteter Rückgabewert von Triggerprozedur"
-
-#: plpython.c:708
-msgid "Expected None or a string."
-msgstr "Erwartete None oder eine Zeichenkette."
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor nimmt eine Sequenz als zweites Argument"
 
-#: plpython.c:723
-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_cursorobject.c:187 plpy_spi.c:222
+#, c-format
+msgid "could not execute plan"
+msgstr "konnte Plan nicht ausführen"
 
-#: plpython.c:734
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "Erwartete None, \"OK\", \"SKIP\" oder \"MODIFY\"."
+#: plpy_cursorobject.c:190 plpy_spi.c:225
+#, 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"
 
-#: plpython.c:786
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] wurde gelöscht, kann Zeile nicht ändern"
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "Iteration mit einem geschlossenen Cursor"
 
-#: plpython.c:789
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] ist kein Dictionary"
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "Iteration mit einem Cursor in einer abgebrochenen Transaktionen"
 
-#: plpython.c:813
+#: plpy_cursorobject.c:407
 #, 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"
+msgid "fetch from a closed cursor"
+msgstr "Lesen aus einem geschlossenen Cursor"
 
-#: plpython.c:819
+#: plpy_cursorobject.c:486
 #, 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"
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "Schließen eines Cursors in einer abgebrochenen Subtransaktion"
 
-#: plpython.c:915
-msgid "could not create new dictionary while building trigger arguments"
-msgstr ""
-"konnte neues Dictionary nicht erzeugen, beim Aufbauen der Triggerargumente"
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: plpython.c:1122
+#: plpy_exec.c:90
+#, c-format
 msgid "unsupported set function return mode"
 msgstr "nicht unterstützter Rückgabemodus für Funktion mit Mengenergebnis"
 
-#: plpython.c:1123
-msgid ""
-"PL/Python set-returning functions only support returning only 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:91
+#, c-format
+msgid "PL/Python set-returning functions only support returning only value per call."
+msgstr "PL/Python unterstützt für Funktionen mit Mengenergebnis nur das Zurückgeben von einem Wert pro Aufruf."
 
-#: plpython.c:1135
+#: plpy_exec.c:103
+#, c-format
 msgid "returned object cannot be iterated"
 msgstr "zurückgegebenes Objekt kann nicht iteriert werden"
 
-#: plpython.c:1136
+#: plpy_exec.c:104
+#, 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."
+msgstr "PL/Python-Funktionen mit Mengenergebnis müssen ein iterierbares Objekt zurückgeben."
 
-#: plpython.c:1161
+#: plpy_exec.c:129
+#, c-format
 msgid "error fetching next item from iterator"
 msgstr "Fehler beim Auslesen des nächsten Elements vom Iterator"
 
-#: plpython.c:1196
+#: plpy_exec.c:164
+#, 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"
+msgstr "PL/Python-Funktion mit Rückgabetyp „void“ hat nicht None zurückgegeben"
 
-#: plpython.c:1287
-msgid "forcibly aborting a subtransaction that has not been exited"
-msgstr "Abbruch einer Subtransaktion, die nicht beendet wurde, wird erzwungen"
+#: plpy_exec.c:288 plpy_exec.c:314
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "unerwarteter Rückgabewert von Triggerprozedur"
+
+#: plpy_exec.c:289
+#, c-format
+msgid "Expected None or a string."
+msgstr "Erwartete None oder eine Zeichenkette."
 
-#: plpython.c:1403
+#: plpy_exec.c:304
+#, 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:315
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Erwartete None, \"OK\", \"SKIP\" oder \"MODIFY\"."
+
+#: plpy_exec.c:396
+#, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() fehlgeschlagen, beim Einrichten der Argumente"
 
-#: plpython.c:1407
+#: plpy_exec.c:400
+#, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() fehlgeschlagen, beim Einrichten der Argumente"
 
-#: plpython.c:1419
-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"
-
-#: plpython.c:1633
-msgid "trigger functions can only be called as triggers"
-msgstr "Triggerfunktionen können nur als Trigger aufgerufen werden"
+#: plpy_exec.c:412
+#, 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"
 
-#: plpython.c:1638 plpython.c:2089
+#: plpy_exec.c:450
 #, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "PL/Python-Funktionen können keinen Rückgabetyp %s haben"
+msgid "while creating return value"
+msgstr "beim Erzeugen des Rückgabewerts"
 
-#: plpython.c:1721
+#: plpy_exec.c:474
 #, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "PL/Python-Funktionen können Typ %s nicht annehmen"
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "konnte neues Dictionary nicht erzeugen, beim Aufbauen der Triggerargumente"
 
-#: plpython.c:1817
+#: plpy_exec.c:664
 #, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "konnte PL/Python-Funktion »%s« nicht kompilieren"
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] wurde gelöscht, kann Zeile nicht ändern"
 
-#: plpython.c:1820
-msgid "could not compile anonymous PL/Python code block"
-msgstr "konnte anonymen PL/Python-Codeblock nicht kompilieren"
+#: plpy_exec.c:667
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] ist kein Dictionary"
 
-#: plpython.c:2091
-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_exec.c:691
+#, 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"
 
-#: plpython.c:2300
-msgid "cannot convert multidimensional array to Python list"
-msgstr "kann mehrdimensionales Array nicht in Python-Liste umwandeln"
+#: plpy_exec.c:697
+#, 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"
 
-#: plpython.c:2301
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr "PL/Python unterstützt nur eindimensionale Arrays."
+#: plpy_exec.c:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "beim Ändern der Triggerzeile"
 
-#: plpython.c:2340
-msgid "could not create new dictionary"
-msgstr "konnte neues Dictionary nicht erzeugen"
+#: plpy_exec.c:839
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "Abbruch einer Subtransaktion, die nicht beendet wurde, wird erzwungen"
 
-#: plpython.c:2435
-msgid "could not create bytes representation of Python object"
-msgstr "konnte Bytes-Darstellung eines Python-Objektes nicht erzeugen"
+#: plpy_main.c:100
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "unpassende Python-Hauptversion für diese Sitzung"
 
-#: plpython.c:2533
-msgid "could not create string representation of Python object"
-msgstr "konnte Zeichenkettendarstellung eines Python-Objektes nicht erzeugen"
+#: plpy_main.c:101
+#, 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."
 
-#: plpython.c:2544
-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_main.c:103
+#, 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."
 
-#: plpython.c:2578
-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_main.c:118
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "nicht abgefangener Fehler bei der Initialisierung"
 
-#: plpython.c:2654
+#: plpy_main.c:141
 #, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "Schlüssel »%s« nicht in Mapping gefunden"
+msgid "could not import \"__main__\" module"
+msgstr "konnte Modul „__main__“ nicht importieren"
 
-#: plpython.c:2655
-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_main.c:146
+#, c-format
+msgid "could not create globals"
+msgstr "konnte globale Objekte nicht erzeugen"
 
-#: plpython.c:2703
-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_main.c:150
+#, c-format
+msgid "could not initialize globals"
+msgstr "konnte globale Objekte nicht initialisieren"
 
-#: plpython.c:2803
+#: plpy_main.c:347
 #, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "Attribut »%s« existiert nicht in Python-Objekt"
+msgid "PL/Python function \"%s\""
+msgstr "PL/Python-Funktion „%s“"
 
-#: plpython.c:2804
-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_main.c:354
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "anonymer PL/Python-Codeblock"
 
-#: plpython.c:3123
+#: plpy_planobject.c:126
+#, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status nimmt keine Argumente"
 
-#: plpython.c:3247
+#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#, c-format
+msgid "could not import \"plpy\" module"
+msgstr "konnte Modul „plpy“ nicht importieren"
+
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "konnte das Modul „spiexceptions“ nicht hinzufügen"
+
+#: plpy_plpymodule.c:217
+#, c-format
+msgid "could not create the base SPI exceptions"
+msgstr "konnte die SPI-Basisausnahmen nicht erzeugen"
+
+#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "konnte SPI-Ausnahmen nicht erzeugen"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "konnte Argumente in plpy.elog nicht entpacken"
+
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "konnte Fehlermeldung in plpy.elog nicht parsen"
+
+#: plpy_procedure.c:194
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr "Triggerfunktionen können nur als Trigger aufgerufen werden"
+
+#: plpy_procedure.c:199 plpy_typeio.c:406
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "PL/Python-Funktionen können keinen Rückgabetyp %s haben"
+
+#: plpy_procedure.c:281
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "PL/Python-Funktionen können Typ %s nicht annehmen"
+
+#: plpy_procedure.c:377
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "konnte PL/Python-Funktion „%s“ nicht kompilieren"
+
+#: plpy_procedure.c:380
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "konnte anonymen PL/Python-Codeblock nicht kompilieren"
+
+#: plpy_resultobject.c:145 plpy_resultobject.c:165 plpy_resultobject.c:185
+#, c-format
+msgid "command did not produce a result set"
+msgstr "Befehl hat keine Ergebnismenge erzeugt"
+
+#: plpy_spi.c:56
+#, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "zweites Argument von plpy.prepare muss eine Sequenz sein"
 
-#: plpython.c:3297
+#: plpy_spi.c:105
 #, 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"
 
-#: plpython.c:3329
+#: plpy_spi.c:137
+#, c-format
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare unterstützt keine zusammengesetzten Datentypen"
 
-#: plpython.c:3419
+#: plpy_spi.c:187
+#, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute hat eine Anfrage oder einen Plan erwartet"
 
-#: plpython.c:3438
+#: plpy_spi.c:206
+#, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute nimmt eine Sequenz als zweites Argument"
 
-#: plpython.c:3454
-msgid "could not execute plan"
-msgstr "konnte Plan nicht ausführen"
-
-#: plpython.c:3457
-#, 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"
-
-#: plpython.c:3599
+#: plpy_spi.c:330
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan fehlgeschlagen: %s"
 
-#: plpython.c:3677
+#: plpy_spi.c:372
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute fehlgeschlagen: %s"
 
-#: plpython.c:3732
+#: plpy_spi.c:439
+#, c-format
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "unbekannter Fehler in PLy_spi_execute_fetch_result"
 
-#: plpython.c:3794
+#: plpy_subxactobject.c:122
+#, c-format
 msgid "this subtransaction has already been entered"
 msgstr "diese Subtransaktion wurde bereits begonnen"
 
-#: plpython.c:3800 plpython.c:3852
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#, c-format
 msgid "this subtransaction has already been exited"
 msgstr "diese Subtransaktion wurde bereits beendet"
 
-#: plpython.c:3846
+#: plpy_subxactobject.c:174
+#, c-format
 msgid "this subtransaction has not been entered"
 msgstr "diese Subtransaktion wurde nicht begonnen"
 
-#: plpython.c:3858
+#: plpy_subxactobject.c:186
+#, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "es gibt keine Subtransaktion zu beenden"
 
-#: plpython.c:3940
-msgid "could not add the spiexceptions module"
-msgstr "konnte das Modul »spiexceptions« nicht hinzufügen"
+#: plpy_typeio.c:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "konnte neues Dictionary nicht erzeugen"
 
-#: plpython.c:4017
-msgid "Python major version mismatch in session"
-msgstr "unpassende Python-Hauptversion für diese Sitzung"
+#: plpy_typeio.c:408
+#, 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."
 
-#: plpython.c:4018
+#: plpy_typeio.c:584
 #, 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 "cannot convert multidimensional array to Python list"
+msgstr "kann mehrdimensionales Array nicht in Python-Liste umwandeln"
 
-#: plpython.c:4020
-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_typeio.c:585
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python unterstützt nur eindimensionale Arrays."
 
-#: plpython.c:4035
-msgid "untrapped error in initialization"
-msgstr "nicht abgefangener Fehler bei der Initialisierung"
+#: plpy_typeio.c:591
+#, c-format
+msgid "could not create new Python list"
+msgstr "konnte neue Python-Liste nicht erzeugen"
 
-#: plpython.c:4063
-msgid "could not import \"__main__\" module"
-msgstr "konnte Modul »__main__« nicht importieren"
+#: plpy_typeio.c:650
+#, c-format
+msgid "could not create bytes representation of Python object"
+msgstr "konnte Bytes-Darstellung eines Python-Objektes nicht erzeugen"
 
-#: plpython.c:4070
-msgid "could not initialize globals"
-msgstr "konnte globale Objekte nicht initialisieren"
+#: plpy_typeio.c:742
+#, c-format
+msgid "could not create string representation of Python object"
+msgstr "konnte Zeichenkettendarstellung eines Python-Objektes nicht erzeugen"
 
-#: plpython.c:4183
-msgid "could not parse error message in plpy.elog"
-msgstr "konnte Fehlermeldung in plpy.elog nicht parsen"
+#: plpy_typeio.c:753
+#, 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"
 
-#: plpython.c:4207 plpython.c:4437 plpython.c:4438 plpython.c:4439
-#: plpython.c:4440
+#: plpy_typeio.c:787
 #, c-format
-msgid "%s"
-msgstr "%s"
+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"
 
-#: plpython.c:4791
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr ""
-"konnte Python-Unicode-Objekt nicht in PostgreSQL-Serverkodierung umwandeln"
+#: plpy_typeio.c:886
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "Schlüssel „%s“ nicht in Mapping gefunden"
+
+#: plpy_typeio.c:887
+#, 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:935
+#, 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:1043
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "Attribut „%s“ existiert nicht in Python-Objekt"
+
+#: plpy_typeio.c:1044
+#, 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:70
+#, c-format
+msgid "could not convert Python Unicode object to bytes"
+msgstr "konnte Python-Unicode-Objekt nicht in Bytes umwandeln"
+
+#: plpy_util.c:75
+#, 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 a61e9e55432..f89cc79a940 100644
--- a/src/pl/plpython/po/es.po
+++ b/src/pl/plpython/po/es.po
@@ -1,347 +1,423 @@
 # Spanish message translation file for plpython
 #
-# Copyright (C) 2009-2010 PostgreSQL Global Development Group
+# Copyright (C) 2009-2012 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Emanuel Calvo Franco <[email protected]>, 2009.
-# Alvaro Herrera <[email protected]>, 2009-2010
-#
-# pgtranslation Id: plpython.po,v 1.6 2010/08/31 18:20:16 alvherre Exp $
+# Alvaro Herrera <[email protected]>, 2009-2012
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plpython (PostgreSQL 9.0)\n"
+"Project-Id-Version: plpython (PostgreSQL 9.2)\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-08-31 07:15+0000\n"
-"PO-Revision-Date: 2010-08-31 14:19-0400\n"
+"POT-Creation-Date: 2013-01-29 13:39+0000\n"
+"PO-Revision-Date: 2012-08-06 15:38-0400\n"
 "Last-Translator: Alvaro Herrera <[email protected]>\n"
 "Language-Team: PgSQL-es-Ayuda <[email protected]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plpython.c:424
+#: plpy_cursorobject.c:98
 #, c-format
-msgid "PL/Python function \"%s\""
-msgstr "función PL/Python «%s»"
-
-#: plpython.c:430
-msgid "PL/Python anonymous code block"
-msgstr "bloque de código anónimo de PL/Python"
-
-#: plpython.c:437
-msgid "while modifying trigger row"
-msgstr "mientras se modificaba la fila de disparador"
-
-#: plpython.c:444
-msgid "while creating return value"
-msgstr "mientras se creaba el valor de retorno"
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor espera una consulta o un plan"
 
-#: plpython.c:613 plpython.c:639
-msgid "unexpected return value from trigger procedure"
-msgstr "valor de retorno no esperado desde el procedimiento disparador"
-
-#: plpython.c:614
-msgid "Expected None or a string."
-msgstr "Se esperaba None o una cadena."
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor lleva una secuencia como segundo argumento"
 
-#: plpython.c:629
-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_cursorobject.c:187 plpy_spi.c:222
+#, c-format
+msgid "could not execute plan"
+msgstr "no se pudo ejecutar el plan"
 
-#: plpython.c:640
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "Se esperaba None, «OK», «SKIP» o «MODIFY»."
+#: plpy_cursorobject.c:190 plpy_spi.c:225
+#, 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"
 
-#: plpython.c:692
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] borrado, no se puede modicar el registro"
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "iterando un cursor cerrado"
 
-#: plpython.c:695
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] no es un diccionario"
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "iterando un cursor en una subtransacción abortada"
 
-#: plpython.c:719
+#: plpy_cursorobject.c:407
 #, 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"
+msgid "fetch from a closed cursor"
+msgstr "haciendo «fetch» en un cursor cerrado"
 
-#: plpython.c:725
+#: plpy_cursorobject.c:486
 #, 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"
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "cerrando un cursor en una subtransacción abortada"
 
-#: plpython.c:819
-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_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: plpython.c:1026
+#: plpy_exec.c:90
+#, c-format
 msgid "unsupported set function return mode"
 msgstr "modo de retorno de conjunto de función no soportado"
 
-#: plpython.c:1027
-msgid ""
-"PL/Python set-returning functions only support returning only value per call."
-msgstr ""
-"Las funciones PL/Python que retornan conjuntos sólo permiten retornar un "
-"valor por invocación."
+#: plpy_exec.c:91
+#, c-format
+msgid "PL/Python set-returning functions only support returning only value per call."
+msgstr "Las funciones PL/Python que retornan conjuntos sólo permiten retornar un valor por invocación."
 
-#: plpython.c:1039
+#: plpy_exec.c:103
+#, c-format
 msgid "returned object cannot be iterated"
 msgstr "objeto retornado no puede ser iterado"
 
-#: plpython.c:1040
+#: plpy_exec.c:104
+#, 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."
+msgstr "Los funciones PL/Python que retornan conjuntos deben retornar un objeto iterable."
 
-#: plpython.c:1067
+#: plpy_exec.c:129
+#, c-format
 msgid "error fetching next item from iterator"
 msgstr "error extrayendo el próximo elemento del iterador"
 
-#: plpython.c:1089
+#: plpy_exec.c:164
+#, 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"
 
-#: plpython.c:1246
+#: plpy_exec.c:288 plpy_exec.c:314
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "valor de retorno no esperado desde el procedimiento disparador"
+
+#: plpy_exec.c:289
+#, c-format
+msgid "Expected None or a string."
+msgstr "Se esperaba None o una cadena."
+
+#: plpy_exec.c:304
+#, 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:315
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Se esperaba None, «OK», «SKIP» o «MODIFY»."
+
+#: plpy_exec.c:396
+#, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() falló, mientras se inicializaban los argumentos"
 
-#: plpython.c:1250
+#: plpy_exec.c:400
+#, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() falló, mientras se inicializaban los argumentos"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() falló"
-
-#: plpython.c:1427
-msgid "trigger functions can only be called as triggers"
-msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
+#: plpy_exec.c:412
+#, 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"
 
-#: plpython.c:1431 plpython.c:1815
+#: plpy_exec.c:450
 #, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "las funciones PL/Python no pueden retornar el tipo %s"
+msgid "while creating return value"
+msgstr "mientras se creaba el valor de retorno"
 
-#: plpython.c:1509
+#: plpy_exec.c:474
 #, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "la funciones PL/Python no pueden aceptar el tipo %s"
+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"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() falló"
+#: plpy_exec.c:664
+#, c-format
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] borrado, no se puede modicar el registro"
 
-#: plpython.c:1606
+#: plpy_exec.c:667
 #, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "no se pudo compilar la función PL/Python «%s»"
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] no es un diccionario"
 
-#: plpython.c:1817
-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_exec.c:691
+#, 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"
 
-#: plpython.c:2020
-msgid "cannot convert multidimensional array to Python list"
-msgstr "no se puede convertir array multidimensional a una lista Python"
+#: plpy_exec.c:697
+#, 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"
 
-#: plpython.c:2021
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr "PL/Python sólo soporta arrays unidimensionales."
+#: plpy_exec.c:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "mientras se modificaba la fila de disparador"
 
-#: plpython.c:2057
-msgid "could not create new dictionary"
-msgstr "no se pudo crear un nuevo diccionario"
+# FIXME not very happy with this
+#: plpy_exec.c:839
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "abortando una subtransacción que no se ha cerrado"
 
-#: plpython.c:2133
-msgid "could not create bytes representation of Python object"
-msgstr "no se pudo crear la representación de cadena de bytes de Python"
+#: plpy_main.c:101
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "las versiones mayores de Python no coinciden en esta sesión"
 
-#: plpython.c:2189
-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_main.c:102
+#, 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."
 
-#: plpython.c:2200
-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_main.c:104
+#, 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."
 
-#: plpython.c:2233
-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_main.c:119
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "error no capturado en la inicialización"
 
-#: plpython.c:2308
+#: plpy_main.c:142
 #, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "la llave «%s» no fue encontrada en el mapa"
+msgid "could not import \"__main__\" module"
+msgstr "no se pudo importar el módulo «__main__»"
 
-#: plpython.c:2309
-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_main.c:147
+#, c-format
+msgid "could not create globals"
+msgstr "no se pudo crear las globales"
 
-#: plpython.c:2352
-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_main.c:151
+#, c-format
+msgid "could not initialize globals"
+msgstr "no se pudo inicializar las globales"
 
-#: plpython.c:2445
+#: plpy_main.c:351
 #, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "el atributo «%s» no existe en el objeto Python"
+msgid "PL/Python function \"%s\""
+msgstr "función PL/Python «%s»"
 
-#: plpython.c:2446
-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_main.c:358
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "bloque de código anónimo de PL/Python"
 
-#: plpython.c:2680
+#: plpy_planobject.c:126
+#, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status no lleva argumentos"
 
-#: plpython.c:2804 plpython.c:2947
-msgid "transaction aborted"
-msgstr "transacción abortada"
+#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#, c-format
+msgid "could not import \"plpy\" module"
+msgstr "no se pudo importar el módulo «plpy»"
+
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "no se pudo importar el módulo spiexceptions"
+
+#: plpy_plpymodule.c:217
+#, c-format
+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
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "no se pudo generar excepciones SPI"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "no se pudo desempaquetar los argumentos de plpy.elog"
 
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "argumentos no válidos para plpy.prepare"
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "no se pudo analizar el mensaje de error de plpy.elog"
 
-#: plpython.c:2818
+#: plpy_procedure.c:199
+#, 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:204 plpy_typeio.c:406
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "las funciones PL/Python no pueden retornar el tipo %s"
+
+#: plpy_procedure.c:286
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "la funciones PL/Python no pueden aceptar el tipo %s"
+
+#: plpy_procedure.c:382
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "no se pudo compilar la función PL/Python «%s»"
+
+#: plpy_procedure.c:385
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "no se pudo compilar el bloque anónimo 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 "la orden no produjo un conjunto de resultados"
+
+#: plpy_spi.c:56
+#, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "el segundo argumento de plpy.prepare debe ser una secuencia"
 
-#: plpython.c:2868
+#: plpy_spi.c:105
 #, 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"
 
-#: plpython.c:2895
+#: plpy_spi.c:137
+#, c-format
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare no soporta tipos compuestos"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "error no reconocido en PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpy_spi.c:187
+#, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera una consulta o un plan"
 
-#: plpython.c:2977
+#: plpy_spi.c:206
+#, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute lleva una secuencia como segundo argumento"
 
-#: plpython.c:2993
-msgid "could not execute plan"
-msgstr "no se pudo ejecutar el plan"
-
-#: plpython.c:2996
-#, 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"
-
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "error no reconocido en PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpy_spi.c:330
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "falló SPI_execute_plan: %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "error no reconocido en PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpy_spi.c:372
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "falló SPI_execute: %s"
 
-#: plpython.c:3185
+#: plpy_spi.c:439
+#, c-format
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "error desconocido en PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
-msgid "Python major version mismatch in session"
-msgstr "las versiones mayores de Python no coinciden en esta sesión"
+#: plpy_subxactobject.c:122
+#, c-format
+msgid "this subtransaction has already been entered"
+msgstr "ya se ha entrado en esta subtransacción"
 
-#: plpython.c:3240
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
 #, 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 "this subtransaction has already been exited"
+msgstr "ya se ha salido de esta subtransacción"
 
-#: plpython.c:3242
-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_subxactobject.c:174
+#, c-format
+msgid "this subtransaction has not been entered"
+msgstr "no se ha entrado en esta subtransacción"
 
-#: plpython.c:3257
-msgid "untrapped error in initialization"
-msgstr "error no capturado en la inicialización"
+#: plpy_subxactobject.c:186
+#, c-format
+msgid "there is no subtransaction to exit from"
+msgstr "no hay una subtransacción de la cual salir"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "no se pudo crear el cache de procedimientos"
+#: plpy_typeio.c:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "no se pudo crear un nuevo diccionario"
 
-#: plpython.c:3272
-msgid "could not import \"__main__\" module"
-msgstr "no se pudo importar el módulo «__main__»"
+#: plpy_typeio.c:408
+#, 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."
 
-#: plpython.c:3279
-msgid "could not initialize globals"
-msgstr "no se pudo inicializar las globales"
+#: plpy_typeio.c:584
+#, c-format
+msgid "cannot convert multidimensional array to Python list"
+msgstr "no se puede convertir array multidimensional a una lista Python"
 
-#: plpython.c:3397
-msgid "could not parse error message in plpy.elog"
-msgstr "no se pudo analizar el mensaje de error de plpy.elog"
+#: plpy_typeio.c:585
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python sólo soporta arrays unidimensionales."
 
-#: plpython.c:3526 plpython.c:3530
+#: plpy_typeio.c:591
 #, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
+msgid "could not create new Python list"
+msgstr "no se pudo crear una nueva lista Python"
 
-#: plpython.c:3527
+#: plpy_typeio.c:650
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "could not create bytes representation of Python object"
+msgstr "no se pudo crear la representación de cadena de bytes de Python"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "memoria agotada"
+#: plpy_typeio.c:742
+#, 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"
 
-#: plpython.c:3694
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr ""
-"no se pudo convertir el objeto Unicode de Python a la codificación de "
-"servidor de PostgreSQL"
+#: plpy_typeio.c:753
+#, 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:787
+#, 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:886
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "la llave «%s» no fue encontrada en el mapa"
+
+#: plpy_typeio.c:887
+#, 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:935
+#, 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:1043
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "el atributo «%s» no existe en el objeto Python"
+
+#: plpy_typeio.c:1044
+#, 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:70
+#, 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:75
+#, c-format
+msgid "could not extract bytes from encoded string"
+msgstr "no se pudo extraer bytes desde la cadena codificada"
diff --git a/src/pl/plpython/po/fr.po b/src/pl/plpython/po/fr.po
index 25f077a2c6b..1f5b4871824 100644
--- a/src/pl/plpython/po/fr.po
+++ b/src/pl/plpython/po/fr.po
@@ -1,8 +1,6 @@
 # translation of plpython.po to fr_fr
 # french message translation file for plpython
 #
-# $PostgreSQL$
-#
 # Use these quotes: � %s �
 # Guillaume Lelarge <[email protected]>, 2009.
 #
@@ -10,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2011-06-13 14:52+0000\n"
-"PO-Revision-Date: 2011-06-13 17:51+0100\n"
+"POT-Creation-Date: 2012-08-10 13:09+0000\n"
+"PO-Revision-Date: 2012-08-10 23:42+0100\n"
 "Last-Translator: Guillaume Lelarge <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "Language: fr\n"
@@ -20,314 +18,440 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: plpython.c:475
+#: plpy_cursorobject.c:98
 #, c-format
-msgid "PL/Python function \"%s\""
-msgstr "fonction PL/python � %s �"
-
-#: plpython.c:482
-msgid "PL/Python anonymous code block"
-msgstr "bloc de code PL/Python anonyme"
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor attendait une requ�te ou un plan"
 
-#: plpython.c:489
-msgid "while modifying trigger row"
-msgstr "lors de la modification de la ligne du trigger"
-
-#: plpython.c:496
-msgid "while creating return value"
-msgstr "lors de la cr�ation de la valeur de retour"
-
-#: plpython.c:707
-#: plpython.c:733
-msgid "unexpected return value from trigger procedure"
-msgstr "valeur de retour inattendue de la proc�dure trigger"
-
-#: plpython.c:708
-msgid "Expected None or a string."
-msgstr "Attendait None ou une cha�ne de caract�res."
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor prends une s�quence dans son second argument"
 
-#: plpython.c:723
-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_cursorobject.c:187
+#: plpy_spi.c:222
+#, c-format
+msgid "could not execute plan"
+msgstr "n'a pas pu ex�cuter le plan"
 
-#: plpython.c:734
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "Attendait None, � OK �, � SKIP � ou � MODIFY �."
+#: plpy_cursorobject.c:190
+#: plpy_spi.c:225
+#, 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"
 
-#: plpython.c:786
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] supprim�, ne peut pas modifier la ligne"
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "it�ration d'un curseur ferm�"
 
-#: plpython.c:789
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] n'est pas un dictionnaire"
+#: plpy_cursorobject.c:348
+#: plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "it�ration d'un curseur dans une sous-transaction annul�e"
 
-#: plpython.c:813
+#: plpy_cursorobject.c:407
 #, 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"
+msgid "fetch from a closed cursor"
+msgstr "r�cup�rer � partir d'un curseur ferm�"
 
-#: plpython.c:819
+#: plpy_cursorobject.c:486
 #, 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"
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "fermeture d'un curseur dans une sous-transaction annul�e"
 
-#: plpython.c:915
-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_elog.c:103
+#: plpy_elog.c:104
+#: plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: plpython.c:1122
+#: plpy_exec.c:90
+#, c-format
 msgid "unsupported set function return mode"
 msgstr "mode de retour non support� pour la fonction SET"
 
-#: plpython.c:1123
+#: plpy_exec.c:91
+#, c-format
 msgid "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
 "les fonctions PL/python renvoyant des ensembles supportent seulement une\n"
 "valeur renvoy�e par appel"
 
-#: plpython.c:1135
+#: plpy_exec.c:103
+#, c-format
 msgid "returned object cannot be iterated"
 msgstr "l'objet renvoy� ne supporte pas les it�rations"
 
-#: plpython.c:1136
+#: plpy_exec.c:104
+#, 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"
 
-#: plpython.c:1161
+#: plpy_exec.c:129
+#, 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"
 
-#: plpython.c:1196
+#: plpy_exec.c:164
+#, 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"
 
-#: plpython.c:1287
-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_exec.c:288
+#: plpy_exec.c:314
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "valeur de retour inattendue de la proc�dure trigger"
+
+#: plpy_exec.c:289
+#, c-format
+msgid "Expected None or a string."
+msgstr "Attendait None ou une cha�ne de caract�res."
+
+#: plpy_exec.c:304
+#, 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:315
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Attendait None, � OK �, � SKIP � ou � MODIFY �."
 
-#: plpython.c:1403
+#: plpy_exec.c:396
+#, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "�chec de PyList_SetItem() lors de l'initialisation des arguments"
 
-#: plpython.c:1407
+#: plpy_exec.c:400
+#, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "�chec de PyDict_SetItemString() lors de l'initialisation des arguments"
 
-#: plpython.c:1419
+#: plpy_exec.c:412
+#, 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"
 
-#: plpython.c:1633
-msgid "trigger functions can only be called as triggers"
-msgstr "les fonctions trigger peuvent seulement �tre appel�es par des triggers"
-
-#: plpython.c:1638
-#: plpython.c:2089
+#: plpy_exec.c:450
 #, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "les fonctions PL/python ne peuvent pas renvoyer le type %s"
+msgid "while creating return value"
+msgstr "lors de la cr�ation de la valeur de retour"
 
-#: plpython.c:1721
+#: plpy_exec.c:474
 #, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "les fonctions PL/python ne peuvent pas accepter le type %s"
+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"
 
-#: plpython.c:1817
+#: plpy_exec.c:664
 #, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "n'a pas pu compiler la fonction PL/python � %s �"
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] supprim�, ne peut pas modifier la ligne"
 
-#: plpython.c:1820
-msgid "could not compile anonymous PL/Python code block"
-msgstr "n'a pas pu compiler le bloc de code anonyme PL/python"
+#: plpy_exec.c:667
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] n'est pas un dictionnaire"
 
-#: plpython.c:2091
-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_exec.c:691
+#, 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"
 
-#: plpython.c:2300
-msgid "cannot convert multidimensional array to Python list"
-msgstr "ne peut pas convertir un tableau multidimensionnel en liste Python"
+#: plpy_exec.c:697
+#, 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"
 
-#: plpython.c:2301
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr "PL/Python supporte seulement les tableaux uni-dimensionnels."
+#: plpy_exec.c:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "lors de la modification de la ligne du trigger"
 
-#: plpython.c:2340
-msgid "could not create new dictionary"
-msgstr "n'a pas pu cr�er le nouveau dictionnaire"
+#: plpy_exec.c:839
+#, 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"
 
-#: plpython.c:2435
-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_main.c:100
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "Diff�rence de version majeure de Python dans la session"
 
-#: plpython.c:2533
-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_main.c:101
+#, 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."
 
-#: plpython.c:2544
-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_main.c:103
+#, 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."
 
-#: plpython.c:2578
-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_main.c:118
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "erreur non r�cup�r�e dans l'initialisation"
 
-#: plpython.c:2654
+#: plpy_main.c:141
 #, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "la cl� � %s � introuvable dans la correspondance"
+msgid "could not import \"__main__\" module"
+msgstr "n'a pas pu importer le module � __main__ �"
 
-#: plpython.c:2655
-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_main.c:146
+#, c-format
+msgid "could not create globals"
+msgstr "n'a pas pu cr�er les globales"
 
-#: plpython.c:2703
-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_main.c:150
+#, c-format
+msgid "could not initialize globals"
+msgstr "n'a pas pu initialiser les variables globales"
 
-#: plpython.c:2803
+#: plpy_main.c:347
 #, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "l'attribut � %s � n'existe pas dans l'objet Python"
+msgid "PL/Python function \"%s\""
+msgstr "fonction PL/python � %s �"
 
-#: plpython.c:2804
-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_main.c:354
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "bloc de code PL/Python anonyme"
 
-#: plpython.c:3123
+#: plpy_planobject.c:126
+#, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status ne prends pas d'arguments"
 
-#: plpython.c:3247
+#: plpy_plpymodule.c:178
+#: plpy_plpymodule.c:181
+#, c-format
+msgid "could not import \"plpy\" module"
+msgstr "n'a pas pu importer le module � plpy �"
+
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "n'a pas pu ajouter le module � spiexceptions �"
+
+#: plpy_plpymodule.c:217
+#, c-format
+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
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "n'a pas pu g�n�rer les exceptions SPI"
+
+#: plpy_plpymodule.c:388
+#, 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
+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:194
+#, 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:199
+#: plpy_typeio.c:406
+#, 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:281
+#, 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:377
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "n'a pas pu compiler la fonction PL/python � %s �"
+
+#: plpy_procedure.c:380
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "n'a pas pu compiler le bloc de code anonyme 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 "la commande n'a pas fourni d'ensemble de r�sultats"
+
+#: plpy_spi.c:56
+#, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "le second argument de plpy.prepare doit �tre une s�quence"
 
-#: plpython.c:3297
+#: plpy_spi.c:105
 #, 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"
 
-#: plpython.c:3329
+#: plpy_spi.c:137
+#, c-format
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare ne supporte pas les types composites"
 
-#: plpython.c:3419
+#: plpy_spi.c:187
+#, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.prepare attendait une requ�te ou un plan"
 
-#: plpython.c:3438
+#: plpy_spi.c:206
+#, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute prends une s�quence dans son second argument"
 
-#: plpython.c:3454
-msgid "could not execute plan"
-msgstr "n'a pas pu ex�cuter le plan"
-
-#: plpython.c:3457
-#, 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"
-
-#: plpython.c:3599
+#: plpy_spi.c:330
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "�chec de SPI_execute_plan : %s"
 
-#: plpython.c:3677
+#: plpy_spi.c:372
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "�chec de SPI_execute : %s"
 
-#: plpython.c:3732
+#: plpy_spi.c:439
+#, c-format
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "erreur inconnue dans PLy_spi_execute_fetch_result"
 
-#: plpython.c:3794
+#: plpy_subxactobject.c:122
+#, c-format
 msgid "this subtransaction has already been entered"
 msgstr "cette sous-transaction est en cours d'utilisation"
 
-#: plpython.c:3800
-#: plpython.c:3852
+#: plpy_subxactobject.c:128
+#: plpy_subxactobject.c:180
+#, c-format
 msgid "this subtransaction has already been exited"
 msgstr "d�j� sorti de cette sous-transaction"
 
-#: plpython.c:3846
+#: plpy_subxactobject.c:174
+#, c-format
 msgid "this subtransaction has not been entered"
 msgstr "cette sous-transaction n'a jamais �t� utilis�e"
 
-#: plpython.c:3858
+#: plpy_subxactobject.c:186
+#, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "il n'y a pas de transaction � quitter"
 
-#: plpython.c:3940
-msgid "could not add the spiexceptions module"
-msgstr "n'a pas pu ajouter le module � spiexceptions �"
+#: plpy_typeio.c:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "n'a pas pu cr�er le nouveau dictionnaire"
 
-#: plpython.c:4017
-msgid "Python major version mismatch in session"
-msgstr "Diff�rence de version majeure de Python dans la session"
+#: plpy_typeio.c:408
+#, 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."
 
-#: plpython.c:4018
+#: plpy_typeio.c:584
 #, 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 "cannot convert multidimensional array to Python list"
+msgstr "ne peut pas convertir un tableau multidimensionnel en liste Python"
 
-#: plpython.c:4020
-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_typeio.c:585
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python supporte seulement les tableaux uni-dimensionnels."
 
-#: plpython.c:4035
-msgid "untrapped error in initialization"
-msgstr "erreur non r�cup�r�e dans l'initialisation"
+#: plpy_typeio.c:591
+#, c-format
+msgid "could not create new Python list"
+msgstr "n'a pas pu cr�er la nouvelle liste Python"
 
-#: plpython.c:4063
-msgid "could not import \"__main__\" module"
-msgstr "n'a pas pu importer le module � __main__ �"
+#: plpy_typeio.c:650
+#, 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"
 
-#: plpython.c:4070
-msgid "could not initialize globals"
-msgstr "n'a pas pu initialiser les variables globales"
+#: plpy_typeio.c:742
+#, 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"
 
-#: plpython.c:4183
-msgid "could not parse error message in plpy.elog"
-msgstr "n'a pas pu analyser le message d'erreur dans plpy.elog"
+#: plpy_typeio.c:753
+#, 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"
 
-#: plpython.c:4207
-#: plpython.c:4437
-#: plpython.c:4438
-#: plpython.c:4439
-#: plpython.c:4440
+#: plpy_typeio.c:787
 #, c-format
-msgid "%s"
-msgstr "%s"
+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:886
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "la cl� � %s � introuvable dans la correspondance"
+
+#: plpy_typeio.c:887
+#, 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."
 
-#: plpython.c:4794
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr "n'a pas pu convertir l'objet Unicode Python en encodage serveur PostgreSQL"
+#: plpy_typeio.c:935
+#, 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:1043
+#, 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:1044
+#, 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:70
+#, 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:75
+#, 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 "PyCObject_AsVoidPtr() failed"
 #~ msgstr "�chec de PyCObject_AsVoidPtr()"
@@ -362,21 +486,15 @@ msgstr "n'a pas pu convertir l'objet Unicode Python en encodage serveur PostgreS
 #~ msgid "PL/Python function \"%s\" failed"
 #~ msgstr "�chec de la fonction PL/python � %s �"
 
-#~ msgid ""
-#~ "could not compute string representation of Python object in PL/Python "
-#~ "function \"%s\" while modifying trigger row"
+#~ msgid "could not compute string representation of Python object in PL/Python function \"%s\" while modifying trigger row"
 #~ msgstr ""
 #~ "n'a pas pu traiter la repr�sentation de la cha�ne d'un objet Python dans\n"
-#~ "la fonction PL/Python � %s � lors de la modification de la ligne du "
-#~ "trigger"
+#~ "la fonction PL/Python � %s � lors de la modification de la ligne du trigger"
 
-#~ msgid ""
-#~ "could not create string representation of Python object in PL/Python "
-#~ "function \"%s\" while creating return value"
+#~ msgid "could not create string representation of Python object in PL/Python function \"%s\" while creating return value"
 #~ msgstr ""
 #~ "n'a pas pu cr�er la repr�sentation en cha�ne de caract�re de l'objet\n"
-#~ "Python dans la fonction PL/python � %s � lors de la cr�ation de la "
-#~ "valeur\n"
+#~ "Python dans la fonction PL/python � %s � lors de la cr�ation de la valeur\n"
 #~ "de retour"
 
 #~ msgid "PL/Python function \"%s\" could not execute plan"
diff --git a/src/pl/plpython/po/it.po b/src/pl/plpython/po/it.po
index a484fae5173..b71fe7c6364 100644
--- a/src/pl/plpython/po/it.po
+++ b/src/pl/plpython/po/it.po
@@ -7,7 +7,8 @@
 #
 # Traduttori:
 #  * Flavio Spada <[email protected]>
-# 
+#  * Daniele Varrazzo <[email protected]
+#
 # Revisori:
 #  * Gabriele Bartolini <[email protected]>
 #
@@ -16,305 +17,416 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plpython-it\n"
+"Project-Id-Version: plpython (PostgreSQL) 9.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-26 13:15+0000\n"
-"PO-Revision-Date: 2010-03-27 12:44:19+0100\n"
-"Last-Translator: Gabriele Bartolini <[email protected]>\n"
+"POT-Creation-Date: 2013-03-15 22:09+0000\n"
+"PO-Revision-Date: 2012-11-02 15:26+0100\n"
+"Last-Translator: Daniele Varrazzo <[email protected]>\n"
 "Language-Team: Gruppo traduzioni ITPUG <[email protected]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: plpython.c:418
+#: plpy_cursorobject.c:98
 #, c-format
-msgid "PL/Python function \"%s\""
-msgstr "funzione PL/Python \"%s\""
-
-#: plpython.c:424
-msgid "PL/Python anonymous code block"
-msgstr "codice di blocco anonimo in PL/Python"
-
-#: plpython.c:431
-msgid "while modifying trigger row"
-msgstr "durante la modifica della riga trigger"
-
-#: plpython.c:438
-msgid "while creating return value"
-msgstr "durante la creazione del valore di ritorno"
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor richiede una query o un piano"
 
-#: plpython.c:604
-#: plpython.c:630
-msgid "unexpected return value from trigger procedure"
-msgstr "valore di ritorno inatteso dalla prodedura di trigger"
-
-#: plpython.c:605
-msgid "Expected None or a string."
-msgstr "Atteso None o una stringa."
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor richiede una sequenza come secondo argomento"
 
-#: plpython.c:620
-msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
-msgstr "la funzione PL/Python trigger ha restituito \"MODIFY\" in un trigger DELETE -- ignorato"
+#: plpy_cursorobject.c:187 plpy_spi.c:223
+#, c-format
+msgid "could not execute plan"
+msgstr "esecuzione del piano fallita"
 
-#: plpython.c:631
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "Atteso None, \"OK\", \"SKIP\", o \"MODIFY\"."
+#: plpy_cursorobject.c:190 plpy_spi.c:226
+#, 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"
 
-#: plpython.c:683
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] cancellato, impossibile modificare la riga"
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "iterazione di un cursore chiuso"
 
-#: plpython.c:686
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] non è un dizionario"
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "iterazione di un cursore in una sotto-transazione interrotta"
 
-#: plpython.c:710
+#: plpy_cursorobject.c:407
 #, 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"
+msgid "fetch from a closed cursor"
+msgstr "lettura da un cursore chiuso"
 
-#: plpython.c:716
+#: plpy_cursorobject.c:486
 #, 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"
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "chiusura di un cursore in una sotto-transazione interrotta"
 
-#: plpython.c:810
-msgid "could not create new dictionary while building trigger arguments"
-msgstr "impossibile creare un nuovo dizionario mentre si stanno costruendo gli argomenti del trigger"
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: plpython.c:1017
+#: plpy_exec.c:91
+#, c-format
 msgid "unsupported set function return mode"
 msgstr "modalità di ritorno della funzione set non supportata"
 
-#: plpython.c:1018
+#: plpy_exec.c:92
+#, c-format
 msgid "PL/Python set-returning functions only support returning only value per call."
-msgstr "le funzioni set-returning di PL/Python supportano il valore di ritorno solo una volta per chiamata"
+msgstr "le funzioni PL/Python che restituiscono insiemi supportano solo la restituzione di un solo valore per chiamata."
 
-#: plpython.c:1030
+#: plpy_exec.c:104
+#, c-format
 msgid "returned object cannot be iterated"
-msgstr "l'oggetto ritornato non può essere iterato"
+msgstr "l'oggetto restituito non può essere iterato"
 
-#: plpython.c:1031
+#: plpy_exec.c:105
+#, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
-msgstr "le funzioni set-returning di PL/Python devono tornare un oggetto iterabile"
+msgstr "le funzioni PL/Python che restituiscono insiemi devono restituire un oggetto iterabile"
 
-#: plpython.c:1058
+#: plpy_exec.c:130
+#, c-format
 msgid "error fetching next item from iterator"
 msgstr "errore nell'ottenere l'elemento successivo dall'iteratore"
 
-#: plpython.c:1080
+#: plpy_exec.c:165
+#, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
-msgstr "la funzione PL/Python con valore di ritorno \"void\" non ha restituito None"
+msgstr "la funzione PL/Python che restituisce \"void\" non ha restituito None"
 
-#: plpython.c:1237
+#: plpy_exec.c:289 plpy_exec.c:315
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "la prodedura trigger ha restituito un valore inatteso"
+
+#: plpy_exec.c:290
+#, c-format
+msgid "Expected None or a string."
+msgstr "Atteso None o una stringa."
+
+#: plpy_exec.c:305
+#, 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
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Atteso None, \"OK\", \"SKIP\", o \"MODIFY\"."
+
+#: plpy_exec.c:397
+#, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() è fallita durante l'impostazione degli argomenti"
 
-#: plpython.c:1241
+#: plpy_exec.c:401
+#, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() è fallita durante l'impostazione degli argomenti"
 
-#: plpython.c:1416
-msgid "trigger functions can only be called as triggers"
-msgstr "le funzioni trigger possono essere chiamate solo come trigger"
+#: plpy_exec.c:413
+#, 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"
 
-#: plpython.c:1420
-#: plpython.c:1800
+#: plpy_exec.c:451
 #, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "le funzioni PL/Python non possono tornare il tipo %s"
+msgid "while creating return value"
+msgstr "durante la creazione del valore da restituire"
 
-#: plpython.c:1498
+#: plpy_exec.c:475
 #, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "le funzioni PL/Python non possono accettare il tipo %s"
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "creazione del nuovo dizionario nella costruzione degli argomenti del trigger fallita"
 
-#: plpython.c:1592
+#: plpy_exec.c:665
 #, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "impossibile compilare la funzione PL/Python \"%s\""
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] cancellato, non è possibile modificare la riga"
 
-#: plpython.c:1802
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr ""
+#: plpy_exec.c:668
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] non è un dizionario"
 
-#: plpython.c:1996
-msgid "cannot convert multidimensional array to Python list"
-msgstr ""
+#: plpy_exec.c:692
+#, 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"
 
-#: plpython.c:1997
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr ""
+#: plpy_exec.c:698
+#, 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"
 
-#: plpython.c:2031
-msgid "could not create new dictionary"
-msgstr "impossibile creare il nuovo dizionario"
+#: plpy_exec.c:779
+#, c-format
+msgid "while modifying trigger row"
+msgstr "durante la modifica della riga trigger"
 
-#: plpython.c:2107
-msgid "could not create bytes representation of Python object"
-msgstr "impossibile creare la rappresentazione di tipo byte dell'oggetto Python"
+#: plpy_exec.c:840
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "interruzione forzata di una sotto-transazione che non è terminata"
 
-#: plpython.c:2163
-msgid "could not create string representation of Python object"
-msgstr "impossibile creare la rappresentazione di tipo stringa dell'oggetto Python"
+#: plpy_main.c:102
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "mancata corrispondenza della versione maggiore di Python major nella sessione"
 
-#: plpython.c:2174
-msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
-msgstr ""
+#: plpy_main.c:103
+#, 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."
 
-#: plpython.c:2207
-msgid "return value of function with array return type is not a Python sequence"
-msgstr ""
+#: plpy_main.c:105
+#, 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."
 
-#: plpython.c:2282
+#: plpy_main.c:120
 #, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "la chiave \"%s\" non è stata trovata nel dizionario"
+msgid "untrapped error in initialization"
+msgstr "errore non catturato durante l'inizializzazione"
 
-#: plpython.c:2283
-msgid "To return null in a column, add the value None to the mapping with the key named after the column."
-msgstr "Per ritornare null in una colonna, inserire nella mappa il valore None in corrispondenza del nome di colonna come chiave."
+#: plpy_main.c:143
+#, c-format
+msgid "could not import \"__main__\" module"
+msgstr "importazione del modulo \"__main__\""
 
-#: plpython.c:2326
-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_main.c:148
+#, c-format
+msgid "could not create globals"
+msgstr "creazione delle variabili globali fallita"
 
-#: plpython.c:2419
+#: plpy_main.c:152
 #, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "l'attributo \"%s\" non esiste nell'oggetto Python"
+msgid "could not initialize globals"
+msgstr "inizializzazione delle variabili globali fallita"
 
-#: plpython.c:2420
-msgid "To return null in a column, let the returned object have an attribute named after column with value None."
-msgstr "Per ritornare null in una colonna, assicurarsi che all'oggetto di ritorno corrisponda nel dizionario un attributo con valore None."
+#: plpy_main.c:352
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "funzione PL/Python \"%s\""
+
+#: plpy_main.c:359
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "blocco di codice anonimo in PL/Python"
 
-#: plpython.c:2654
+#: plpy_planobject.c:126
+#, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status non accetta argomenti"
 
-#: plpython.c:2778
-#: plpython.c:2921
-msgid "transaction aborted"
-msgstr "transazione abortita"
+#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#, c-format
+msgid "could not import \"plpy\" module"
+msgstr "importazione del modulo \"plpy\" fallita"
 
-#: plpython.c:2785
-msgid "invalid arguments for plpy.prepare"
-msgstr "argomenti non validi per plpy.prepare"
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "aggiunta del modulo spiexceptions fallita"
 
-#: plpython.c:2792
+#: plpy_plpymodule.c:217
+#, c-format
+msgid "could not create the base SPI exceptions"
+msgstr "creazione delle eccezioni SPI di base fallita"
+
+#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "generazione delle eccezioni SPI fallita"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "non è stato possibile espandere gli argomenti in plpy.elog"
+
+#: plpy_plpymodule.c:396
+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
+#, 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:408
+#, 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
+#, 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
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "compilazione della funzione PL/Python \"%s\" fallita"
+
+#: plpy_procedure.c:386
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "compilazione del blocco di codice anonimo PL/Python fallita"
+
+#: plpy_resultobject.c:145 plpy_resultobject.c:165 plpy_resultobject.c:185
+#, c-format
+msgid "command did not produce a result set"
+msgstr "il comando non ha prodotto risultati"
+
+#: plpy_spi.c:57
+#, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "il secondo argomento di plpy.prepare deve essere una sequenza"
 
-#: plpython.c:2842
+#: plpy_spi.c:106
 #, 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"
 
-#: plpython.c:2869
+#: plpy_spi.c:138
+#, c-format
 msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare non supporta tipi composti"
-
-#: plpython.c:2898
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "errore non riconosciuto in PLy_spi_prepare"
+msgstr "plpy.prepare non supporta tipi compositi"
 
-#: plpython.c:2934
+#: plpy_spi.c:188
+#, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute si aspetta una query o un plan"
 
-#: plpython.c:2951
+#: plpy_spi.c:207
+#, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute richiede una sequenza come secondo argomento"
 
-#: plpython.c:2967
-msgid "could not execute plan"
-msgstr "impossibile eseguire il piano"
-
-#: plpython.c:2970
-#, c-format
-msgid "Expected sequence of %d argument, got %d: %s"
-msgid_plural "Expected sequence of %d arguments, got %d: %s"
-msgstr[0] "Sequenza attesa per l'argomento %d, ricevuto %d: %s"
-msgstr[1] "Sequenza attesa di %d argomenti, ricevuti %d: %s"
-
-#: plpython.c:3047
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "errore non riconosciuto nella funzione PLy_spi_execute_plan"
-
-#: plpython.c:3066
+#: plpy_spi.c:331
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan ha fallito: %s"
 
-#: plpython.c:3093
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "errore non riconosciuto nella funzione PLy_spi_execute_query"
-
-#: plpython.c:3102
+#: plpy_spi.c:373
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute ha fallito: %s"
 
-#: plpython.c:3162
+#: plpy_spi.c:440
+#, c-format
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
-msgstr "errore non riconosciuto nella funzione PLy_spi_execute_fetch_result"
+msgstr "errore sconosciuto nella funzione PLy_spi_execute_fetch_result"
 
-#: plpython.c:3213
-msgid "untrapped error in initialization"
-msgstr "errore non catturato durante l'inizializzazione"
+#: plpy_subxactobject.c:122
+#, c-format
+msgid "this subtransaction has already been entered"
+msgstr "si è già entrati in questa sotto-transazione"
 
-#: plpython.c:3216
-msgid "could not create procedure cache"
-msgstr "impossibile creare la procedura cache"
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#, c-format
+msgid "this subtransaction has already been exited"
+msgstr "si è già usciti da questa sotto-transazione"
 
-#: plpython.c:3228
-msgid "could not import \"__main__\" module"
-msgstr "impossibile importare il modulo \"__main__\""
+#: plpy_subxactobject.c:174
+#, c-format
+msgid "this subtransaction has not been entered"
+msgstr "non si è entrati in questa sotto-transazione"
 
-#: plpython.c:3235
-msgid "could not initialize globals"
-msgstr "impossibile inizializzare le variabili globali"
+#: plpy_subxactobject.c:186
+#, c-format
+msgid "there is no subtransaction to exit from"
+msgstr "non c'è nessuna transazione da cui uscire"
 
-#: plpython.c:3353
-msgid "could not parse error message in plpy.elog"
-msgstr "impossibile interpretare il messaggio di errore in plpy.elog"
+#: plpy_typeio.c:293
+#, c-format
+msgid "could not create new dictionary"
+msgstr "creazione del nuovo dizionario fallita"
 
-#: plpython.c:3482
-#: plpython.c:3486
+#: plpy_typeio.c:410
 #, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr "PL/Python non supporta la conversione in array di tipi riga."
 
-#: plpython.c:3483
+#: plpy_typeio.c:595
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "cannot convert multidimensional array to Python list"
+msgstr "non è possibile convertire array multidimensionali a liste Python"
 
-#: plpython.c:3596
-msgid "out of memory"
-msgstr "memoria esaurita"
+#: plpy_typeio.c:596
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python supporta solo array monodimensionali."
 
-#: plpython.c:3650
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr ""
+#: plpy_typeio.c:602
+#, c-format
+msgid "could not create new Python list"
+msgstr "creazione della nuova lista Python fallita"
+
+#: plpy_typeio.c:661
+#, c-format
+msgid "could not create bytes representation of Python object"
+msgstr "creazione della rappresentazione in byte dell'oggetto Python fallita"
+
+#: plpy_typeio.c:753
+#, c-format
+msgid "could not create string representation of Python object"
+msgstr "creazione della rappresentazione stringa dell'oggetto Python fallita"
+
+#: plpy_typeio.c:764
+#, 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:798
+#, 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:897
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "la chiave \"%s\" non è stata trovata nel dizionario"
+
+#: plpy_typeio.c:898
+#, 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:946
+#, 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:1054
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "l'attributo \"%s\" non esiste nell'oggetto Python"
 
-#~ msgid ""
-#~ "could not compute string representation of Python object in PL/Python "
-#~ "function \"%s\" while modifying trigger row"
-#~ msgstr ""
-#~ "impossibile calcolare la rappresentazione di tipo stringa dell'oggetto "
-#~ "Python nella funzione PL/Python \"%s\" mentre si sta modificando la riga "
-#~ "di trigger"
-
-#~ msgid ""
-#~ "could not create string representation of Python object in PL/Python "
-#~ "function \"%s\" while creating return value"
-#~ msgstr ""
-#~ "impossibile creare una rappresentazione di tipo stringa dell'oggetto "
-#~ "Python nella funzione PL/Python \"%s\" durante la creazione del valore di "
-#~ "ritorno"
-
-#~ msgid "PL/Python function \"%s\" failed"
-#~ msgstr "la funzione PL/Python \"%s\" è fallita"
+#: plpy_typeio.c:1055
+#, 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:70
+#, c-format
+msgid "could not convert Python Unicode object to bytes"
+msgstr "conversione dell'oggetto Unicode Python in byte fallita"
+
+#: plpy_util.c:75
+#, 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/ja.po b/src/pl/plpython/po/ja.po
index 7cb2f5fe2a2..5a5040ee0b5 100644
--- a/src/pl/plpython/po/ja.po
+++ b/src/pl/plpython/po/ja.po
@@ -6,349 +6,430 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1 beta2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2011-06-16 05:31+0900\n"
-"PO-Revision-Date: 2011-06-16 05:47+0900\n"
+"POT-Creation-Date: 2012-08-11 16:28+0900\n"
+"PO-Revision-Date: 2012-08-11 16:37+0900\n"
 "Last-Translator: Honda Shigehiro <[email protected]>\n"
 "Language-Team: Japan PostgreSQL Users Group <[email protected]>\n"
+"Language: ja\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"
 
-#: plpython.c:475
+#: plpy_cursorobject.c:98
 #, c-format
-msgid "PL/Python function \"%s\""
-msgstr "PL/Python 関数 \"%s\""
-
-#: plpython.c:482
-msgid "PL/Python anonymous code block"
-msgstr "PL/Python の無名コードブロック"
-
-#: plpython.c:489
-msgid "while modifying trigger row"
-msgstr "トリガー行を変更する際に"
-
-#: plpython.c:496
-msgid "while creating return value"
-msgstr "戻り値を生成する際に"
-
-#: plpython.c:707 plpython.c:733
-msgid "unexpected return value from trigger procedure"
-msgstr "トリガー手続きから期待しない戻り値が返されました"
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursorはクエリーもしくは実行計画を期待していました"
 
-#: plpython.c:708
-msgid "Expected None or a string."
-msgstr "None もしくは文字列を期待していました。"
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursorは第二引数としてシーケンスを取ります"
 
-#: plpython.c:723
-msgid ""
-"PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
-msgstr "PL/Python トリガー関数が、DELETE トリガーで \"MODIFY\" を返しました-- 無視しました"
+#: plpy_cursorobject.c:187 plpy_spi.c:222
+#, c-format
+msgid "could not execute plan"
+msgstr "プランを実行できませんでした"
 
-#: plpython.c:734
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "None, \"OK\", \"SKIP\", \"MODIFY\" のいずれかを期待していました。"
+#: plpy_cursorobject.c:190 plpy_spi.c:225
+#, 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"
 
-#: plpython.c:786
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] は削除されました。もはや変更できません"
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "クローズされたカーsるの反復"
 
-#: plpython.c:789
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] は辞書ではありません"
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "アボートされたサブトランザクション内のカーソルの反復"
 
-#: plpython.c:813
+#: plpy_cursorobject.c:407
 #, c-format
-msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
-msgstr "TD[\"new\"] 辞書の%d番目のキーが文字列ではありません"
+msgid "fetch from a closed cursor"
+msgstr "クローズされたカーソルからのフェッチ"
 
-#: plpython.c:819
+#: plpy_cursorobject.c:486
 #, c-format
-msgid ""
-"key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
-"row"
-msgstr ""
-"TD[\"new\"] で見つかったキー \"%s\" は、行レベルトリガーにおけるカラムとして"
-"は存在しません"
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "アボートされたサブトランザクションにおけるカーソルクローズ"
 
-#: plpython.c:915
-msgid "could not create new dictionary while building trigger arguments"
-msgstr "トリガーの引数を構成中に、新しい辞書を生成できませんでした"
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: plpython.c:1122
+#: plpy_exec.c:90
+#, c-format
 msgid "unsupported set function return mode"
 msgstr "未サポートの集合関数リターンモードです"
 
-#: plpython.c:1123
-msgid ""
-"PL/Python set-returning functions only support returning only value per call."
-msgstr ""
-"PL/Python の集合を返す関数では、１回のコールのたびに値だけを返すことがサポー"
-"トされています"
+#: plpy_exec.c:91
+#, c-format
+msgid "PL/Python set-returning functions only support returning only value per call."
+msgstr "PL/Python の集合を返す関数では、１回のコールのたびに値だけを返すことがサポートされています"
 
-#: plpython.c:1135
+#: plpy_exec.c:103
+#, c-format
 msgid "returned object cannot be iterated"
 msgstr "返されたオブジェクトは反復適用できません"
 
-#: plpython.c:1136
+#: plpy_exec.c:104
+#, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
-msgstr ""
-"PL/Python の集合を返す関数では、イテレータ（反復子）オブジェクトを返さなけれ"
-"ばなりません"
+msgstr "PL/Python の集合を返す関数では、イテレータ（反復子）オブジェクトを返さなければなりません"
 
-#: plpython.c:1161
+#: plpy_exec.c:129
+#, c-format
 msgid "error fetching next item from iterator"
 msgstr "イテレータ（反復子）から次の項目をフェッチ（取り出し）できません"
 
-#: plpython.c:1196
+#: plpy_exec.c:164
+#, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "\"void\" 型を返す PL/Python 関数は None 型を返しません"
 
-#: plpython.c:1287
-msgid "forcibly aborting a subtransaction that has not been exited"
-msgstr "終了していないサブトランザクションを強制的にアボートしています"
+#: plpy_exec.c:288 plpy_exec.c:314
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "トリガー手続きから期待しない戻り値が返されました"
 
-#: plpython.c:1403
+#: plpy_exec.c:289
+#, c-format
+msgid "Expected None or a string."
+msgstr "None もしくは文字列を期待していました。"
+
+#: plpy_exec.c:304
+#, c-format
+msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
+msgstr "PL/Python トリガー関数が、DELETE トリガーで \"MODIFY\" を返しました-- 無視しました"
+
+#: plpy_exec.c:315
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "None, \"OK\", \"SKIP\", \"MODIFY\" のいずれかを期待していました。"
+
+#: plpy_exec.c:396
+#, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "引数を設定する際に、PyList_SetItem() に失敗しました"
 
-#: plpython.c:1407
+#: plpy_exec.c:400
+#, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "引数を設定する際に、PyDict_SetItemString() に失敗しました"
 
-#: plpython.c:1419
-msgid ""
-"function returning record called in context that cannot accept type record"
-msgstr ""
-"レコード型を受け付けられないコンテキストでレコードを返す関数が呼び出されまし"
-"た"
-
-#: plpython.c:1633
-msgid "trigger functions can only be called as triggers"
-msgstr "トリガー関数はトリガーとしてのみコールできます"
+#: plpy_exec.c:412
+#, c-format
+msgid "function returning record called in context that cannot accept type record"
+msgstr "レコード型を受け付けられないコンテキストでレコードを返す関数が呼び出されました"
 
-#: plpython.c:1638 plpython.c:2089
+#: plpy_exec.c:450
 #, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "PL/Python 関数は %s 型を返せません"
+msgid "while creating return value"
+msgstr "戻り値を生成する際に"
 
-#: plpython.c:1721
+#: plpy_exec.c:474
 #, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "PL/Python 関数は %s 型を受け付けません"
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "トリガーの引数を構成中に、新しい辞書を生成できませんでした"
 
-#: plpython.c:1817
+#: plpy_exec.c:664
 #, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "PL/Python 関数 \"%s\" をコンパイルできません"
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] は削除されました。もはや変更できません"
 
-#: plpython.c:1820
-msgid "could not compile anonymous PL/Python code block"
-msgstr "PL/Python匿名コードブロックをコンパイルできません"
+#: plpy_exec.c:667
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] は辞書ではありません"
 
-#: plpython.c:2091
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python は行タイプ配列への変換をサポートしていません"
+#: plpy_exec.c:691
+#, c-format
+msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
+msgstr "TD[\"new\"] 辞書の%d番目のキーが文字列ではありません"
 
-#: plpython.c:2300
-msgid "cannot convert multidimensional array to Python list"
-msgstr "多次元配列を Python の list に変換できません"
+#: plpy_exec.c:697
+#, c-format
+msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
+msgstr "TD[\"new\"] で見つかったキー \"%s\" は、行レベルトリガーにおけるカラムとしては存在しません"
 
-#: plpython.c:2301
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr "PL/Python でサポートしているのは一次元配列のみです。"
+#: plpy_exec.c:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "トリガー行を変更する際に"
 
-#: plpython.c:2340
-msgid "could not create new dictionary"
-msgstr "新しいディレクトリを作れません"
+#: plpy_exec.c:839
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "終了していないサブトランザクションを強制的にアボートしています"
 
-#: plpython.c:2435
-msgid "could not create bytes representation of Python object"
-msgstr "バイト表現の Python オブジェクトを生成できませんでした"
+#: plpy_main.c:100
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "セッションにおいて Python のメジャーバージョンが合致しません"
 
-#: plpython.c:2533
-msgid "could not create string representation of Python object"
-msgstr "文字列表現の Python オブジェクトを生成できませんでした"
+#: plpy_main.c:101
+#, c-format
+msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
+msgstr "このセッションではすでに Python のメジャーバージョン %d が使われていましたが、ここで Python のメジャーバージョン %d を使おうとしています。"
 
-#: plpython.c:2544
-msgid ""
-"could not convert Python object into cstring: Python string representation "
-"appears to contain null bytes"
-msgstr ""
-"Python オブジェクトを cstring に変換できませんでした：Python の文字列表現が "
-"null バイトを持つことになってしまいます"
+#: plpy_main.c:103
+#, c-format
+msgid "Start a new session to use a different Python major version."
+msgstr "Python の異なったメジャーバージョンを使う場合は、新しいセッションを開始してください"
 
-#: plpython.c:2578
-msgid ""
-"return value of function with array return type is not a Python sequence"
-msgstr "戻り値が配列である関数の戻り値が Python シーケンスではありません"
+#: plpy_main.c:118
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "初期化中に捕獲できないエラーがありました"
 
-#: plpython.c:2654
+#: plpy_main.c:141
 #, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "マッピング上にキー \"%s\" が見つかりません"
+msgid "could not import \"__main__\" module"
+msgstr "\"__main__\" モジュールをインポートできませんでした"
 
-#: plpython.c:2655
-msgid ""
-"To return null in a column, add the value None to the mapping with the key "
-"named after the column."
-msgstr ""
-"カラムに null を入れて返すには、カラムの後につけた名前をキーとして、マッピン"
-"グに None 値を追加してください"
+#: plpy_main.c:146
+#, c-format
+msgid "could not create globals"
+msgstr "globalsを作成できませんでした"
 
-#: plpython.c:2703
-msgid "length of returned sequence did not match number of columns in row"
-msgstr "返されたシーケンスの長さが、その行のカラム数と異なります"
+#: plpy_main.c:150
+#, c-format
+msgid "could not initialize globals"
+msgstr "グローバル変数(globals)を初期化できませんでした"
 
-#: plpython.c:2803
+#: plpy_main.c:347
 #, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "属性 \"%s\" が Python オブジェクト中に存在しません"
+msgid "PL/Python function \"%s\""
+msgstr "PL/Python 関数 \"%s\""
 
-#: plpython.c:2804
-msgid ""
-"To return null in a column, let the returned object have an attribute named "
-"after column with value None."
-msgstr ""
-"カラムに null を入れて返す場合は、そのカラムの後につけた名前で表される属性が"
-"値として None を持ち、返されるオブジェクトがその属性を含むようにしてください"
+#: plpy_main.c:354
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "PL/Python の無名コードブロック"
 
-#: plpython.c:3123
+#: plpy_planobject.c:126
+#, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status は引数を取りません"
 
-#: plpython.c:3247
+#: 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:253 plpy_plpymodule.c:257
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "SPI例外を生成できませんでした"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "plpy.elogで引数を展開することができませんでした"
+
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "plpy.elog でエラーメッセージをパースできませんでした"
+
+#: plpy_procedure.c:194
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr "トリガー関数はトリガーとしてのみコールできます"
+
+#: plpy_procedure.c:199 plpy_typeio.c:406
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "PL/Python 関数は %s 型を返せません"
+
+#: plpy_procedure.c:281
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "PL/Python 関数は %s 型を受け付けません"
+
+#: plpy_procedure.c:377
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "PL/Python 関数 \"%s\" をコンパイルできません"
+
+#: plpy_procedure.c:380
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "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:56
+#, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "plpy.prepare の第二引数はシーケンスでなければなりません"
 
-#: plpython.c:3297
+#: plpy_spi.c:105
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: %d 番目の型名が文字列ではありません"
 
-#: plpython.c:3329
+#: plpy_spi.c:137
+#, c-format
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare は複合型をサポートしていません"
 
-#: plpython.c:3419
+#: plpy_spi.c:187
+#, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute はクエリーもしくは実行計画を期待していました"
 
-#: plpython.c:3438
+#: plpy_spi.c:206
+#, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute は第二引数としてシーケンスを取ります"
 
-#: plpython.c:3454
-msgid "could not execute plan"
-msgstr "プランを実行できませんでした"
-
-#: plpython.c:3457
-#, 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"
-
-#: plpython.c:3599
+#: plpy_spi.c:330
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan が失敗しました：%s"
 
-#: plpython.c:3677
+#: plpy_spi.c:372
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute が失敗しました：%s"
 
-#: plpython.c:3732
+#: plpy_spi.c:439
+#, c-format
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "PLy_spi_execute_fetch_result で認識できないエラーを検出しました"
 
-#: plpython.c:3794
+#: plpy_subxactobject.c:122
+#, c-format
 msgid "this subtransaction has already been entered"
 msgstr "このサブトランザクションは到達済みです"
 
-#: plpython.c:3800 plpython.c:3852
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#, c-format
 msgid "this subtransaction has already been exited"
 msgstr "このサブトランザクションは終了済みです"
 
-#: plpython.c:3846
+#: plpy_subxactobject.c:174
+#, c-format
 msgid "this subtransaction has not been entered"
 msgstr "このサブトランザクションには到達しません"
 
-#: plpython.c:3858
+#: plpy_subxactobject.c:186
+#, c-format
 msgid "there is no subtransaction to exit from"
 msgstr "終了するためのサブトランザクションがありません"
 
-#: plpython.c:3940
-msgid "could not add the spiexceptions module"
-msgstr "spiexceptionsモジュールを追加できませんでした"
+#: plpy_typeio.c:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "新しいディレクトリを作れません"
 
-#: plpython.c:4017
-msgid "Python major version mismatch in session"
-msgstr "セッションにおいて Python のメジャーバージョンが合致しません"
+#: plpy_typeio.c:408
+#, c-format
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr "PL/Python は行タイプ配列への変換をサポートしていません"
 
-#: plpython.c:4018
+#: plpy_typeio.c:584
 #, c-format
-msgid ""
-"This session has previously used Python major version %d, and it is now "
-"attempting to use Python major version %d."
-msgstr ""
-"このセッションではすでに Python のメジャーバージョン %d が使われていました"
-"が、ここで Python のメジャーバージョン %d を使おうとしています。"
+msgid "cannot convert multidimensional array to Python list"
+msgstr "多次元配列を Python の list に変換できません"
 
-#: plpython.c:4020
-msgid "Start a new session to use a different Python major version."
-msgstr ""
-"Python の異なったメジャーバージョンを使う場合は、新しいセッションを開始してく"
-"ださい"
+#: plpy_typeio.c:585
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python でサポートしているのは一次元配列のみです。"
 
-#: plpython.c:4035
-msgid "untrapped error in initialization"
-msgstr "初期化中に捕獲できないエラーがありました"
+#: plpy_typeio.c:591
+#, c-format
+msgid "could not create new Python list"
+msgstr "新しいPythonリストを作成できませんでした"
 
-#: plpython.c:4063
-msgid "could not import \"__main__\" module"
-msgstr "\"__main__\" モジュールをインポートできませんでした"
+#: plpy_typeio.c:650
+#, c-format
+msgid "could not create bytes representation of Python object"
+msgstr "バイト表現の Python オブジェクトを生成できませんでした"
 
-#: plpython.c:4070
-msgid "could not initialize globals"
-msgstr "グローバル変数(globals)を初期化できませんでした"
+#: plpy_typeio.c:742
+#, c-format
+msgid "could not create string representation of Python object"
+msgstr "文字列表現の Python オブジェクトを生成できませんでした"
 
-#: plpython.c:4183
-msgid "could not parse error message in plpy.elog"
-msgstr "plpy.elog でエラーメッセージをパースできませんでした"
+#: plpy_typeio.c:753
+#, c-format
+msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
+msgstr "Python オブジェクトを cstring に変換できませんでした：Python の文字列表現が null バイトを持つことになってしまいます"
 
-#: plpython.c:4207 plpython.c:4437 plpython.c:4438 plpython.c:4439
-#: plpython.c:4440
+#: plpy_typeio.c:787
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "return value of function with array return type is not a Python sequence"
+msgstr "戻り値が配列である関数の戻り値が Python シーケンスではありません"
 
-#: plpython.c:4794
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr ""
-"Python の Unicode オブジェクトを PostgreSQL サーバのエンコーディングに変換で"
-"きませんでした"
+#: plpy_typeio.c:886
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "マッピング上にキー \"%s\" が見つかりません"
 
-#~ msgid "PyCObject_AsVoidPtr() failed"
-#~ msgstr "PyCObject_AsVoidPtr() に失敗しました"
+#: plpy_typeio.c:887
+#, 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 値を追加してください"
 
-#~ msgid "PyCObject_FromVoidPtr() failed"
-#~ msgstr "PyCObject_FromVoidPtr() に失敗しました"
+#: plpy_typeio.c:935
+#, c-format
+msgid "length of returned sequence did not match number of columns in row"
+msgstr "返されたシーケンスの長さが、その行のカラム数と異なります"
 
-#~ msgid "transaction aborted"
-#~ msgstr "トランザクションがアボートしました"
+#: plpy_typeio.c:1043
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "属性 \"%s\" が Python オブジェクト中に存在しません"
+
+#: plpy_typeio.c:1044
+#, 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 を持ち、返されるオブジェクトがその属性を含むようにしてください"
+
+#: plpy_util.c:70
+#, c-format
+msgid "could not convert Python Unicode object to bytes"
+msgstr "PythonのUnicodeオブジェクトをバイトに変換できませんでした"
+
+#: plpy_util.c:75
+#, c-format
+msgid "could not extract bytes from encoded string"
+msgstr "符号化された文字列からバイトを抽出できませんでした"
+
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "PyCObject_AsVoidPtr() に失敗しました"
 
 #~ msgid "invalid arguments for plpy.prepare"
 #~ msgstr "plpy.prepare の引数が不正です"
 
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "PyCObject_FromVoidPtr() に失敗しました"
+
 #~ msgid "unrecognized error in PLy_spi_prepare"
 #~ msgstr "PLy_spi_prepare で認識できないエラーを検出しました"
 
-#~ msgid "unrecognized error in PLy_spi_execute_plan"
-#~ msgstr "PLy_spi_execute_plan で認識できないエラーを検出しました"
-
-#~ msgid "unrecognized error in PLy_spi_execute_query"
-#~ msgstr "PLy_spi_execute_query で認識できないエラーを検出しました"
+#~ msgid "transaction aborted"
+#~ msgstr "トランザクションがアボートしました"
 
 #~ msgid "could not create procedure cache"
 #~ msgstr "手続き用キャッシュ(procedure cache)を生成できませんでした"
@@ -358,3 +439,9 @@ msgstr ""
 
 #~ msgid "out of memory"
 #~ msgstr "メモリ不足です"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "PLy_spi_execute_plan で認識できないエラーを検出しました"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "PLy_spi_execute_query で認識できないエラーを検出しました"
diff --git a/src/pl/plpython/po/pl.po b/src/pl/plpython/po/pl.po
new file mode 100644
index 00000000000..717233ce0d4
--- /dev/null
+++ b/src/pl/plpython/po/pl.po
@@ -0,0 +1,420 @@
+# plpython message translation file for plpython
+# 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.
+msgid ""
+msgstr ""
+"Project-Id-Version: plpython (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2013-01-29 13:39+0000\n"
+"PO-Revision-Date: 2012-09-19 21:28+0200\n"
+"Last-Translator: Begina Felicysym <[email protected]>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#: plpy_cursorobject.c:98
+#, c-format
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor oczekuje kwerendy lub planu"
+
+#: plpy_cursorobject.c:171
+#, c-format
+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:222
+#, c-format
+msgid "could not execute plan"
+msgstr "nie można wykonać planu"
+
+#: plpy_cursorobject.c:190 plpy_spi.c:225
+#, c-format
+msgid "Expected sequence of %d argument, got %d: %s"
+msgid_plural "Expected sequence of %d arguments, got %d: %s"
+msgstr[0] "Oczekiwano sekwencji z %d argumentem, mamy %d: %s"
+msgstr[1] "Oczekiwano sekwencji z %d argumentami, mamy %d: %s"
+msgstr[2] "Oczekiwano sekwencji z %d argumentami, mamy %d: %s"
+
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "iteracja zamkniętego kursora"
+
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "iteracja kursora w przerwanej podtransakcji"
+
+#: plpy_cursorobject.c:407
+#, c-format
+msgid "fetch from a closed cursor"
+msgstr "pobranie z zamkniętego kursora"
+
+#: plpy_cursorobject.c:486
+#, c-format
+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
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plpy_exec.c:90
+#, c-format
+msgid "unsupported set function return mode"
+msgstr "nieobsługiwany tryb zwracania przez funkcję grupy"
+
+#: plpy_exec.c:91
+#, 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."
+
+#: plpy_exec.c:103
+#, c-format
+msgid "returned object cannot be iterated"
+msgstr "zwrócony obiekt nie może być przeiterowany"
+
+#: plpy_exec.c:104
+#, c-format
+msgid "PL/Python set-returning functions must return an iterable object."
+msgstr "funkcje PL/Python zwracające grupę muszą zwracać iterowalny obiekt."
+
+#: plpy_exec.c:129
+#, c-format
+msgid "error fetching next item from iterator"
+msgstr "błąd pobierania następnego elementu z iteratora"
+
+#: plpy_exec.c:164
+#, c-format
+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:288 plpy_exec.c:314
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "nieoczekiwana wartość zwracana przez procedury wyzwalacza"
+
+#: plpy_exec.c:289
+#, c-format
+msgid "Expected None or a string."
+msgstr "Oczekiwano None lub ciąg znaków."
+
+#: plpy_exec.c:304
+#, 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:315
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Oczekiwano None, \"OK\", \"SKIP\", lub \"MODIFY\"."
+
+#: plpy_exec.c:396
+#, c-format
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "nie powiodło się PyList_SetItem() podczas ustawiania argumentów"
+
+#: plpy_exec.c:400
+#, c-format
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "nie powiodło się PyDict_SetItemString() podczas ustawiania argumentów"
+
+#: plpy_exec.c:412
+#, 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:450
+#, c-format
+msgid "while creating return value"
+msgstr "podczas tworzenia wartości zwracanej"
+
+#: plpy_exec.c:474
+#, 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:664
+#, c-format
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "usunięto TD[\"new\"], nie można zmienić wiersza"
+
+#: plpy_exec.c:667
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] nie jest słownikiem"
+
+#: plpy_exec.c:691
+#, 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
+#, 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:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "podczas modyfikowania wiersza wyzwalacza"
+
+#: plpy_exec.c:839
+#, 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:101
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "niezgodna wersja główna Python w sesji"
+
+#: plpy_main.c:102
+#, 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:104
+#, 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:119
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "niewyłapany błąd w inicjacji"
+
+#: plpy_main.c:142
+#, c-format
+msgid "could not import \"__main__\" module"
+msgstr "nie można zaimportować modułu \"__main__\""
+
+#: plpy_main.c:147
+#, c-format
+msgid "could not create globals"
+msgstr "nie można utworzyć zmiennych globalnych"
+
+#: plpy_main.c:151
+#, c-format
+msgid "could not initialize globals"
+msgstr "nie można zainicjować zmiennych globalnych"
+
+#: plpy_main.c:351
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "funkcja PL/Python \"%s\""
+
+#: plpy_main.c:358
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "anonimowy blok kodu PL/Python"
+
+#: plpy_planobject.c:126
+#, c-format
+msgid "plan.status takes no arguments"
+msgstr "plan.status nie przyjmuje żadnych argumentów"
+
+#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#, c-format
+msgid "could not import \"plpy\" module"
+msgstr "nie można zaimportować modułu \"plpy\""
+
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "nie udało się dodać modułu spiexceptions"
+
+#: plpy_plpymodule.c:217
+#, c-format
+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
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "nie można wygenerować wyjątków SPI"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "nie można rozpakować argumentów w plpy.elog"
+
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "nie można przetworzyć komunikatu błędu w plpy.elog"
+
+#: plpy_procedure.c:199
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr "procedury wyzwalaczy mogą być wywoływane jedynie przez wyzwalacze"
+
+#: plpy_procedure.c:204 plpy_typeio.c:406
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "funkcje PL/Python nie mogą zwracać wartości typu %s"
+
+#: plpy_procedure.c:286
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "funkcje PL/Python nie obsługują typu %s"
+
+#: plpy_procedure.c:382
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "nie powiodła się kompilacja funkcji PL/Python \"%s\""
+
+#: plpy_procedure.c:385
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "nie udało się skompilować anonimowego bloku kodu 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 "polecenie nie utworzyło zbioru wynikowego"
+
+#: plpy_spi.c:56
+#, c-format
+msgid "second argument of plpy.prepare must be a sequence"
+msgstr "drugi argument plpy.prepare musi być sekwencją"
+
+#: plpy_spi.c:105
+#, c-format
+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:137
+#, c-format
+msgid "plpy.prepare does not support composite types"
+msgstr "plpy.prepare nie obsługuje typów złożonych"
+
+#: plpy_spi.c:187
+#, c-format
+msgid "plpy.execute expected a query or a plan"
+msgstr "plpy.execute oczekuje kwerendy lub planu"
+
+#: plpy_spi.c:206
+#, c-format
+msgid "plpy.execute takes a sequence as its second argument"
+msgstr "plpy.execute przyjmuje sekwencję jako drugi argument"
+
+#: plpy_spi.c:330
+#, c-format
+msgid "SPI_execute_plan failed: %s"
+msgstr "nie powiódł się SPI_execute_plan: %s"
+
+#: plpy_spi.c:372
+#, c-format
+msgid "SPI_execute failed: %s"
+msgstr "nie powiódł się SPI_execute: %s"
+
+#: plpy_spi.c:439
+#, c-format
+msgid "unrecognized error in PLy_spi_execute_fetch_result"
+msgstr "nierozpoznany błąd w PLy_spi_execute_fetch_result"
+
+#: plpy_subxactobject.c:122
+#, c-format
+msgid "this subtransaction has already been entered"
+msgstr "ta podtransakcja już została wprowadzona"
+
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
+#, c-format
+msgid "this subtransaction has already been exited"
+msgstr "ta podtransakcja już została zakończona"
+
+#: plpy_subxactobject.c:174
+#, c-format
+msgid "this subtransaction has not been entered"
+msgstr "ta podtransakcja nie została wprowadzona"
+
+#: plpy_subxactobject.c:186
+#, c-format
+msgid "there is no subtransaction to exit from"
+msgstr "brak podtransakcji by z niej wyjść"
+
+#: plpy_typeio.c:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "nie można utworzyć nowego słownika"
+
+#: plpy_typeio.c:408
+#, 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:584
+#, c-format
+msgid "cannot convert multidimensional array to Python list"
+msgstr "nie można skonwertować tablicy wielowymiarowej na listę Python"
+
+#: plpy_typeio.c:585
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python obsługuje tylko jednowymiarowe tablice."
+
+#: plpy_typeio.c:591
+#, c-format
+msgid "could not create new Python list"
+msgstr "nie można utworzyć nowej listy Python"
+
+#: plpy_typeio.c:650
+#, c-format
+msgid "could not create bytes representation of Python object"
+msgstr "nie można utworzyć reprezentacji bajtowej obiektu Python"
+
+#: plpy_typeio.c:742
+#, c-format
+msgid "could not create string representation of Python object"
+msgstr "nie można utworzyć reprezentacji znakowej obiektu Python"
+
+#: plpy_typeio.c:753
+#, 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:787
+#, 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:886
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "nie odnaleziono klucza \"%s\" w mapowaniu"
+
+#: plpy_typeio.c:887
+#, 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:935
+#, 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:1043
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "atrybut \"%s\" nie istnieje w obiekcie Python"
+
+#: plpy_typeio.c:1044
+#, 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."
+
+#: plpy_util.c:70
+#, c-format
+msgid "could not convert Python Unicode object to bytes"
+msgstr "nie można zmienić obiektu unikodowego Python na bajty"
+
+#: plpy_util.c:75
+#, c-format
+msgid "could not extract bytes from encoded string"
+msgstr "nie można wyciągnąć bajtów z kodowanego ciągu znaków"
diff --git a/src/pl/plpython/po/pt_BR.po b/src/pl/plpython/po/pt_BR.po
index 5296d9fad87..2f64dcacf1d 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-2010.
+# Euler Taveira de Oliveira <[email protected]>, 2009-2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-09-09 10:18-0300\n"
+"POT-Creation-Date: 2012-08-18 17:47-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"
@@ -17,319 +17,403 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: plpython.c:424
+#: plpy_cursorobject.c:98
 #, c-format
-msgid "PL/Python function \"%s\""
-msgstr "função PL/Python \"%s\""
-
-#: plpython.c:430
-msgid "PL/Python anonymous code block"
-msgstr "bloco de código PL/Python anônimo"
-
-#: plpython.c:437
-msgid "while modifying trigger row"
-msgstr "ao modificar registro de gatilho"
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor esperava uma consulta ou um plano"
 
-#: plpython.c:444
-msgid "while creating return value"
-msgstr "ao criar valor de retorno"
-
-#: plpython.c:613 plpython.c:639
-msgid "unexpected return value from trigger procedure"
-msgstr "função de gatilho retornou valor inesperado"
-
-#: plpython.c:614
-msgid "Expected None or a string."
-msgstr "None ou uma cadeia de caracteres era esperado."
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor tem uma sequência como seu segundo argumento"
 
-#: plpython.c:629
-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_cursorobject.c:187 plpy_spi.c:223
+#, c-format
+msgid "could not execute plan"
+msgstr "não pôde executar plano"
 
-#: plpython.c:640
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "Era esperado None, \"OK\", \"SKIP\" ou \"MODIFY\"."
+#: plpy_cursorobject.c:190 plpy_spi.c:226
+#, c-format
+msgid "Expected sequence of %d argument, got %d: %s"
+msgid_plural "Expected sequence of %d arguments, got %d: %s"
+msgstr[0] "Sequência esperada de %d argumento, recebeu %d: %s"
+msgstr[1] "Sequência esperada de %d argumentos, recebeu %d: %s"
 
-#: plpython.c:692
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] removido, não pode modificar registro"
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "iterando um cursor fechado"
 
-#: plpython.c:695
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] não é um dicionário"
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "iterando um cursor em uma subtransação abortada"
 
-#: plpython.c:719
+#: plpy_cursorobject.c:407
 #, 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"
+msgid "fetch from a closed cursor"
+msgstr "busca em um cursor fechado"
 
-#: plpython.c:725
+#: plpy_cursorobject.c:486
 #, 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"
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "fechando um cursor em uma subtransação abortada"
 
-#: plpython.c:819
-msgid "could not create new dictionary while building trigger arguments"
-msgstr "não pode criar novo dicionário ao construir argumentos do gatilho"
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: plpython.c:1026
+#: plpy_exec.c:91
+#, c-format
 msgid "unsupported set function return mode"
 msgstr "modo de retorno da função que retorna conjunto não é suportado"
 
-#: plpython.c:1027
-msgid ""
-"PL/Python set-returning functions only support returning only value per call."
-msgstr ""
-"funções PL/Python que retornam conjunto só suportam retornar um valor por "
-"chamada."
+#: plpy_exec.c:92
+#, c-format
+msgid "PL/Python set-returning functions only support returning only value per call."
+msgstr "funções PL/Python que retornam conjunto só suportam retornar um valor por chamada."
 
-#: plpython.c:1039
+#: plpy_exec.c:104
+#, c-format
 msgid "returned object cannot be iterated"
 msgstr "objeto retornado não pode ser iterado"
 
-#: plpython.c:1040
+#: plpy_exec.c:105
+#, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
-msgstr ""
-"funções PL/Python que retornam conjunto devem retornar um objeto iterável."
+msgstr "funções PL/Python que retornam conjunto devem retornar um objeto iterável."
 
-#: plpython.c:1067
+#: plpy_exec.c:130
+#, c-format
 msgid "error fetching next item from iterator"
 msgstr "erro ao buscar próximo item do iterador"
 
-#: plpython.c:1089
+#: plpy_exec.c:165
+#, c-format
 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"
 
-#: plpython.c:1246
+#: plpy_exec.c:289 plpy_exec.c:315
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "função de gatilho retornou valor inesperado"
+
+#: plpy_exec.c:290
+#, c-format
+msgid "Expected None or a string."
+msgstr "None ou uma cadeia de caracteres era esperado."
+
+#: plpy_exec.c:305
+#, 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
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Era esperado None, \"OK\", \"SKIP\" ou \"MODIFY\"."
+
+#: plpy_exec.c:397
+#, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() falhou ao definir argumentos"
 
-#: plpython.c:1250
+#: plpy_exec.c:401
+#, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() falhou ao definir argumentos"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() falhou"
-
-#: plpython.c:1427
-msgid "trigger functions can only be called as triggers"
-msgstr "funções de gatilho só podem ser chamadas como gatilhos"
+#: plpy_exec.c:413
+#, 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"
 
-#: plpython.c:1431 plpython.c:1815
+#: plpy_exec.c:451
 #, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "funções PL/Python não podem retornar tipo %s"
+msgid "while creating return value"
+msgstr "ao criar valor de retorno"
 
-#: plpython.c:1509
+#: plpy_exec.c:475
 #, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "funções PL/Python não podem aceitar tipo %s"
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "não pode criar novo dicionário ao construir argumentos do gatilho"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() falhou"
+#: plpy_exec.c:665
+#, c-format
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] removido, não pode modificar registro"
 
-#: plpython.c:1606
+#: plpy_exec.c:668
 #, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "não pôde compilar função PL/Python \"%s\""
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] não é um dicionário"
 
-#: plpython.c:1817
-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_exec.c:692
+#, 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"
 
-#: plpython.c:2020
-msgid "cannot convert multidimensional array to Python list"
-msgstr "não pode converter matriz multidimensional para lista Python"
+#: plpy_exec.c:698
+#, 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"
 
-#: plpython.c:2021
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr "PL/Python só suporta matrizes unidimensionais."
+#: plpy_exec.c:779
+#, c-format
+msgid "while modifying trigger row"
+msgstr "ao modificar registro de gatilho"
 
-#: plpython.c:2057
-msgid "could not create new dictionary"
-msgstr "não pôde criar novo dicionário"
+#: plpy_exec.c:840
+#, 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"
 
-#: plpython.c:2133
-msgid "could not create bytes representation of Python object"
-msgstr "não pôde criar representação de bytes de um objeto Python"
+#: plpy_main.c:102
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "versão do Python não corresponde na sessão"
 
-#: plpython.c:2189
-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_main.c:103
+#, 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."
 
-#: plpython.c:2200
-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_main.c:105
+#, 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."
 
-#: plpython.c:2233
-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_main.c:120
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "erro não interceptado na inicialização"
 
-#: plpython.c:2308
+#: plpy_main.c:143
 #, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "chave \"%s\" não foi encontrada no mapeamento"
+msgid "could not import \"__main__\" module"
+msgstr "não pôde importar módulo \"__main__\""
 
-#: plpython.c:2309
-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_main.c:148
+#, c-format
+msgid "could not create globals"
+msgstr "não pôde criar globais"
 
-#: plpython.c:2352
-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_main.c:152
+#, c-format
+msgid "could not initialize globals"
+msgstr "não pôde inicializar globais"
 
-#: plpython.c:2445
+#: plpy_main.c:352
 #, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "atributo \"%s\" não existe no objeto Python"
+msgid "PL/Python function \"%s\""
+msgstr "função PL/Python \"%s\""
 
-#: plpython.c:2446
-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."
+#: plpy_main.c:359
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "bloco de código PL/Python anônimo"
 
-#: plpython.c:2680
+#: plpy_planobject.c:126
+#, c-format
 msgid "plan.status takes no arguments"
 msgstr "plan.status não contém argumentos"
 
-#: plpython.c:2804 plpython.c:2947
-msgid "transaction aborted"
-msgstr "transação interrompida"
+#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#, c-format
+msgid "could not import \"plpy\" module"
+msgstr "não pôde importar módulo \"plpy\""
+
+#: plpy_plpymodule.c:196
+#, c-format
+msgid "could not add the spiexceptions module"
+msgstr "não pôde adicionar o módulo spiexceptions"
+
+#: plpy_plpymodule.c:217
+#, c-format
+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
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "não pôde gerar exceções da SPI"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "não pode desempacotar argumentos em plpy.elog"
 
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "argumentos inválidos para plpy.prepare"
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "não pode analisar mensagem de erro em plpy.elog"
 
-#: plpython.c:2818
+#: plpy_procedure.c:200
+#, 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:408
+#, 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
+#, 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
+#, 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
+#, 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"
+
+#: plpy_resultobject.c:145 plpy_resultobject.c:165 plpy_resultobject.c:185
+#, c-format
+msgid "command did not produce a result set"
+msgstr "comando não produziu um conjunto de resultados"
+
+#: plpy_spi.c:57
+#, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "segundo argumento de plpy.prepare deve ser uma sequência"
 
-#: plpython.c:2868
+#: plpy_spi.c:106
 #, c-format
 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"
+msgstr "plpy.prepare: nome do tipo na posição %d não é uma cadeia de caracteres"
 
-#: plpython.c:2895
+#: plpy_spi.c:138
+#, c-format
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare não suporta tipos compostos"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "erro desconhecido em PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpy_spi.c:188
+#, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera uma consulta ou um plano"
 
-#: plpython.c:2977
+#: plpy_spi.c:207
+#, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute recebe uma sequência como segundo argumento"
 
-#: plpython.c:2993
-msgid "could not execute plan"
-msgstr "não pôde executar plano"
-
-#: plpython.c:2996
-#, c-format
-msgid "Expected sequence of %d argument, got %d: %s"
-msgid_plural "Expected sequence of %d arguments, got %d: %s"
-msgstr[0] "Sequência esperada de %d argumento, recebeu %d: %s"
-msgstr[1] "Sequência esperada de %d argumentos, recebeu %d: %s"
-
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "erro desconhecido em PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpy_spi.c:331
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan falhou: %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "erro desconhecido em PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpy_spi.c:373
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute falhou: %s"
 
-#: plpython.c:3185
+#: plpy_spi.c:440
+#, c-format
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "erro desconhecido em PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
-msgid "Python major version mismatch in session"
-msgstr "versão do Python não corresponde na sessão"
+#: plpy_subxactobject.c:122
+#, c-format
+msgid "this subtransaction has already been entered"
+msgstr "essa subtransação já foi iniciada"
 
-#: plpython.c:3240
+#: plpy_subxactobject.c:128 plpy_subxactobject.c:180
 #, 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."
+msgid "this subtransaction has already been exited"
+msgstr "essa subtransação já foi concluída"
 
-#: plpython.c:3242
-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_subxactobject.c:174
+#, c-format
+msgid "this subtransaction has not been entered"
+msgstr "essa subtransação não foi iniciada"
 
-#: plpython.c:3257
-msgid "untrapped error in initialization"
-msgstr "erro não interceptado na inicialização"
+#: plpy_subxactobject.c:186
+#, c-format
+msgid "there is no subtransaction to exit from"
+msgstr "não há uma subtransação a ser concluída"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "não pôde criar cache da função"
+#: plpy_typeio.c:293
+#, c-format
+msgid "could not create new dictionary"
+msgstr "não pôde criar novo dicionário"
 
-#: plpython.c:3272
-msgid "could not import \"__main__\" module"
-msgstr "não pôde importar módulo \"__main__\""
+#: plpy_typeio.c:410
+#, 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."
 
-#: plpython.c:3279
-msgid "could not initialize globals"
-msgstr "não pôde inicializar globais"
+#: plpy_typeio.c:595
+#, c-format
+msgid "cannot convert multidimensional array to Python list"
+msgstr "não pode converter matriz multidimensional para lista Python"
 
-#: plpython.c:3397
-msgid "could not parse error message in plpy.elog"
-msgstr "não pode analisar mensagem de erro em plpy.elog"
+#: plpy_typeio.c:596
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python só suporta matrizes unidimensionais."
 
-#: plpython.c:3526 plpython.c:3530
+#: plpy_typeio.c:602
 #, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
+msgid "could not create new Python list"
+msgstr "não pôde criar nova lista Python"
 
-#: plpython.c:3527
+#: plpy_typeio.c:661
 #, c-format
-msgid "%s"
-msgstr "%s"
+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:753
+#, 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"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "sem memória"
+#: plpy_typeio.c:764
+#, 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:798
+#, 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"
 
-#: plpython.c:3694
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr "não pôde converter objeto Unicode Python para codificação do servidor PostgreSQL"
+#: plpy_typeio.c:897
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "chave \"%s\" não foi encontrada no mapeamento"
+
+#: plpy_typeio.c:898
+#, 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:946
+#, 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:1054
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "atributo \"%s\" não existe no objeto Python"
+
+#: plpy_typeio.c:1055
+#, 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."
+
+#: plpy_util.c:70
+#, c-format
+msgid "could not convert Python Unicode object to bytes"
+msgstr "não pôde converter objeto Unicode Python para bytes"
+
+#: plpy_util.c:75
+#, c-format
+msgid "could not extract bytes from encoded string"
+msgstr "não pôde extrair bytes de cadeia de caracteres codificada"
diff --git a/src/pl/plpython/po/ro.po b/src/pl/plpython/po/ro.po
index 0d5f8c32cdb..04d2313013d 100644
--- a/src/pl/plpython/po/ro.po
+++ b/src/pl/plpython/po/ro.po
@@ -5,230 +5,224 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-09-04 19:58+0000\n"
-"PO-Revision-Date: 2010-09-26 19:49-0000\n"
-"Last-Translator: Max <[email protected]>\n"
-"Language-Team: Română <[email protected]>\n"
+"POT-Creation-Date: 2011-11-09 20:40+0000\n"
+"PO-Revision-Date: 2011-11-22 11:36-0000\n"
+"Last-Translator: Gheorge Rosca Codreanu <[email protected]>\n"
+"Language-Team: Română <[email protected]>\n"
+"Language: \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==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+"X-Poedit-Language: Romanian\n"
+"X-Poedit-Country: ROMANIA\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "funcție PL/Python \"%s\""
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "bloc de cod PL/Python anonim"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "în timpul modificării triggerului de rând"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "în timpul creării valorii rezultat"
 
-#: plpython.c:613
-#: plpython.c:639
+#: plpython.c:707
+#: plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "procedura trigger a rezultat o valoare neașteptată"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "așteptam None sau un șir String"
 
-#: plpython.c:629
+#: plpython.c:723
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "funcția trigger PL/Python a rezultat \"MODIFY\" întro funcție trigger de tip DELETE  -- ignor"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Așteptam None, \"OK\", \"SKIP\", sau \"MODIFY\"."
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] șters, nu poate modifica rândul "
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] nu este un dicționar"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "TD[\"new\"] cheia dicționarului la poziția %d nu este un șir String"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "cheia \"%s\" găsită în TD[\"new\"] nu există ca și coloană în rândul care a activat triggerul"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "nu pot crea un nou dicționar în timp ce construiesc argumentele triggerului"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "mod de returnare a funcției set nesuportat"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid "PL/Python set-returning functions only support returning only value per call."
 msgstr "funcțiile PL/Python ce returnează doar seturi suportă doar o singură valoare returnată la fiecare apel."
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "obiectul returnat nu poate fi iterat"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "funcțiile PL/Python ce returnează seturi trebuie să aibă ca rezultat un obiect iterabil."
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "eroare la obținerea următorului element din iterator"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "funcția PL/Python cu rezultatul de tip \"void\" nu a returbat None"
 
-#: plpython.c:1246
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "intrerupere forţată a unei subtranzacţii din care nu s-a ieşit"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() a eșuat, în timpul creării argumentelor"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() a eșuat, în timpul creării argumentelor"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() a eșuat"
+#: plpython.c:1419
+msgid "function returning record called in context that cannot accept type record"
+msgstr "apel de funcție care are rezultat de tip rând într-un context care nu acceptă tipul rând"
 
-#: plpython.c:1427
+#: plpython.c:1653
 msgid "trigger functions can only be called as triggers"
 msgstr "funcţiile trigger pot fi apelate doar ca triggere"
 
-#: plpython.c:1431
-#: plpython.c:1815
+#: plpython.c:1658
+#: plpython.c:2131
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "funcțiile PL/Python nu pot returna tipul %s"
 
-#: plpython.c:1509
+#: plpython.c:1740
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "funcțiile PL/Python nu pot accepta tipul %s"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() a eșuat"
-
-#: plpython.c:1606
+#: plpython.c:1836
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "nu pot compila funcția PL/Python \"%s\""
 
-#: plpython.c:1817
+#: plpython.c:1839
+msgid "could not compile anonymous PL/Python code block"
+msgstr "nu pot compila codul bloc anonim PL/Python"
+
+#: plpython.c:2133
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python nu suportă conversia în array-uri de tip rând."
 
-#: plpython.c:2020
+#: plpython.c:2342
 msgid "cannot convert multidimensional array to Python list"
 msgstr "nu pot converti un array-ul  mai multe dimensiuni într-o listă Python"
 
-#: plpython.c:2021
+#: plpython.c:2343
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python suportă doar array-uri cu o dimensiune."
 
-#: plpython.c:2057
+#: plpython.c:2382
 msgid "could not create new dictionary"
 msgstr "nu pot crea un nou dicționar"
 
-#: plpython.c:2133
+#: plpython.c:2477
 msgid "could not create bytes representation of Python object"
 msgstr "nu pot crea reprezentarea octet a obiectului Python"
 
-#: plpython.c:2189
+#: plpython.c:2575
 msgid "could not create string representation of Python object"
 msgstr "nu pot crea reprezentarea șir String a obiectului Python"
 
-#: plpython.c:2200
+#: plpython.c:2586
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "nu pot converti obiectul Python într-un cstring: reprezentarea string a obiectului Python pare să conțină octeți nuli"
 
-#: plpython.c:2233
+#: plpython.c:2620
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "return value of function with array return type is not a Python sequence"
 
-#: plpython.c:2308
+#: plpython.c:2700
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "cheia \"%s\" nu e gasită în mapare"
 
-#: plpython.c:2309
+#: plpython.c:2701
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Pentru a obșine null într-o coloană, adăugați valoarea None la mapare cu cheia numită cu numele coloanei."
 
-#: plpython.c:2352
+#: plpython.c:2749
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "lungimea secvenței returnate nu se potrivește cu numărul de coloane din rând"
 
-#: plpython.c:2445
+#: plpython.c:2857
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "atributul \"%s\" nu există în obiectul Python"
 
-#: plpython.c:2446
+#: plpython.c:2858
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Pentru a abține null într-o coloană, obiectul returnat trebuie să aibă un atribut cu numele coloanei și cu valoarea None."
 
-#: plpython.c:2680
+#: plpython.c:3177
 msgid "plan.status takes no arguments"
 msgstr "plan.status nu acceptă argumente"
 
-#: plpython.c:2804
-#: plpython.c:2947
-msgid "transaction aborted"
-msgstr "tranzacție anulată"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "argumente invalide pentru plpy.prepare"
-
-#: plpython.c:2818
+#: plpython.c:3301
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "al doilea argument al plpy.prepare trebuie să fie o secvență"
 
-#: plpython.c:2868
+#: plpython.c:3351
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: numele tipului la poziția %d nu este un șir"
 
-#: plpython.c:2895
+#: plpython.c:3383
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare nu suportă tipul compozit"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "eroare necunoscută în PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpython.c:3473
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute aștepta o interogare sau un plan"
 
-#: plpython.c:2977
+#: plpython.c:3492
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute acceptă o secvență ca al doilea argument"
 
-#: plpython.c:2993
+#: plpython.c:3508
 msgid "could not execute plan"
 msgstr "nu pot executa planul"
 
-#: plpython.c:2996
+#: plpython.c:3511
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -236,77 +230,107 @@ msgstr[0] "Secvența așteptată a argumentului %d, a obținut %d: %s"
 msgstr[1] "Secvența așteptată a argumentelor %d, a obținut %d: %s"
 msgstr[2] "Secvența așteptată a argumentelor %d, a obținut %d: %s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "eroare necunoscută în PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpython.c:3653
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan a eșuat: %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "eroare necunoscută în PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpython.c:3731
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute a eșuat: %s"
 
-#: plpython.c:3185
+#: plpython.c:3786
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "eroare necunoscută în PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
+#: plpython.c:3848
+msgid "this subtransaction has already been entered"
+msgstr "am intrat deja în acestă subtranzacţie"
+
+#: plpython.c:3854
+#: plpython.c:3906
+msgid "this subtransaction has already been exited"
+msgstr "am ieşit deja din această subtranzacţie"
+
+#: plpython.c:3900
+msgid "this subtransaction has not been entered"
+msgstr "nu s-a intrat în această subtranzacţie"
+
+#: plpython.c:3912
+msgid "there is no subtransaction to exit from"
+msgstr "nu există nici o subtranzacţie din care să ieşim"
+
+#: plpython.c:3994
+msgid "could not add the spiexceptions module"
+msgstr "nu pot adăuga modulul spiexceptions "
+
+#: plpython.c:4077
 msgid "Python major version mismatch in session"
 msgstr "nepotrivire în sesiune de versiune majoră Python"
 
-#: plpython.c:3240
+#: plpython.c:4078
 #, c-format
 msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
 msgstr "Această sesiune a folosit versiunea majoră de Python %d și acum încearcă să folosească versiunea majoră de Python %d."
 
-#: plpython.c:3242
+#: plpython.c:4080
 msgid "Start a new session to use a different Python major version."
 msgstr "Începe o nouă sesiune pentru a folosi o versiune majoră de Python diferită"
 
-#: plpython.c:3257
+#: plpython.c:4095
 msgid "untrapped error in initialization"
 msgstr "eroare netratată la inițializare"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "nu pot crea procedura cache"
-
-#: plpython.c:3272
+#: plpython.c:4123
 msgid "could not import \"__main__\" module"
 msgstr "nu pot importa modulul \"__main__\""
 
-#: plpython.c:3279
+#: plpython.c:4130
 msgid "could not initialize globals"
 msgstr "nu pot inițializa globals"
 
-#: plpython.c:3397
+#: plpython.c:4243
 msgid "could not parse error message in plpy.elog"
 msgstr "nu pot analiza mesajul de eroare în plpy.elog"
 
-#: plpython.c:3526
-#: plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
-
-#: plpython.c:3527
+#: plpython.c:4267
+#: plpython.c:4499
+#: plpython.c:4500
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "memorie insuficientă"
-
-#: plpython.c:3694
+#: plpython.c:4854
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
 msgstr "nu pot converti obiectul Unicode Python Unicode în codificarea folosită de serverul PostgreSQL"
 
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "PyCObject_AsVoidPtr() a eșuat"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "PyCObject_FromVoidPtr() a eșuat"
+
+#~ msgid "transaction aborted"
+#~ msgstr "tranzacție anulată"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "argumente invalide pentru plpy.prepare"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "eroare necunoscută în PLy_spi_prepare"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "eroare necunoscută în PLy_spi_execute_plan"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "eroare necunoscută în PLy_spi_execute_query"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "nu pot crea procedura cache"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
+
+#~ msgid "out of memory"
+#~ msgstr "memorie insuficientă"
diff --git a/src/pl/plpython/po/ru.po b/src/pl/plpython/po/ru.po
new file mode 100644
index 00000000000..2ec009614d2
--- /dev/null
+++ b/src/pl/plpython/po/ru.po
@@ -0,0 +1,463 @@
+# Russian message translation file for plpython
+# Copyright (C) 2012 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Alexander Lakhin <[email protected]>, 2012.
+#
+# ChangeLog:
+#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <[email protected]>.
+#   - April 3, 2012: Bug fixes. Alexander Lakhin <[email protected]>.
+#   - February 18, 2012: Complete translation for 9.1. Alexander Lakhin <[email protected]>.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2012-08-06 12:39+0000\n"
+"PO-Revision-Date: 2012-08-06 18:19+0400\n"
+"Last-Translator: Alexander Lakhin <[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.4\n"
+
+#: plpy_cursorobject.c:98
+#, c-format
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor ожидает запрос или план"
+
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor принимает в качестве второго аргумента последовательность"
+
+#: plpy_cursorobject.c:187 plpy_spi.c:222
+#, c-format
+msgid "could not execute plan"
+msgstr "нельзя выполнить план"
+
+#: plpy_cursorobject.c:190 plpy_spi.c:225
+#, 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"
+msgstr[1] "Ожидалась последовательность из %d аргументов, получено %d: %s"
+msgstr[2] "Ожидалась последовательность из %d аргументов, получено %d: %s"
+
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "перемещение закрытого курсора"
+
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "перемещение курсора в прерванной подтранзакции"
+
+#: plpy_cursorobject.c:407
+#, c-format
+msgid "fetch from a closed cursor"
+msgstr "выборка из закрытого курсора"
+
+#: plpy_cursorobject.c:486
+#, c-format
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "закрытие курсора в прерванной подтранзакции"
+
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plpy_exec.c:90
+#, c-format
+msgid "unsupported set function return mode"
+msgstr "неподдерживаемый режим возврата для функции с результатом-множеством"
+
+#: plpy_exec.c:91
+#, c-format
+msgid ""
+"PL/Python set-returning functions only support returning only value per call."
+msgstr ""
+"Функции PL/Python с результатом-множеством могут возвращать только по одному "
+"значению за вызов."
+
+#: plpy_exec.c:103
+#, c-format
+msgid "returned object cannot be iterated"
+msgstr "возвращаемый объект не поддерживает итерации"
+
+#: plpy_exec.c:104
+#, c-format
+msgid "PL/Python set-returning functions must return an iterable object."
+msgstr ""
+"Функции PL/Python с результатом-множеством должны возвращать объекты с "
+"возможностью итерации."
+
+#: plpy_exec.c:129
+#, c-format
+msgid "error fetching next item from iterator"
+msgstr "ошибка получения следующего элемента из итератора"
+
+#: plpy_exec.c:164
+#, c-format
+msgid "PL/Python function with return type \"void\" did not return None"
+msgstr "функция PL/Python с типом результата \"void\" вернула не None"
+
+#: plpy_exec.c:288 plpy_exec.c:314
+#, c-format
+msgid "unexpected return value from trigger procedure"
+msgstr "триггерная процедура вернула недопустимое значение"
+
+#: plpy_exec.c:289
+#, c-format
+msgid "Expected None or a string."
+msgstr "Ожидалось None или строка."
+
+#: plpy_exec.c:304
+#, c-format
+msgid ""
+"PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
+msgstr ""
+"триггерная функция PL/Python вернула \"MODIFY\" в триггере DELETE -- "
+"игнорируется"
+
+#: plpy_exec.c:315
+#, c-format
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Ожидалось None, \"OK\", \"SKIP\" или \"MODIFY\"."
+
+#: plpy_exec.c:396
+#, c-format
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "ошибка в PyList_SetItem() при настройке аргументов"
+
+#: plpy_exec.c:400
+#, c-format
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "ошибка в PyDict_SetItemString() при настройке аргументов"
+
+#: plpy_exec.c:412
+#, c-format
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"функция, возвращающая запись, вызвана в контексте, не допускающем этот тип"
+
+#: plpy_exec.c:450
+#, c-format
+msgid "while creating return value"
+msgstr "при создании возвращаемого значения"
+
+#: plpy_exec.c:474
+#, c-format
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "не удалось создать словарь для передачи аргументов триггера"
+
+#: plpy_exec.c:664
+#, c-format
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "элемент TD[\"new\"] удалён -- изменить строку нельзя"
+
+#: plpy_exec.c:667
+#, c-format
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] - не словарь"
+
+#: plpy_exec.c:691
+#, c-format
+msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
+msgstr "ключ словаря TD[\"new\"] с порядковым номером %d не является строкой"
+
+#: plpy_exec.c:697
+#, 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:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "при изменении строки в триггере"
+
+#: plpy_exec.c:839
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "принудительное прерывание незавершённой подтранзакции"
+
+#: plpy_main.c:100
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "несовпадение базовой версии Python в сеансе"
+
+#: plpy_main.c:101
+#, c-format
+msgid ""
+"This session has previously used Python major version %d, and it is now "
+"attempting to use Python major version %d."
+msgstr ""
+"В данном сеансе до этого использовался Python базовой версии %d, а сейчас "
+"планируется использовать Python версии %d."
+
+#: plpy_main.c:103
+#, c-format
+msgid "Start a new session to use a different Python major version."
+msgstr ""
+"Чтобы переключиться на другую базовую версию Python, начните новый сеанс."
+
+#: plpy_main.c:118
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "необработанная ошибка при инициализации"
+
+#: plpy_main.c:141
+#, c-format
+msgid "could not import \"__main__\" module"
+msgstr "не удалось импортировать модуль \"__main__\""
+
+#: plpy_main.c:146
+#, c-format
+msgid "could not create globals"
+msgstr "не удалось создать глобальные данные"
+
+#: plpy_main.c:150
+#, c-format
+msgid "could not initialize globals"
+msgstr "не удалось инициализировать глобальные данные"
+
+#: plpy_main.c:347
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "функция PL/Python \"%s\""
+
+#: plpy_main.c:354
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "анонимный блок кода PL/Python"
+
+#: 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:253 plpy_plpymodule.c:257
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "не удалось сгенерировать исключения SPI"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "не удалось распаковать аргументы в plpy.elog"
+
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "не удалось разобрать сообщение об ошибке в plpy.elog"
+
+#: plpy_procedure.c:194
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr "триггерные функции могут вызываться только в триггерах"
+
+#: plpy_procedure.c:199 plpy_typeio.c:406
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "функции PL/Python не могут возвращать тип %s"
+
+#: plpy_procedure.c:281
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "функции PL/Python не могут принимать тип %s"
+
+#: plpy_procedure.c:377
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "не удалось скомпилировать функцию PL/Python \"%s\""
+
+#: plpy_procedure.c:380
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "не удалось скомпилировать анонимный блок кода 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:56
+#, c-format
+msgid "second argument of plpy.prepare must be a sequence"
+msgstr "вторым аргументом plpy.prepare должна быть последовательность"
+
+#: plpy_spi.c:105
+#, c-format
+msgid "plpy.prepare: type name at ordinal position %d is not a string"
+msgstr "plpy.prepare: имя типа с порядковым номером %d не является строкой"
+
+#: plpy_spi.c:137
+#, c-format
+msgid "plpy.prepare does not support composite types"
+msgstr "plpy.prepare не поддерживает составные типы"
+
+#: plpy_spi.c:187
+#, c-format
+msgid "plpy.execute expected a query or a plan"
+msgstr "plpy.execute ожидает запрос или план"
+
+#: plpy_spi.c:206
+#, c-format
+msgid "plpy.execute takes a sequence as its second argument"
+msgstr "plpy.execute принимает в качестве второго аргумента последовательность"
+
+#: plpy_spi.c:330
+#, c-format
+msgid "SPI_execute_plan failed: %s"
+msgstr "ошибка в SPI_execute_plan: %s"
+
+#: plpy_spi.c:372
+#, c-format
+msgid "SPI_execute failed: %s"
+msgstr "ошибка в SPI_execute: %s"
+
+#: plpy_spi.c:439
+#, c-format
+msgid "unrecognized error in PLy_spi_execute_fetch_result"
+msgstr "нераспознанная ошибка в PLy_spi_execute_fetch_result"
+
+#: 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:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "не удалось создать словарь"
+
+#: plpy_typeio.c:408
+#, c-format
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr "PL/Python не поддерживает преобразование в массивы кортежей."
+
+#: plpy_typeio.c:584
+#, c-format
+msgid "cannot convert multidimensional array to Python list"
+msgstr "преобразовать многомерный массив в список Python нельзя"
+
+#: plpy_typeio.c:585
+#, c-format
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python поддерживает только одномерные массивы."
+
+#: plpy_typeio.c:591
+#, c-format
+msgid "could not create new Python list"
+msgstr "не удалось создать список Python"
+
+#: plpy_typeio.c:650
+#, c-format
+msgid "could not create bytes representation of Python object"
+msgstr "не удалось создать байтовое представление объекта Python"
+
+#: plpy_typeio.c:742
+#, c-format
+msgid "could not create string representation of Python object"
+msgstr "не удалось создать строковое представление объекта Python"
+
+#: plpy_typeio.c:753
+#, 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:787
+#, c-format
+msgid ""
+"return value of function with array return type is not a Python sequence"
+msgstr ""
+"возвращаемое значение функции с результатом-массивом не является "
+"последовательностью"
+
+#: plpy_typeio.c:886
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "ключ \"%s\" не найден в сопоставлении"
+
+#: plpy_typeio.c:887
+#, 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 с "
+"ключом-именем колонки."
+
+#: plpy_typeio.c:935
+#, c-format
+msgid "length of returned sequence did not match number of columns in row"
+msgstr "длина возвращённой последовательности не равна числу колонок в строке"
+
+#: plpy_typeio.c:1043
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "в объекте Python не существует атрибут \"%s\""
+
+#: plpy_typeio.c:1044
+#, 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."
+
+#: plpy_util.c:70
+#, c-format
+msgid "could not convert Python Unicode object to bytes"
+msgstr "не удалось преобразовать объект Python Unicode в байты"
+
+#: plpy_util.c:75
+#, c-format
+msgid "could not extract bytes from encoded string"
+msgstr "не удалось извлечь байты из кодированной строки"
+
+#~ 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 09510e1cd22..b21c34d242f 100644
--- a/src/pl/plpython/po/zh_CN.po
+++ b/src/pl/plpython/po/zh_CN.po
@@ -7,331 +7,478 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-10-15 16:49+0000\n"
-"PO-Revision-Date: 2010-10-01 12:54+0800\n"
-"Last-Translator: Weibin <[email protected]>\n"
+"POT-Creation-Date: 2013-01-29 13:39+0000\n"
+"PO-Revision-Date: 2012-10-19 20:50+0800\n"
+"Last-Translator: Xiong He <[email protected]>\n"
 "Language-Team: Weibin <[email protected]>\n"
-"Language: \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"
 
-#: plpython.c:418
+#: plpy_cursorobject.c:98
 #, c-format
-msgid "PL/Python function \"%s\""
-msgstr "PL/Python函数\"%s\""
+msgid "plpy.cursor expected a query or a plan"
+msgstr "plpy.cursor期望一个查询或一个计划"
 
-#: plpython.c:425
-msgid "PL/Python anonymous code block"
-msgstr "PL/Python匿名代码块"
+#: plpy_cursorobject.c:171
+#, c-format
+msgid "plpy.cursor takes a sequence as its second argument"
+msgstr "plpy.cursor将一个序列作为它的第二个参数"
 
-#: plpython.c:432
-msgid "while modifying trigger row"
-msgstr "同时正在修改触发器记录"
+#: plpy_cursorobject.c:187 plpy_spi.c:222
+#, c-format
+msgid "could not execute plan"
+msgstr "无法执行计划"
 
-#: plpython.c:439
-msgid "while creating return value"
-msgstr "同时在创建返回值"
+#: plpy_cursorobject.c:190 plpy_spi.c:225
+#, 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"
+
+# sql_help.h:345
+#: plpy_cursorobject.c:340
+#, c-format
+msgid "iterating a closed cursor"
+msgstr "遍历一个关闭的游标"
+
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#, c-format
+msgid "iterating a cursor in an aborted subtransaction"
+msgstr "在终止的子事务里遍历一个游标"
+
+# sql_help.h:109
+#: plpy_cursorobject.c:407
+#, c-format
+msgid "fetch from a closed cursor"
+msgstr "从关闭的游标里获取结果"
+
+#: plpy_cursorobject.c:486
+#, c-format
+msgid "closing a cursor in an aborted subtransaction"
+msgstr "在终止的子事务里关闭一个游标"
 
-#: plpython.c:608 plpython.c:634
+#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:420
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plpy_exec.c:90
+#, c-format
+msgid "unsupported set function return mode"
+msgstr "不支持集合函数返回模式"
+
+#: plpy_exec.c:91
+#, c-format
+msgid ""
+"PL/Python set-returning functions only support returning only value per call."
+msgstr "PL/Python集合返回函数只支持在每次调用时返回值."
+
+#: plpy_exec.c:103
+#, c-format
+msgid "returned object cannot be iterated"
+msgstr "所返回的对象无法迭代"
+
+#: plpy_exec.c:104
+#, c-format
+msgid "PL/Python set-returning functions must return an iterable object."
+msgstr "PL/Python集合返回函数必须返回一个可迭代的对象."
+
+#: plpy_exec.c:129
+#, c-format
+msgid "error fetching next item from iterator"
+msgstr "当从迭代器中取回下一个成员时出现错误"
+
+#: plpy_exec.c:164
+#, c-format
+msgid "PL/Python function with return type \"void\" did not return None"
+msgstr "返回类型为\"void\"的PL/Python函数不返回None"
+
+#: plpy_exec.c:288 plpy_exec.c:314
+#, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "在触发器存储过程出现非期望的返回值"
 
-#: plpython.c:609
+#: plpy_exec.c:289
+#, c-format
 msgid "Expected None or a string."
 msgstr "期望空值或一个字符串"
 
-#: plpython.c:624
+#: plpy_exec.c:304
+#, c-format
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "在DELETE触发器中的PL/Python 触发器函数返回 \"MODIFY\"  -- 忽略"
 
-#: plpython.c:635
+#: plpy_exec.c:315
+#, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "期望None, \"OK\", \"SKIP\", 或\"MODIFY\""
 
-#: plpython.c:687
+#: plpy_exec.c:396
+#, c-format
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "当设置参数的同时, 执行PyList_SetItem()失败"
+
+#: plpy_exec.c:400
+#, c-format
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "当设置参数的同时, 执行PyDict_SetItemString()失败"
+
+#: plpy_exec.c:412
+#, c-format
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr "返回值类型是记录的函数在不接受使用记录类型的环境中调用"
+
+#: plpy_exec.c:450
+#, c-format
+msgid "while creating return value"
+msgstr "同时在创建返回值"
+
+#: plpy_exec.c:474
+#, c-format
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "在构建触发器参数的同时无法创建新的字典."
+
+#: plpy_exec.c:664
+#, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] 已删除，无法修改记录"
 
-#: plpython.c:690
+#: plpy_exec.c:667
+#, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"]不是一个字典"
 
-#: plpython.c:714
+#: plpy_exec.c:691
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "在顺序位置%d的TD[\"new\"]字典键值不是字符串"
 
-#: plpython.c:720
+#: plpy_exec.c:697
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
 "row"
 msgstr "在 TD[\"new\"]中找到的键 \"%s\"在正在触发的记录中不是作为列而存在."
 
-#: plpython.c:816
-msgid "could not create new dictionary while building trigger arguments"
-msgstr "在构建触发器参数的同时无法创建新的字典."
+#: plpy_exec.c:778
+#, c-format
+msgid "while modifying trigger row"
+msgstr "同时正在修改触发器记录"
 
-#: plpython.c:1023
-msgid "unsupported set function return mode"
-msgstr "不支持集合函数返回模式"
+#: plpy_exec.c:839
+#, c-format
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "强行终止一个还未退出的子事务"
+
+#: plpy_main.c:101
+#, c-format
+msgid "Python major version mismatch in session"
+msgstr "在会话中Python的主版本不匹配"
 
-#: plpython.c:1024
+#: plpy_main.c:102
+#, c-format
 msgid ""
-"PL/Python set-returning functions only support returning only value per call."
-msgstr "PL/Python集合返回函数只支持在每次调用时返回值."
+"This session has previously used Python major version %d, and it is now "
+"attempting to use Python major version %d."
+msgstr ""
+"这个会话先前已经使用的Python主版本是%d，现在它试图使用的Python主版本是%d "
 
-#: plpython.c:1036
-msgid "returned object cannot be iterated"
-msgstr "所返回的对象无法迭代"
+#: plpy_main.c:104
+#, c-format
+msgid "Start a new session to use a different Python major version."
+msgstr "启动一个新的会话来使用一个不同的Python的主要版本"
 
-#: plpython.c:1037
-msgid "PL/Python set-returning functions must return an iterable object."
-msgstr "PL/Python集合返回函数必须返回一个可迭代的对象."
+#: plpy_main.c:119
+#, c-format
+msgid "untrapped error in initialization"
+msgstr "在初始化过程中出现无法捕获的错误"
 
-#: plpython.c:1064
-msgid "error fetching next item from iterator"
-msgstr "当从迭代器中取回下一个成员时出现错误"
+#: plpy_main.c:142
+#, c-format
+msgid "could not import \"__main__\" module"
+msgstr "无法导入模块\"__main__\" "
 
-#: plpython.c:1086
-msgid "PL/Python function with return type \"void\" did not return None"
-msgstr "返回类型为\"void\"的PL/Python函数不返回None"
+#: plpy_main.c:147
+#, c-format
+msgid "could not create globals"
+msgstr "无法创建全局变量"
 
-#: plpython.c:1241
-msgid "PyList_SetItem() failed, while setting up arguments"
-msgstr "当设置参数的同时, 执行PyList_SetItem()失败"
+#: plpy_main.c:151
+#, c-format
+msgid "could not initialize globals"
+msgstr "无法初始化全局变量"
 
-#: plpython.c:1245
-msgid "PyDict_SetItemString() failed, while setting up arguments"
-msgstr "当设置参数的同时, 执行PyDict_SetItemString()失败"
+#: plpy_main.c:351
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "PL/Python函数\"%s\""
 
-#: plpython.c:1314
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "执行PyCObject_AsVoidPtr()失败"
+#: plpy_main.c:358
+#, c-format
+msgid "PL/Python anonymous code block"
+msgstr "PL/Python匿名代码块"
 
-#: plpython.c:1422
+#: 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模块 "
+
+# fe-connect.c:891
+#: plpy_plpymodule.c:217
+#, c-format
+msgid "could not create the base SPI exceptions"
+msgstr "无法创建基本的SPI异常"
+
+#: plpy_plpymodule.c:253 plpy_plpymodule.c:257
+#, c-format
+msgid "could not generate SPI exceptions"
+msgstr "无法产生SPI异常"
+
+#: plpy_plpymodule.c:388
+#, c-format
+msgid "could not unpack arguments in plpy.elog"
+msgstr "无法解析plpy.elog中的参数"
+
+#: plpy_plpymodule.c:396
+msgid "could not parse error message in plpy.elog"
+msgstr "无法解析在plpy.elog中的错误消息"
+
+#: plpy_procedure.c:199
+#, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "触发器函数只能以触发器的形式调用"
 
-#: plpython.c:1426 plpython.c:1810
+#: plpy_procedure.c:204 plpy_typeio.c:406
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python函数不能返回类型%s"
 
-#: plpython.c:1504
+#: plpy_procedure.c:286
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python函数不能接受类型%s"
 
-#: plpython.c:1543
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "执行PyCObject_FromVoidPtr()失败"
-
-#: plpython.c:1601
+#: plpy_procedure.c:382
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "无法编译PL/Python函数\"%s\""
 
-#: plpython.c:1812
+#: plpy_procedure.c:385
+#, c-format
+msgid "could not compile anonymous PL/Python code block"
+msgstr "无法编译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:56
+#, c-format
+msgid "second argument of plpy.prepare must be a sequence"
+msgstr "plpy.prepare的第二个参数必须是一个序列"
+
+#: plpy_spi.c:105
+#, c-format
+msgid "plpy.prepare: type name at ordinal position %d is not a string"
+msgstr "plpy.prepare: 在顺序位置%d的类型名称不是string"
+
+#: plpy_spi.c:137
+#, c-format
+msgid "plpy.prepare does not support composite types"
+msgstr "plpy.prepare不支持使用组合类型"
+
+#: plpy_spi.c:187
+#, c-format
+msgid "plpy.execute expected a query or a plan"
+msgstr "plpy.execute期望一个查询或一个计划"
+
+#: plpy_spi.c:206
+#, c-format
+msgid "plpy.execute takes a sequence as its second argument"
+msgstr "plpy.execute将一个序列作为它的第二个参数"
+
+#: plpy_spi.c:330
+#, c-format
+msgid "SPI_execute_plan failed: %s"
+msgstr "执行SPI_execute_plan失败: %s"
+
+#: plpy_spi.c:372
+#, c-format
+msgid "SPI_execute failed: %s"
+msgstr "SPI_execute执行失败: %s"
+
+#: plpy_spi.c:439
+#, c-format
+msgid "unrecognized error in PLy_spi_execute_fetch_result"
+msgstr "在PLy_spi_execute_fetch_result中出现无法识别的错误"
+
+#: 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:291
+#, c-format
+msgid "could not create new dictionary"
+msgstr "无法创建新的字典"
+
+#: plpy_typeio.c:408
+#, c-format
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python不支持对行类型数组的转换。"
 
-#: plpython.c:2015
+#: plpy_typeio.c:584
+#, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "无法将多维数组转换为Python列表"
 
-#: plpython.c:2016
+#: plpy_typeio.c:585
+#, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python只支持使用一维数组"
 
-#: plpython.c:2052
-msgid "could not create new dictionary"
-msgstr "无法创建新的字典"
+#: plpy_typeio.c:591
+#, c-format
+msgid "could not create new Python list"
+msgstr "无法创建新的Python列表"
 
-#: plpython.c:2124
+#: plpy_typeio.c:650
+#, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "无法创建Python对象的字节表达式"
 
-#: plpython.c:2178
+#: plpy_typeio.c:742
+#, c-format
 msgid "could not create string representation of Python object"
 msgstr "无法创建Python对象的字符串表达式"
 
-#: plpython.c:2189
+#: plpy_typeio.c:753
+#, c-format
 msgid ""
 "could not convert Python object into cstring: Python string representation "
 "appears to contain null bytes"
 msgstr "无法将Python对象转换为cstring: Python字符串表达式可能包含空字节"
 
-#: plpython.c:2223
+#: plpy_typeio.c:787
+#, c-format
 msgid ""
 "return value of function with array return type is not a Python sequence"
 msgstr "带有数组返回类型的函数返回值不是一个Python序列"
 
-#: plpython.c:2298
+#: plpy_typeio.c:886
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "在映射中没有找到键\"%s\""
 
-#: plpython.c:2299
+#: plpy_typeio.c:887
+#, 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"
 
-#: plpython.c:2342
+#: plpy_typeio.c:935
+#, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "所返回序列的长度与在记录中列的数量不匹配"
 
-#: plpython.c:2435
+#: plpy_typeio.c:1043
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "在Python对象中不存在属性\"%s\""
 
-#: plpython.c:2436
+#: plpy_typeio.c:1044
+#, c-format
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
 msgstr ""
 "为了在一列中返回空值, 需要让返回的对象在带有值None的列后面的带有已命名属性"
 
-#: plpython.c:2670
-msgid "plan.status takes no arguments"
-msgstr "plan.status不带有参数"
-
-#: plpython.c:2794 plpython.c:2937
-msgid "transaction aborted"
-msgstr "事务终止"
-
-#: plpython.c:2801
-msgid "invalid arguments for plpy.prepare"
-msgstr " plpy.prepare的无效参数"
-
-#: plpython.c:2808
-msgid "second argument of plpy.prepare must be a sequence"
-msgstr "plpy.prepare的第二个参数必须是一个序列"
-
-#: plpython.c:2858
-#, c-format
-msgid "plpy.prepare: type name at ordinal position %d is not a string"
-msgstr "plpy.prepare: 在顺序位置%d的类型名称不是string"
-
-#: plpython.c:2885
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare不支持使用组合类型"
-
-#: plpython.c:2914
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "在PLy_spi_prepare中无法识别的错误"
-
-#: plpython.c:2950
-msgid "plpy.execute expected a query or a plan"
-msgstr "plpy.execute期望一个查询或一个计划"
-
-#: plpython.c:2967
-msgid "plpy.execute takes a sequence as its second argument"
-msgstr "plpy.execute将一个序列作为它的第二个参数"
-
-#: plpython.c:2983
-msgid "could not execute plan"
-msgstr "无法执行计划"
-
-#: plpython.c:2986
+#: plpy_util.c:70
 #, 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"
+msgid "could not convert Python Unicode object to bytes"
+msgstr "无法将Python中以Unicode编码的对象转换为PostgreSQL服务器字节码"
 
-#: plpython.c:3065
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "在PLy_spi_execute_plan中出现无法识别的错误"
-
-#: plpython.c:3084
+#: plpy_util.c:75
 #, c-format
-msgid "SPI_execute_plan failed: %s"
-msgstr "执行SPI_execute_plan失败: %s"
-
-#: plpython.c:3111
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "在PLy_spi_execute_query中出现无法识别的错误"
+msgid "could not extract bytes from encoded string"
+msgstr "无法从已编码字符串里提取相应字节码值"
 
-#: plpython.c:3120
-#, c-format
-msgid "SPI_execute failed: %s"
-msgstr "SPI_execute执行失败: %s"
-
-#: plpython.c:3177
-msgid "unrecognized error in PLy_spi_execute_fetch_result"
-msgstr "在PLy_spi_execute_fetch_result中出现无法识别的错误"
-
-#: plpython.c:3231
-msgid "Python major version mismatch in session"
-msgstr "在会话中Python的主版本不匹配"
-
-#: plpython.c:3232
-#, c-format
-msgid ""
-"This session has previously used Python major version %d, and it is now "
-"attempting to use Python major version %d."
-msgstr ""
-"这个会话先前已经使用的Python主版本是%d，现在它试图使用的Python主版本是%d "
-
-#: plpython.c:3234
-msgid "Start a new session to use a different Python major version."
-msgstr "启动一个新的会话来使用一个不同的Python的主要版本"
+#~ msgid "PL/Python function \"%s\" failed"
+#~ msgstr "PL/Python函数 \"%s\" 执行失败"
 
-#: plpython.c:3249
-msgid "untrapped error in initialization"
-msgstr "在初始化过程中出现无法捕获的错误"
+#~ msgid ""
+#~ "could not create string representation of Python object in PL/Python "
+#~ "function \"%s\" while creating return value"
+#~ msgstr ""
+#~ "在创建返回值时, 无法计算在PL/Python函数\"%s\"中Python对象的字符串表达式"
 
-#: plpython.c:3252
-msgid "could not create procedure cache"
-msgstr "无法创建存储过程缓存"
+#~ msgid ""
+#~ "could not compute string representation of Python object in PL/Python "
+#~ "function \"%s\" while modifying trigger row"
+#~ msgstr ""
+#~ "在修改触发器记录的同时无法计算在PL/Python函数\"%s\"中Python对象的字符串表"
+#~ "达式"
 
-#: plpython.c:3264
-msgid "could not import \"__main__\" module"
-msgstr "无法导入模块\"__main__\" "
+#~ msgid "out of memory"
+#~ msgstr "内存用尽"
 
-#: plpython.c:3271
-msgid "could not initialize globals"
-msgstr "无法初始化全局变量"
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
 
-#: plpython.c:3389
-msgid "could not parse error message in plpy.elog"
-msgstr "无法解析在plpy.elog中的错误消息"
+#~ msgid "could not create procedure cache"
+#~ msgstr "无法创建存储过程缓存"
 
-#: plpython.c:3518 plpython.c:3522
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "在PLy_spi_execute_query中出现无法识别的错误"
 
-#: plpython.c:3519
-#, c-format
-msgid "%s"
-msgstr "%s"
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "在PLy_spi_execute_plan中出现无法识别的错误"
 
-#: plpython.c:3632
-msgid "out of memory"
-msgstr "内存用尽"
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "在PLy_spi_prepare中无法识别的错误"
 
-#: plpython.c:3686
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr "无法将Python中以Unicode编码的对象转换为PostgreSQL服务器编码形式"
+#~ 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()失败"