Translation update

11 files changed, 1528 insertions, 1352 deletions

diff --git a/src/pl/plperl/po/de.po b/src/pl/plperl/po/de.po
index 4ea354e169a..6f21d29429e 100644
--- a/src/pl/plperl/po/de.po
+++ b/src/pl/plperl/po/de.po
@@ -1,105 +1,179 @@
 # German message translation file for plperl
-# Copyright (C) 2009 PostgreSQL Global Development Group
+# Copyright (C) 2010 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Peter Eisentraut <[email protected]>, 2009.
+# Peter Eisentraut <[email protected]>, 2009 - 2010.
 #
-# pgtranslation Id: plperl.po,v 1.2 2009/02/20 10:39:49 petere Exp $
+# pgtranslation Id: plperl.po,v 1.4 2010/03/18 19:04:45 petere Exp $
 #
 # Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-02-20 09:06+0000\n"
-"PO-Revision-Date: 2009-02-20 12:37+0200\n"
+"POT-Creation-Date: 2010-03-18 19:03+0000\n"
+"PO-Revision-Date: 2010-03-18 21:04+0200\n"
 "Last-Translator: Peter Eisentraut <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:202
+#: plperl.c:241
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
-msgstr "Wenn wahr, dann wird vertrauenswürdiger und nicht vertrauenswürdiger Perl-Code im »strict«-Modus kompiliert."
+msgstr ""
+"Wenn wahr, dann wird vertrauenswürdiger und nicht vertrauenswürdiger Perl-"
+"Code im »strict«-Modus kompiliert."
+
+#: plperl.c:249
+msgid ""
+"Perl initialization code to execute when a Perl interpreter is initialized."
+msgstr "Perl-Initialisierungscode, der ausgeführt wird, wenn der Perl-Interpreter initialisiert wird."
+
+#: plperl.c:266
+msgid "Perl initialization code to execute once when plperl is first used."
+msgstr "Perl-Initialisierungscode, der ausgeführt wird, wenn plperl zum ersten Mal benutzt wird."
+
+#: plperl.c:274
+msgid "Perl initialization code to execute once when plperlu is first used."
+msgstr "Perl-Initialisierungscode, der ausgeführt wird, wenn plperlu zum ersten Mal benutzt wird."
+
+#: plperl.c:424 plperl.c:562 plperl.c:567 plperl.c:705 plperl.c:713
+#: plperl.c:726 plperl.c:746 plperl.c:762 plperl.c:1305 plperl.c:1418
+#: plperl.c:1474
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plperl.c:425
+msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
+msgstr "beim Ausführen von PostgreSQL::InServer::SPI::bootstrap"
+
+#: plperl.c:563
+msgid "while parsing Perl initialization"
+msgstr "beim Parsen der Perl-Initialisierung"
+
+#: plperl.c:568
+msgid "while running Perl initialization"
+msgstr "beim Ausführen der Perl-Initialisierung"
+
+#: plperl.c:706
+msgid "while executing PLC_SAFE_BAD"
+msgstr "beim Ausführen von PLC_SAFE_BAD"
+
+#: plperl.c:714
+msgid "while executing PLC_SAFE_OK"
+msgstr "beim Ausführen von PLC_SAFE_OK"
+
+#: plperl.c:727
+msgid "while executing utf8fix"
+msgstr "beim Ausführen von utf8fix"
+
+#: plperl.c:747
+msgid "while executing plperl.on_plperl_init"
+msgstr "beim Ausführen von plperl.on_plperl_init"
+
+#: plperl.c:763
+msgid "while executing plperl.on_plperlu_init"
+msgstr "beim Ausführen von plperl.on_plperlu_init"
 
-#: plperl.c:606 plperl.c:799
+#: plperl.c:805 plperl.c:1002
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perl-Hash enthält nicht existierende Spalte »%s«"
 
-#: plperl.c:775
+#: plperl.c:978
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} existiert nicht"
 
-#: plperl.c:779
+#: plperl.c:982
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} ist keine Hash-Referenz"
 
-#: plperl.c:916 plperl.c:1615
+#: plperl.c:1215 plperl.c:1916
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "PL/Perl-Funktionen können keinen Rückgabetyp %s haben"
 
-#: plperl.c:928 plperl.c:1662
+#: plperl.c:1227 plperl.c:1962
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "PL/Perl-Funktionen können Typ %s nicht annehmen"
 
-#: plperl.c:1004
+#: plperl.c:1309
 #, c-format
-msgid "creation of Perl function \"%s\" failed: %s"
-msgstr "Erzeugen der Perl-Funktion »%s« fehlgeschlagen: %s"
+msgid "did not get a GLOB from compiling function \"%s\" via %s"
+msgstr "kein GLOB erhalten beim Kompilieren von Funktion »%s« via %s"
 
-#: plperl.c:1134 plperl.c:1192
-#, c-format
-msgid "error from Perl function \"%s\": %s"
-msgstr "Fehler aus Perl-Funktion »%s«: %s"
-
-#: plperl.c:1240
+#: plperl.c:1526
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "Funktion mit Mengenergebnis in einem Zusammenhang aufgerufen, der keine "
 "Mengenergebnisse verarbeiten kann"
 
-#: plperl.c:1283
+#: plperl.c:1569
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
-msgstr "PL/Perl-Funktionen mit Mengenergebnis müssen eine Referenz auf ein Array zurückgeben oder return_next verwenden"
+msgstr ""
+"PL/Perl-Funktionen mit Mengenergebnis müssen eine Referenz auf ein Array "
+"zurückgeben oder return_next verwenden"
 
-#: plperl.c:1316
+#: plperl.c:1602
 msgid "composite-returning PL/Perl function must return reference to hash"
-msgstr "PL/Perl-Funktion, die einen zusammengesetzten Typ zurückgibt, muss eine Referenz auf ein Hash zurückgeben"
+msgstr ""
+"PL/Perl-Funktion, die einen zusammengesetzten Typ zurückgibt, muss eine "
+"Referenz auf ein Hash zurückgeben"
 
-#: plperl.c:1325
+#: plperl.c:1611
 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"
+msgstr ""
+"Funktion, die einen Record zurückgibt, in einem Zusammenhang aufgerufen, der "
+"Typ record nicht verarbeiten kann"
 
-#: plperl.c:1441
+#: plperl.c:1731
 msgid "ignoring modified row in DELETE trigger"
 msgstr "geänderte Zeile im DELETE-Trigger wird ignoriert"
 
-#: plperl.c:1449
-msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
-msgstr "Ergebnis einer PL/Perl-Triggerfunktion muss undef, »SKIP« oder »MODIFY« sein"
+#: plperl.c:1739
+msgid ""
+"result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
+msgstr ""
+"Ergebnis einer PL/Perl-Triggerfunktion muss undef, »SKIP« oder »MODIFY« sein"
 
-#: plperl.c:1549
+#: plperl.c:1851
 msgid "out of memory"
 msgstr "Speicher aufgebraucht"
 
-#: plperl.c:1606
+#: plperl.c:1907
 msgid "trigger functions can only be called as triggers"
 msgstr "Triggerfunktionen können nur als Trigger aufgerufen werden"
 
-#: plperl.c:1899
+#: plperl.c:2220
 msgid "cannot use return_next in a non-SETOF function"
-msgstr "return_next kann nur in einer Funktion mit SETOF-Rückgabetyp verwendet werden"
+msgstr ""
+"return_next kann nur in einer Funktion mit SETOF-Rückgabetyp verwendet werden"
 
-#: plperl.c:1905
+#: plperl.c:2226
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
-msgstr "PL/Perl-Funktion, die SETOF eines zusammengesetzten Typs zurückgibt, muss return_next mit einer Referenz auf ein Hash aufrufen"
+msgstr ""
+"PL/Perl-Funktion, die SETOF eines zusammengesetzten Typs zurückgibt, muss "
+"return_next mit einer Referenz auf ein Hash aufrufen"
+
+#: plperl.c:3020
+#, c-format
+msgid "PL/Perl function \"%s\""
+msgstr "PL/Perl-Funktion »%s«"
+
+#: plperl.c:3032
+#, c-format
+msgid "compilation of PL/Perl function \"%s\""
+msgstr "Kompilierung der PL/Perl-Funktion »%s«"
+
+#: plperl.c:3041
+msgid "PL/Perl anonymous code block"
+msgstr "anonymer PL/Perl-Codeblock"
diff --git a/src/pl/plperl/po/es.po b/src/pl/plperl/po/es.po
index 1055ef8be1f..6cedc97a506 100644
--- a/src/pl/plperl/po/es.po
+++ b/src/pl/plperl/po/es.po
@@ -1,63 +1,125 @@
 # Spanish message translation file for plperl
-# This file is put in the public domain.
+#
+# Copyright (C) 2008-2010 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
 # Emanuel Calvo Franco <[email protected]>, 2008.
-# Alvaro Herrera <[email protected]>, 2009
+# Alvaro Herrera <[email protected]>, 2009-2010
 #
+# pgtranslation Id: plperl.po,v 1.7 2010/04/26 20:12:36 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 8.4\n"
+"Project-Id-Version: plperl (PostgreSQL 9.0)\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-11-03 17:08+0000\n"
-"PO-Revision-Date: 2009-11-03 16:48-0300\n"
+"POT-Creation-Date: 2010-04-26 19:14+0000\n"
+"PO-Revision-Date: 2010-04-26 16:11-0400\n"
 "Last-Translator: Álvaro Herrera <[email protected]>\n"
 "Language-Team: PgSQL-es-Ayuda <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:204
+#: plperl.c:241
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Si es verdadero, se compilará código Perl confiable y no confiable en modo "
 "«strict»."
 
-#: plperl.c:628 plperl.c:821
+#: plperl.c:249
+msgid ""
+"Perl initialization code to execute when a Perl interpreter is initialized."
+msgstr ""
+"Código Perl de inicialización a ejecutar cuando un intérprete Perl es "
+"inicializado."
+
+#: plperl.c:266
+msgid "Perl initialization code to execute once when plperl is first used."
+msgstr ""
+"Código Perl de inicialización a ejecutar cuando plperl se usa por primera "
+"vez."
+
+#: plperl.c:274
+msgid "Perl initialization code to execute once when plperlu is first used."
+msgstr ""
+"Código Perl de inicialización a ejecutar cuando plperlu se usa por primera "
+"vez."
+
+#: plperl.c:424 plperl.c:562 plperl.c:567 plperl.c:705 plperl.c:713
+#: plperl.c:726 plperl.c:746 plperl.c:762 plperl.c:1306 plperl.c:1419
+#: plperl.c:1475
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plperl.c:425
+msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
+msgstr "mientras se ejecutaba PostgreSQL::InServer::SPI::bootstrap"
+
+#: plperl.c:563
+msgid "while parsing Perl initialization"
+msgstr "mientras se interpretaba la inicialización de Perl"
+
+#: plperl.c:568
+msgid "while running Perl initialization"
+msgstr "mientras se ejecutaba la inicialización de Perl"
+
+#: plperl.c:706
+msgid "while executing PLC_SAFE_BAD"
+msgstr "mientras se ejecutaba PLC_SAFE_BAD"
+
+#: plperl.c:714
+msgid "while executing PLC_SAFE_OK"
+msgstr "mientras se ejecutaba PLC_SAFE_OK"
+
+#: plperl.c:727
+msgid "while executing utf8fix"
+msgstr "mientras se ejecutaba utf8fix"
+
+#: plperl.c:747
+msgid "while executing plperl.on_plperl_init"
+msgstr "mientras se ejecutaba plperl.on_plperl_init"
+
+#: plperl.c:763
+msgid "while executing plperl.on_plperlu_init"
+msgstr "mientras se ejecutaba plperl.on_plperlu_init"
+
+#: plperl.c:805 plperl.c:1002
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "el hash de Perl contiene el columna inexistente «%s»"
 
-#: plperl.c:797
+#: plperl.c:978
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} no existe"
 
-#: plperl.c:801
+#: plperl.c:982
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} no es una referencia a un hash"
 
-#: plperl.c:940 plperl.c:1653
+#: plperl.c:1216 plperl.c:1917
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "las funciones en PL/Perl no pueden retornar el tipo %s"
 
-#: plperl.c:952 plperl.c:1700
+#: plperl.c:1228 plperl.c:1963
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "funciones de PL/Perl no pueden aceptar el tipo %s"
 
-#: plperl.c:1028 plperl.c:1156 plperl.c:1212
+#: plperl.c:1310
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "did not get a GLOB from compiling function \"%s\" via %s"
+msgstr "no se obtuvo un GLOB en la compilación de la función «%s» a través de %s"
 
-#: plperl.c:1264
+#: plperl.c:1527
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "se llamó a una función que retorna un conjunto en un contexto que no puede "
 "aceptarlo"
 
-#: plperl.c:1307
+#: plperl.c:1570
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
@@ -65,43 +127,43 @@ msgstr ""
 "una función PL/Perl que retorna un conjunto debe retornar una referencia a "
 "un array o usar return_next"
 
-#: plperl.c:1340
+#: plperl.c:1603
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr ""
 "una función Perl que retorna un tipo compuesto debe retornar una referencia "
 "a un hash"
 
-#: plperl.c:1349
+#: plperl.c:1612
 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"
 
-#: plperl.c:1471
+#: plperl.c:1732
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignorando la tupla modificada en el disparador DELETE"
 
-#: plperl.c:1479
+#: plperl.c:1740
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr ""
 "el resultado de la función disparadora en PL/Perl debe ser undef, «SKIP» o "
 "«MODIFY»"
 
-#: plperl.c:1587
+#: plperl.c:1852
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: plperl.c:1644
+#: plperl.c:1908
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plperl.c:1940
+#: plperl.c:2221
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "no se puede utilizar return_next en una función sin SETOF"
 
-#: plperl.c:1946
+#: plperl.c:2227
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
@@ -109,12 +171,16 @@ msgstr ""
 "una función Perl que retorna SETOF de un tipo compuesto debe invocar "
 "return_next con una referencia a un hash"
 
-#: plperl.c:2726
+#: plperl.c:3021
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "función PL/Perl «%s»"
 
-#: plperl.c:2737
+#: plperl.c:3033
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilación de la función PL/Perl «%s»"
+
+#: plperl.c:3042
+msgid "PL/Perl anonymous code block"
+msgstr "bloque de código anónimo de PL/Perl"
diff --git a/src/pl/plperl/po/fr.po b/src/pl/plperl/po/fr.po
index 1d6d299eb5e..08815be9655 100644
--- a/src/pl/plperl/po/fr.po
+++ b/src/pl/plperl/po/fr.po
@@ -1,7 +1,7 @@
 # translation of plperl.po to fr_fr
 # french message translation file for plperl
 #
-# $PostgreSQL: pgsql/src/pl/plperl/po/fr.po,v 1.3 2010/02/19 00:40:05 petere Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/po/fr.po,v 1.4 2010/05/13 15:56:43 petere Exp $
 #
 # Use these quotes: � %s �
 # Guillaume Lelarge <[email protected]>, 2009.
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-02-17 19:15+0000\n"
-"PO-Revision-Date: 2010-02-18 00:09+0100\n"
+"POT-Creation-Date: 2010-04-24 01:14+0000\n"
+"PO-Revision-Date: 2010-04-24 13:25+0100\n"
 "Last-Translator: Guillaume Lelarge <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -25,164 +25,164 @@ msgstr ""
 "strict."
 
 #: plperl.c:249
-msgid "Perl initialization code to execute when a perl interpreter is initialized."
+msgid "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
-"Code d'initialisation Perl � ex�cuter lorsque l'interpr�teur perl est\n"
+"Code d'initialisation Perl � ex�cuter lorsque un interpr�teur Perl est\n"
 "initialis�."
 
-#: plperl.c:265
+#: plperl.c:266
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr ""
 "Code d'initialisation Perl � ex�cuter lorsque plperl est utilis� pour la\n"
 "premi�re fois"
 
-#: plperl.c:273
+#: plperl.c:274
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr ""
 "Code d'initialisation Perl � ex�cuter lorsque plperlu est utilis� pour la\n"
 "premi�re fois"
 
-#: plperl.c:419
-#: plperl.c:554
-#: plperl.c:559
-#: plperl.c:693
-#: plperl.c:701
-#: plperl.c:714
-#: plperl.c:734
-#: plperl.c:750
-#: plperl.c:1288
-#: plperl.c:1401
-#: plperl.c:1457
+#: plperl.c:424
+#: plperl.c:562
+#: plperl.c:567
+#: plperl.c:705
+#: plperl.c:713
+#: plperl.c:726
+#: plperl.c:746
+#: plperl.c:762
+#: plperl.c:1306
+#: plperl.c:1419
+#: plperl.c:1475
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:420
-msgid "While executing PostgreSQL::InServer::SPI::bootstrap."
-msgstr "Lors de l'ex�cution de PostgreSQL::InServer::SPI::bootstrap."
+#: plperl.c:425
+msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
+msgstr "lors de l'ex�cution de PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:555
-msgid "While parsing perl initialization."
-msgstr "Lors de l'analyse de l'initialisation de perl."
+#: plperl.c:563
+msgid "while parsing Perl initialization"
+msgstr "lors de l'analyse de l'initialisation de perl"
 
-#: plperl.c:560
-msgid "While running perl initialization."
-msgstr "Lors de l'ex�cution de l'initialisation de perl."
+#: plperl.c:568
+msgid "while running Perl initialization"
+msgstr "lors de l'ex�cution de l'initialisation de perl"
 
-#: plperl.c:694
-msgid "While executing PLC_SAFE_BAD."
-msgstr "Lors de l'ex�cution de PLC_SAFE_BAD."
+#: plperl.c:706
+msgid "while executing PLC_SAFE_BAD"
+msgstr "lors de l'ex�cution de PLC_SAFE_BAD"
 
-#: plperl.c:702
-msgid "While executing PLC_SAFE_OK."
-msgstr "Lors de l'ex�cution de PLC_SAFE_OK."
+#: plperl.c:714
+msgid "while executing PLC_SAFE_OK"
+msgstr "lors de l'ex�cution de PLC_SAFE_OK"
 
-#: plperl.c:715
-msgid "While executing utf8fix."
-msgstr "Lors de l'ex�cution de utf8fix."
+#: plperl.c:727
+msgid "while executing utf8fix"
+msgstr "lors de l'ex�cution de utf8fix"
 
-#: plperl.c:735
-msgid "While executing plperl.on_plperl_init."
-msgstr "Lors de l'ex�cution de plperl.on_plperl_init."
+#: plperl.c:747
+msgid "while executing plperl.on_plperl_init"
+msgstr "lors de l'ex�cution de plperl.on_plperl_init"
 
-#: plperl.c:751
-msgid "While executing plperl.on_plperlu_init."
-msgstr "Lors de l'ex�cution de plperl.on_plperlu_init."
+#: plperl.c:763
+msgid "while executing plperl.on_plperlu_init"
+msgstr "lors de l'ex�cution de plperl.on_plperlu_init"
 
-#: plperl.c:793
-#: plperl.c:989
+#: plperl.c:805
+#: plperl.c:1002
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Le hachage Perl contient la colonne � %s � inexistante"
 
-#: plperl.c:965
+#: plperl.c:978
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} n'existe pas"
 
-#: plperl.c:969
+#: plperl.c:982
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} n'est pas une r�f�rence de hachage"
 
-#: plperl.c:1202
-#: plperl.c:1898
+#: plperl.c:1216
+#: plperl.c:1917
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "Les fonctions PL/perl ne peuvent pas renvoyer le type %s"
 
-#: plperl.c:1214
-#: plperl.c:1944
+#: plperl.c:1228
+#: plperl.c:1963
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "Les fonctions PL/perl ne peuvent pas accepter le type %s"
 
-#: plperl.c:1292
+#: plperl.c:1310
 #, c-format
-msgid "didn't get a GLOB from compiling %s via %s"
-msgstr "n'a pas obtenu un GLOB de la compilation de %s via %s"
+msgid "did not get a GLOB from compiling function \"%s\" via %s"
+msgstr "n'a pas obtenu un GLOB de la compilation de � %s � via %s"
 
-#: plperl.c:1509
+#: plperl.c:1527
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "fonction renvoyant un ensemble appel�e dans un contexte qui ne peut pas\n"
 "accepter un ensemble"
 
-#: plperl.c:1552
+#: plperl.c:1570
 msgid "set-returning PL/Perl function must return reference to array or use return_next"
 msgstr ""
 "la fonction PL/perl renvoyant des ensembles doit renvoyer la r�f�rence �\n"
 "un tableau ou utiliser return_next"
 
-#: plperl.c:1585
+#: plperl.c:1603
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr ""
 "la fonction PL/perl renvoyant des valeurs composites doit renvoyer la\n"
 "r�f�rence � un hachage"
 
-#: plperl.c:1594
+#: plperl.c:1612
 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"
 
-#: plperl.c:1714
+#: plperl.c:1732
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignore la ligne modifi�e dans le trigger DELETE"
 
-#: plperl.c:1722
+#: plperl.c:1740
 msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr ""
 "le r�sultat de la fonction trigger PL/perl doit �tre undef, � SKIP � ou\n"
 "� MODIFY �"
 
-#: plperl.c:1833
+#: plperl.c:1852
 msgid "out of memory"
 msgstr "m�moire �puis�e"
 
-#: plperl.c:1889
+#: plperl.c:1908
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions trigger peuvent seulement �tre appel�es par des triggers"
 
-#: plperl.c:2199
+#: plperl.c:2221
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "ne peut pas utiliser return_next dans une fonction non SETOF"
 
-#: plperl.c:2205
+#: plperl.c:2227
 msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
 msgstr ""
 "une fonction PL/perl renvoyant des lignes composites doit appeler\n"
 "return_next avec la r�f�rence � un hachage"
 
-#: plperl.c:2992
+#: plperl.c:3021
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "fonction PL/Perl � %s �"
 
-#: plperl.c:3003
+#: plperl.c:3033
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilation de la fonction PL/Perl � %s �"
 
-#: plperl.c:3012
+#: plperl.c:3042
 msgid "PL/Perl anonymous code block"
 msgstr "bloc de code PL/Perl anonyme"
 
diff --git a/src/pl/plpgsql/src/po/de.po b/src/pl/plpgsql/src/po/de.po
index 118934df042..568161adfe3 100644
--- a/src/pl/plpgsql/src/po/de.po
+++ b/src/pl/plpgsql/src/po/de.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-02-18 13:14+0000\n"
-"PO-Revision-Date: 2010-02-18 20:59+0200\n"
+"POT-Creation-Date: 2010-03-17 19:15+0000\n"
+"PO-Revision-Date: 2010-03-17 23:22+0200\n"
 "Last-Translator: Peter Eisentraut <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +65,9 @@ msgstr "Spaltenverweis »%s« ist nicht eindeutig"
 
 #: pl_comp.c:980
 msgid "It could refer to either a PL/pgSQL variable or a table column."
-msgstr "Er könnte sich entweder auf eine PL/pgSQL-Variable oder eine Tabellenspalte beziehen."
+msgstr ""
+"Er könnte sich entweder auf eine PL/pgSQL-Variable oder eine Tabellenspalte "
+"beziehen."
 
 #: pl_comp.c:1690
 #, c-format
@@ -246,7 +248,7 @@ msgstr "einem Cursor ohne Argumente wurden Argumente übergeben"
 msgid "arguments required for cursor"
 msgstr "Cursor benötigt Argumente"
 
-#: pl_exec.c:2182 gram.y:2725
+#: pl_exec.c:2182 gram.y:2729
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr ""
 "RETURN NEXT kann nur in einer Funktion mit SETOF-Rückgabetyp verwendet werden"
@@ -274,7 +276,7 @@ msgstr "falscher Record-Typ angegeben in RETURN NEXT"
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT muss einen Parameter haben"
 
-#: pl_exec.c:2326 gram.y:2784
+#: pl_exec.c:2326 gram.y:2788
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr ""
 "RETURN QUERY kann nur in einer Funktion mit SETOF-Rückgabetyp verwendet "
@@ -341,7 +343,7 @@ msgstr ""
 "Wenn Sie die Ergebnisse eines SELECT verwerfen wollen, verwenden Sie "
 "stattdessen PERFORM."
 
-#: pl_exec.c:2971 pl_exec.c:5527
+#: pl_exec.c:2971 pl_exec.c:5528
 msgid "query string argument of EXECUTE is null"
 msgstr "Anfrageargument von EXECUTE ist NULL"
 
@@ -422,38 +424,42 @@ msgstr[1] "Anfrage »%s« hat %d Spalten zurückgegeben"
 msgid "query \"%s\" is not a SELECT"
 msgstr "Anfrage »%s« ist kein SELECT"
 
-#: gram.y:437
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr "Blocklabel muss vor DECLARE stehen, nicht danach"
+
+#: gram.y:441
 msgid "row or record variable cannot be CONSTANT"
 msgstr "Zeilen- oder Record-Variable kann nicht CONSTANT sein"
 
-#: gram.y:447
+#: gram.y:451
 msgid "row or record variable cannot be NOT NULL"
 msgstr "Zeilen- oder Record-Variable kann nicht NOT NULL sein"
 
-#: gram.y:458
+#: gram.y:462
 msgid "default value for row or record variable is not supported"
 msgstr ""
 "Vorgabewerte werden für Zeilen- oder Record-Variablen nicht unterstützt"
 
-#: gram.y:602 gram.y:628
+#: gram.y:606 gram.y:632
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "Variable »%s« existiert nicht"
 
-#: gram.y:646 gram.y:659
+#: gram.y:650 gram.y:663
 msgid "duplicate declaration"
 msgstr "doppelte Deklaration"
 
-#: gram.y:837
+#: gram.y:841
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "unbekanntes Element in GET DIAGNOSTICS"
 
-#: gram.y:848 gram.y:2950
+#: gram.y:852 gram.y:2975
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "»%s« ist keine skalare Variable"
 
-#: gram.y:1110 gram.y:1302
+#: gram.y:1114 gram.y:1306
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
@@ -461,171 +467,176 @@ msgstr ""
 "Schleifenvariable einer Schleife über Zeilen muss eine Record-Variable oder "
 "Zeilenvariable oder eine Liste von skalaren Variablen sein"
 
-#: gram.y:1144
+#: gram.y:1148
 msgid "cursor FOR loop must have only one target variable"
 msgstr "Cursor-FOR-Schleife darf nur eine Zielvariable haben"
 
-#: gram.y:1151
+#: gram.y:1155
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "Cursor-FOR-Schleife muss eine gebundene Cursor-Variable verwenden"
 
-#: gram.y:1234
+#: gram.y:1238
 msgid "integer FOR loop must have only one target variable"
 msgstr "ganzzahlige FOR-Schleife darf nur eine Zielvariable haben"
 
-#: gram.y:1269
+#: gram.y:1273
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "REVERSE kann nicht in einer Anfrage-FOR-Schleife verwendet werden"
 
-#: gram.y:1416 gram.y:1453 gram.y:1501 gram.y:2421 gram.y:2502 gram.y:2613
-#: gram.y:3224
+#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
+#: gram.y:3249
 msgid "unexpected end of function definition"
 msgstr "unerwartetes Ende der Funktionsdefinition"
 
-#: gram.y:1521 gram.y:1545 gram.y:1557 gram.y:1564 gram.y:1648 gram.y:1755
-#: gram.y:1932 gram.y:2011 gram.y:2124 gram.y:2702 gram.y:2766 gram.y:3184
-#: gram.y:3205
+#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1652 gram.y:1759
+#: gram.y:1936 gram.y:2015 gram.y:2128 gram.y:2706 gram.y:2770 gram.y:3209
+#: gram.y:3230
 msgid "syntax error"
 msgstr "Syntaxfehler"
 
-#: gram.y:1549 gram.y:1551 gram.y:1936 gram.y:1938
+#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
 msgid "invalid SQLSTATE code"
 msgstr "ungültiger SQLSTATE-Code"
 
-#: gram.y:1702
+#: gram.y:1706
 msgid "syntax error, expected \"FOR\""
 msgstr "Syntaxfehler, »FOR« erwartet"
 
-#: gram.y:1764
+#: gram.y:1768
 msgid "FETCH statement cannot return multiple rows"
 msgstr "FETCH-Anweisung kann nicht mehrere Zeilen zurückgeben"
 
-#: gram.y:1820
+#: gram.y:1824
 msgid "cursor variable must be a simple variable"
 msgstr "Cursor-Variable muss eine einfache Variable sein"
 
-#: gram.y:1826
+#: gram.y:1830
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "Variable »%s« muss Typ cursor oder refcursor haben"
 
-#: gram.y:1990
+#: gram.y:1994
 msgid "label does not exist"
 msgstr "Label existiert nicht"
 
-#: gram.y:2095 gram.y:2106
+#: gram.y:2099 gram.y:2110
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "»%s« ist keine bekannte Variable"
 
-#: gram.y:2208 gram.y:2218 gram.y:2346
+#: gram.y:2212 gram.y:2222 gram.y:2350
 msgid "mismatched parentheses"
 msgstr "Klammern passen nicht"
 
-#: gram.y:2222
+#: gram.y:2226
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "»%s« fehlt am Ende des SQL-Ausdrucks"
 
-#: gram.y:2228
+#: gram.y:2232
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "»%s« fehlt am Ende der SQL-Anweisung"
 
-#: gram.y:2245
+#: gram.y:2249
 msgid "missing expression"
 msgstr "Ausdruck fehlt"
 
-#: gram.y:2247
+#: gram.y:2251
 msgid "missing SQL statement"
 msgstr "SQL-Anweisung fehlt"
 
-#: gram.y:2348
+#: gram.y:2352
 msgid "incomplete data type declaration"
 msgstr "unvollständige Datentypdeklaration"
 
-#: gram.y:2370
+#: gram.y:2374
 msgid "missing data type declaration"
 msgstr "fehlende Datentypdeklaration"
 
-#: gram.y:2426
+#: gram.y:2430
 msgid "INTO specified more than once"
 msgstr "INTO mehr als einmal angegeben"
 
-#: gram.y:2594
+#: gram.y:2598
 msgid "expected FROM or IN"
 msgstr "FROM oder IN erwartet"
 
-#: gram.y:2654
+#: gram.y:2658
 msgid "RETURN cannot have a parameter in function returning set"
-msgstr "RETURN kann keinen Parameter haben in einer Funktion mit Mengenergebnis"
+msgstr ""
+"RETURN kann keinen Parameter haben in einer Funktion mit Mengenergebnis"
 
-#: gram.y:2655
+#: gram.y:2659
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Verwenden Sie RETURN NEXT oder RETURN QUERY."
 
-#: gram.y:2663
+#: gram.y:2667
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr ""
 "RETURN kann keinen Parameter haben in einer Funktion mit OUT-Parametern"
 
-#: gram.y:2672
+#: gram.y:2676
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr ""
 "RETURN kann keinen Parameter haben in einer Funktion, die »void« zurückgibt"
 
-#: gram.y:2690 gram.y:2697
+#: gram.y:2694 gram.y:2701
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN muss eine Record- oder Zeilenvariable angegeben in einer Funktion, "
 "die eine Zeile zurückgibt"
 
-#: gram.y:2739
+#: gram.y:2743
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "RETURN NEXT kann keinen Parameter haben in einer Funktion mit OUT-Parametern"
 
-#: gram.y:2754 gram.y:2761
+#: gram.y:2758 gram.y:2765
 msgid ""
 "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN NEXT muss eine Record- oder Zeilenvariable angegeben in einer "
 "Funktion, die eine Zeile zurückgibt"
 
-#: gram.y:2840
+#: gram.y:2844
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "»%s« wurde als CONSTANT deklariert"
 
-#: gram.y:2938
+#: gram.y:2906 gram.y:2918
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr "Record- oder Zeilenvariable kann nicht Teil einer INTO-Liste mit mehreren Elementen sein"
+
+#: gram.y:2963
 msgid "too many INTO variables specified"
 msgstr "zu viele INTO-Variablen angegeben"
 
-#: gram.y:3145
+#: gram.y:3170
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "Endlabel »%s« für ungelabelten Block angegeben"
 
-#: gram.y:3152
+#: gram.y:3177
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "Endlabel »%s« unterscheidet sich vom Label des Blocks »%s«"
 
-#: gram.y:3179
+#: gram.y:3204
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "Cursor »%s« hat keine Argumente"
 
-#: gram.y:3193
+#: gram.y:3218
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "Cursor »%s« hat Argumente"
 
-#: gram.y:3241
+#: gram.y:3266
 msgid "unrecognized RAISE statement option"
 msgstr "unbekannte Option für RAISE-Anweisung"
 
-#: gram.y:3245
+#: gram.y:3270
 msgid "syntax error, expected \"=\""
 msgstr "Syntaxfehler, »=« erwartet"
 
@@ -665,7 +676,9 @@ msgstr "FOR-über-EXECUTE-Anweisung"
 msgid ""
 "Sets handling of conflicts between PL/pgSQL variable names and table column "
 "names."
-msgstr "Bestimmt die Verarbeitung von Konflikten zwischen PL/pgSQL-Variablennamen und Tabellenspaltennamen."
+msgstr ""
+"Bestimmt die Verarbeitung von Konflikten zwischen PL/pgSQL-Variablennamen "
+"und Tabellenspaltennamen."
 
 #. translator: %s is typically the translation of "syntax error"
 #: pl_scanner.c:463
diff --git a/src/pl/plpgsql/src/po/es.po b/src/pl/plpgsql/src/po/es.po
index 77c3c1431bc..ff13c166a62 100644
--- a/src/pl/plpgsql/src/po/es.po
+++ b/src/pl/plpgsql/src/po/es.po
@@ -1,3 +1,4 @@
+# translation of plpgsql-es.po to
 # Spanish message translation file for plpgsql
 #
 # Copyright (C) 2008-2010 PostgreSQL Global Development Group
@@ -5,133 +6,125 @@
 #
 # Álvaro Herrera <[email protected]> 2008-2010
 # Emanuel Calvo Franco <[email protected]> 2008
+# Jaime Casanova <[email protected]> 2010
 #
-# pgtranslation Id: plpgsql.po,v 1.9 2010/02/02 20:07:49 alvherre Exp $
+# pgtranslation Id: plpgsql.po,v 1.10 2010/04/26 20:08:34 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plpgsql (PostgreSQL 8.4)\n"
+"Project-Id-Version: plpgsql (PostgreSQL 9.0)\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-11-03 17:08+0000\n"
-"PO-Revision-Date: 2010-02-02 17:01-0300\n"
-"Last-Translator: Álvaro Herrera <[email protected]>\n"
-"Language-Team: PgSQL-es-Ayuda <[email protected]>\n"
+"POT-Creation-Date: 2010-03-20 01:15+0000\n"
+"PO-Revision-Date: 2010-04-23 18:33-0500\n"
+"Last-Translator: \n"
+"Language-Team:  PgSQL-es-Ayuda <[email protected]>\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"
 
-#: pl_comp.c:418 pl_handler.c:229
+#: pl_comp.c:422 pl_handler.c:256
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "las funciones PL/pgSQL no pueden aceptar el tipo %s"
 
-#: pl_comp.c:497
+#: pl_comp.c:501
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
-"no se pudo determinar el tipo verdadero de resultado para la función "
+"no se pudo determinar el verdadero tipo de resultado para la función "
 "polimórfica «%s»"
 
-#: pl_comp.c:529
+#: pl_comp.c:531
 msgid "trigger functions can only be called as triggers"
-msgstr ""
-"las funciones de disparador sólo pueden ser invocadas como disparadores"
+msgstr "las funciones de disparador sólo pueden ser invocadas como disparadores"
 
-#: pl_comp.c:533 pl_handler.c:214
+#: pl_comp.c:535 pl_handler.c:241
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "las funciones PL/pgSQL no pueden retornar el tipo %s"
 
-#: pl_comp.c:574
+#: pl_comp.c:576
 msgid "trigger functions cannot have declared arguments"
 msgstr "las funciones de disparador no pueden tener argumentos declarados"
 
-#: pl_comp.c:575
+#: pl_comp.c:577
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
-msgstr ""
-"Los argumentos del disparador puede accederse usando TG_NARGS y TG_ARGV."
+msgstr "Los argumentos del disparador pueden accederse usando TG_NARGS y TG_ARGV."
 
-#: pl_comp.c:878
+#: pl_comp.c:880
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilación de la función PL/pgSQL «%s» cerca de la línea %d"
 
-#: pl_comp.c:949
-msgid "expected \"[\""
-msgstr "se esperaba «[»"
-
-#: pl_comp.c:1087
+#: pl_comp.c:978
 #, c-format
-msgid "row \"%s\" has no field \"%s\""
-msgstr "la fila «%s» no tiene un campo llamado «%s»"
+msgid "column reference \"%s\" is ambiguous"
+msgstr "la referencia a la columna «%s» es ambigua"
 
-#: pl_comp.c:1189
-#, c-format
-msgid "row \"%s.%s\" has no field \"%s\""
-msgstr "la fila «%s.%s» no tiene un campo llamado «%s»"
+#: pl_comp.c:980
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr "Podría referirse tanto a una variable PL/pgSQL como a una columna de una tabla."
 
-#: pl_comp.c:1501
+#: pl_comp.c:1690
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "no existe la relación «%s»"
 
-#: pl_comp.c:1546
+#: pl_comp.c:1722
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "no existe la relación «%s.%s»"
 
-#: pl_comp.c:1629
+#: pl_comp.c:1804
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variable «%s» tiene pseudotipo %s"
 
-#: pl_comp.c:1690
+#: pl_comp.c:1865
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "la relación «%s» no es una tabla"
 
-#: pl_comp.c:1863
+#: pl_comp.c:2017
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "el tipo «%s» está inconcluso"
 
-#: pl_comp.c:1933 pl_comp.c:1986
+#: pl_comp.c:2087 pl_comp.c:2140
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "no se reconoce la condición de excepción «%s»"
 
-#: pl_comp.c:2141
+#: pl_comp.c:2295
 #, c-format
-msgid ""
-"could not determine actual argument type for polymorphic function \"%s\""
+msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr ""
-"no se pudo determinar el tipo verdadero de resultado para la función "
+"no se pudo determinar el verdadero tipo de argumento para la función "
 "polimórfica «%s»"
 
 #: pl_exec.c:236 pl_exec.c:511
 msgid "during initialization of execution state"
 msgstr "durante la inicialización del estado de ejecución"
 
-#: pl_exec.c:243 pl_exec.c:638
+#: pl_exec.c:243
 msgid "while storing call arguments into local variables"
-msgstr ""
-"mientras se almacenaban los argumentos de invocación en variables locales"
+msgstr "mientras se almacenaban los argumentos de invocación en variables locales"
 
-#: pl_exec.c:298 pl_exec.c:649
+#: pl_exec.c:298 pl_exec.c:666
 msgid "during function entry"
 msgstr "durante el ingreso a la función"
 
-#: pl_exec.c:329 pl_exec.c:680
+#: pl_exec.c:329 pl_exec.c:697
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE no puede usarse fuera de un bucle"
 
-#: pl_exec.c:333 pl_exec.c:684
+#: pl_exec.c:333 pl_exec.c:701
 msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr ""
-"RAISE sin parámetros no puede ser usado fuera de un manejador de excepción"
+msgstr "RAISE sin parámetros no puede ser usado fuera de un manejador de excepción"
 
 #: pl_exec.c:337
 msgid "control reached end of function without RETURN"
@@ -140,10 +133,10 @@ msgstr "la ejecución alcanzó el fin de la función sin encontrar RETURN"
 #: pl_exec.c:344
 msgid "while casting return value to function's return type"
 msgstr ""
-"mientras se hacía conversión del valor de retorno al tipo de retorno de la "
+"mientras se hacía la conversión del valor de retorno al tipo de retorno de la "
 "función"
 
-#: pl_exec.c:357 pl_exec.c:2389
+#: pl_exec.c:357 pl_exec.c:2398
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "se llamó una función que retorna un conjunto en un contexto que no puede "
@@ -151,604 +144,528 @@ msgstr ""
 
 #: pl_exec.c:395
 msgid "returned record type does not match expected record type"
-msgstr ""
-"el tipo de registro retornado no coincide con el tipo de registro esperado"
+msgstr "el tipo de registro retornado no coincide con el tipo de registro esperado"
 
-#: pl_exec.c:453 pl_exec.c:692
+#: pl_exec.c:453 pl_exec.c:709
 msgid "during function exit"
 msgstr "durante la salida de la función"
 
-#: pl_exec.c:688
+#: pl_exec.c:705
 msgid "control reached end of trigger procedure without RETURN"
-msgstr ""
-"la ejecución alcanzó el fin del procedimiento disparador sin encontrar RETURN"
+msgstr "la ejecución alcanzó el fin del procedimiento disparador sin encontrar RETURN"
 
-#: pl_exec.c:697
+#: pl_exec.c:714
 msgid "trigger procedure cannot return a set"
 msgstr "los procedimientos disparadores no pueden retornar conjuntos"
 
-#: pl_exec.c:719
-msgid ""
-"returned row structure does not match the structure of the triggering table"
+#: pl_exec.c:736
+msgid "returned row structure does not match the structure of the triggering table"
 msgstr ""
 "la estructura de fila retornada no coincide con la estructura de la tabla "
 "que generó el evento de disparador"
 
-#: pl_exec.c:786
+#: pl_exec.c:799
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "función PL/pgSQL «%s» en la línea %d %s"
 
-#: pl_exec.c:797
+#: pl_exec.c:810
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "función PL/pgSQL «%s» %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:805
+#: pl_exec.c:818
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "función PL/pgSQL «%s» en la línea %d en %s"
 
-#: pl_exec.c:811
+#: pl_exec.c:824
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "función PL/pgSQL «%s»"
 
-#: pl_exec.c:920
+#: pl_exec.c:932
 msgid "during statement block local variable initialization"
 msgstr "durante inicialización de variables locales en el bloque de sentencias"
 
-#: pl_exec.c:962
+#: pl_exec.c:974
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
-msgstr ""
-"la variable «%s» declarada NOT NULL no puede tener un valor por omisión NULL"
+msgstr "la variable «%s» declarada NOT NULL no puede tener un valor por omisión NULL"
 
-#: pl_exec.c:1008
+#: pl_exec.c:1023
 msgid "during statement block entry"
 msgstr "durante la entrada al bloque de sentencias"
 
-#: pl_exec.c:1029
+#: pl_exec.c:1044
 msgid "during statement block exit"
 msgstr "durante la salida del bloque de sentencias"
 
-#: pl_exec.c:1072
+#: pl_exec.c:1087
 msgid "during exception cleanup"
 msgstr "durante la finalización por excepción"
 
-#: pl_exec.c:1538
+#: pl_exec.c:1553
 msgid "case not found"
 msgstr "caso no encontrado"
 
-#: pl_exec.c:1539
+#: pl_exec.c:1554
 msgid "CASE statement is missing ELSE part."
 msgstr "A la sentencia CASE le falta la parte ELSE."
 
-#: pl_exec.c:1695
+#: pl_exec.c:1710
 msgid "lower bound of FOR loop cannot be null"
 msgstr "el límite inferior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1710
+#: pl_exec.c:1725
 msgid "upper bound of FOR loop cannot be null"
 msgstr "el límite superior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1727
+#: pl_exec.c:1742
 msgid "BY value of FOR loop cannot be null"
 msgstr "el valor BY de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1733
+#: pl_exec.c:1748
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "el valor BY de un ciclo FOR debe ser mayor que cero"
 
-#: pl_exec.c:1905 pl_exec.c:3161
+#: pl_exec.c:1919 pl_exec.c:3179
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "el cursor «%s» ya está en uso"
 
-#: pl_exec.c:1928 pl_exec.c:3255
+#: pl_exec.c:1942 pl_exec.c:3241
 msgid "arguments given for cursor without arguments"
 msgstr "se dieron argumentos a un cursor sin argumentos"
 
-#: pl_exec.c:1947 pl_exec.c:3274
+#: pl_exec.c:1961 pl_exec.c:3260
 msgid "arguments required for cursor"
 msgstr "se requieren argumentos para el cursor"
 
-#: pl_exec.c:2165 gram.y:2493
+#: pl_exec.c:2182 gram.y:2729
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "no se puede usar RETURN NEXT en una función que no es SETOF"
 
-#: pl_exec.c:2189 pl_exec.c:2257
+#: pl_exec.c:2206 pl_exec.c:2272
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "se pasó un tipo incorrecto de resultado a RETURN NEXT"
 
-#: pl_exec.c:2213 pl_exec.c:3640 pl_exec.c:3932 pl_exec.c:3971
+#: pl_exec.c:2228 pl_exec.c:3629 pl_exec.c:3908 pl_exec.c:3942 pl_exec.c:4004
+#: pl_exec.c:4023 pl_exec.c:4060
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "el registro «%s» no ha sido asignado aún"
 
-#: pl_exec.c:2215 pl_exec.c:3642 pl_exec.c:3934 pl_exec.c:3973
+#: pl_exec.c:2230 pl_exec.c:3631 pl_exec.c:3910 pl_exec.c:3944 pl_exec.c:4006
+#: pl_exec.c:4025 pl_exec.c:4062
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
-msgstr ""
-"La estructura de fila de un registro aún no asignado no está determinado."
+msgstr "La estructura de fila de un registro aún no asignado no está determinado."
 
-#: pl_exec.c:2219 pl_exec.c:2238
+#: pl_exec.c:2234 pl_exec.c:2253
 msgid "wrong record type supplied in RETURN NEXT"
-msgstr "tipo de registro incorrecto suplantado en RETURN NEXT"
+msgstr "se pasó un tipo de registro incorrecto a RETURN NEXT"
 
-#: pl_exec.c:2282
+#: pl_exec.c:2295
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT debe tener un parámetro"
 
-#: pl_exec.c:2315 gram.y:2540
+#: pl_exec.c:2326 gram.y:2788
 msgid "cannot use RETURN QUERY in a non-SETOF function"
-msgstr ""
-"no se puede usar RETURN QUERY en una función que no ha sido declarada SETOF"
+msgstr "no se puede usar RETURN QUERY en una función que no ha sido declarada SETOF"
 
-#: pl_exec.c:2335
+#: pl_exec.c:2346
 msgid "structure of query does not match function result type"
-msgstr ""
-"la estructura de la consulta no coincide con el tipo del resultado de la "
-"función"
+msgstr "la estructura de la consulta no coincide con el tipo del resultado de la función"
 
-#: pl_exec.c:2459
+#: pl_exec.c:2478
 msgid "too few parameters specified for RAISE"
 msgstr "se especificaron muy pocos parámetros a RAISE"
 
-#: pl_exec.c:2485
+#: pl_exec.c:2504
 msgid "too many parameters specified for RAISE"
 msgstr "se especificaron demasiados parámetros a RAISE"
 
-#: pl_exec.c:2505
+#: pl_exec.c:2524
 msgid "RAISE statement option cannot be null"
 msgstr "la opción de sentencia en RAISE no puede ser null"
 
-#: pl_exec.c:2515 pl_exec.c:2524 pl_exec.c:2532 pl_exec.c:2540
+#: pl_exec.c:2534 pl_exec.c:2543 pl_exec.c:2551 pl_exec.c:2559
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "la opción de RAISE ya se especificó: %s"
 
-#: pl_exec.c:2575 pl_exec.c:2576
+#: pl_exec.c:2594 pl_exec.c:2595
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2718 pl_exec.c:3025
+#: pl_exec.c:2741 pl_exec.c:3044
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "no se puede ejecutar COPY desde/a un cliente en PL/pgSQL"
 
-#: pl_exec.c:2722 pl_exec.c:3029
+#: pl_exec.c:2745 pl_exec.c:3048
 msgid "cannot begin/end transactions in PL/pgSQL"
-msgstr "no se puede terminar/iniciar transacciones en PL/pgSQL"
+msgstr "no se pueden iniciar o terminar transacciones en PL/pgSQL"
 
-#: pl_exec.c:2723 pl_exec.c:3030
+#: pl_exec.c:2746 pl_exec.c:3049
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utilice un bloque BEGIN con una cláusula EXCEPTION."
 
-#: pl_exec.c:2875 pl_exec.c:3054
+#: pl_exec.c:2894 pl_exec.c:3073
 msgid "INTO used with a command that cannot return data"
-msgstr "INTO es utilizado con un comando uqe no puede retornar datos"
+msgstr "INTO es utilizado con una orden que no puede retornar datos"
 
-#: pl_exec.c:2895 pl_exec.c:3074
+#: pl_exec.c:2914 pl_exec.c:3093
 msgid "query returned no rows"
-msgstr "la consulta no regresó renglones"
+msgstr "la consulta no regresó filas"
 
-#: pl_exec.c:2904 pl_exec.c:3083
+#: pl_exec.c:2923 pl_exec.c:3102
 msgid "query returned more than one row"
-msgstr "la consulta regresó más de un renglón"
+msgstr "la consulta regresó más de una fila"
 
-#: pl_exec.c:2918
+#: pl_exec.c:2937
 msgid "query has no destination for result data"
 msgstr "la consulta no tiene un destino para los datos de resultado"
 
-#: pl_exec.c:2919
+#: pl_exec.c:2938
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Si quiere descartar los resultados de un SELECT, utilice PERFORM."
 
-#: pl_exec.c:2952 pl_exec.c:3202 pl_exec.c:5421
+#: pl_exec.c:2971 pl_exec.c:5528
 msgid "query string argument of EXECUTE is null"
 msgstr "el argumento de consulta a ejecutar en EXECUTE es null"
 
-#: pl_exec.c:3017
+#: pl_exec.c:3036
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "no está implementado EXECUTE de un SELECT ... INTO"
 
-#: pl_exec.c:3336 pl_exec.c:3427
+#: pl_exec.c:3324 pl_exec.c:3415
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "variable cursor «%s» es null"
 
-#: pl_exec.c:3343 pl_exec.c:3434
+#: pl_exec.c:3331 pl_exec.c:3422
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
 
-#: pl_exec.c:3357
+#: pl_exec.c:3345
 msgid "relative or absolute cursor position is null"
 msgstr "la posición relativa o absoluta del cursor es null"
 
-#: pl_exec.c:3494
+#: pl_exec.c:3482
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr ""
 "no puede asignarse un valor null a la variable «%s» que fue declarada NOT "
-"NULLNULL"
+"NULL"
 
-#: pl_exec.c:3539
+#: pl_exec.c:3540
 msgid "cannot assign non-composite value to a row variable"
-msgstr "no se puede asignar un valor no compuesto a una variable de tipo fila"
+msgstr "no se puede asignar un valor no compuesto a una variable de tipo row"
 
-#: pl_exec.c:3581
+#: pl_exec.c:3582
 msgid "cannot assign non-composite value to a record variable"
-msgstr "no se puede asignar un valor no compuesto a un registro variable"
+msgstr "no se puede asignar un valor no compuesto a una variable de tipo record"
 
-#: pl_exec.c:3653 pl_exec.c:3978
+#: pl_exec.c:3642 pl_exec.c:3949 pl_exec.c:4030 pl_exec.c:4067
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "el registro «%s» no tiene un campo «%s»"
 
-#: pl_exec.c:3751
+#: pl_exec.c:3740
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
-msgstr ""
-"el número de dimensiones del array (%d) excede el máximo permitido (%d)"
+msgstr "el número de dimensiones del array (%d) excede el máximo permitido (%d)"
 
-#: pl_exec.c:3765
+#: pl_exec.c:3754
 msgid "subscripted object is not an array"
 msgstr "el objeto al que se le puso un subíndice no es un array"
 
-#: pl_exec.c:3788
+#: pl_exec.c:3777
 msgid "array subscript in assignment must not be null"
-msgstr "subíndice de array en asignación no puede ser nulo"
-
-#: pl_exec.c:3894 pl_exec.c:3919 pl_exec.c:3956
-#, c-format
-msgid "type of \"%s\" does not match that when preparing the plan"
-msgstr "tipo de «%s» no coincide con aquel con el cual fue preparado el plan"
-
-#: pl_exec.c:3985
-#, c-format
-msgid "type of \"%s.%s\" does not match that when preparing the plan"
-msgstr "tipo de «%s.%s» no coincide con aquel con el cual fue preparado el plan"
+msgstr "subíndice de array en asignación no puede ser null"
 
-#: pl_exec.c:4010
-#, c-format
-msgid "type of tg_argv[%d] does not match that when preparing the plan"
-msgstr ""
-"tipo de tg_argv[%d] no coincide con aquel con el cual cuando fue preparado "
-"el plan"
-
-#: pl_exec.c:4103
+#: pl_exec.c:4158
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la consulta «%s» no retornó datos"
 
-#: pl_exec.c:4120
+#: pl_exec.c:4175
 #, c-format
 msgid "query \"%s\" returned more than one row"
-msgstr "la consulta «%s» retornó más de un registro"
+msgstr "la consulta «%s» retornó más de una fila"
 
-#: pl_exec.c:4125
+#: pl_exec.c:4180
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
-msgstr[0] "la consulta «%s» retornó una columna"
+msgstr[0] "la consulta «%s» retornó %d columna"
 msgstr[1] "la consulta «%s» retornó %d columnas"
 
-#: pl_exec.c:4186
+#: pl_exec.c:4242
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la consulta «%s» no es una orden SELECT"
 
-#: gram.y:359
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr "etiqueta de bloque debe estar antes de DECLARE, no después"
+
+#: gram.y:441
 msgid "row or record variable cannot be CONSTANT"
-msgstr "fila o registro variable no puede ser CONSTANT"
+msgstr "variable de tipo row o record no puede ser CONSTANT"
 
-#: gram.y:368
+#: gram.y:451
 msgid "row or record variable cannot be NOT NULL"
-msgstr "fila o registro variable no peude ser NOT NULL"
+msgstr "variable de tipo row o record no puede ser NOT NULL"
 
-#: gram.y:377
+#: gram.y:462
 msgid "default value for row or record variable is not supported"
-msgstr "valor por defecto de la fila o registro variable no soportado"
-
-#: gram.y:526
-msgid "only positional parameters can be aliased"
-msgstr "solo ls parámetros posicionados pueden tener alias"
+msgstr "el valor por omisión de una variable de tipo row o record no está soportado"
 
-#: gram.y:536
+#: gram.y:606 gram.y:632
 #, c-format
-msgid "function has no parameter \"%s\""
-msgstr "la función no tiene un parámetro «%s»"
+msgid "variable \"%s\" does not exist"
+msgstr "no existe la variable «%s»"
 
-#: gram.y:564 gram.y:568 gram.y:572
+#: gram.y:650 gram.y:663
 msgid "duplicate declaration"
 msgstr "declaración duplicada"
 
-#: gram.y:765 gram.y:769 gram.y:773
-msgid "expected an integer variable"
-msgstr "se esperaba una variable entera"
+#: gram.y:841
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "elemento de GET DIAGNOSTICS no reconocido"
 
-#: gram.y:1028 gram.y:1217
+#: gram.y:852 gram.y:2975
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "«%s» no es una variable escalar"
+
+#: gram.y:1114 gram.y:1306
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
 msgstr ""
-"variable de bucle de un bucle sobre filas debe ser un registro o una "
-"variable de tipo registro o una lista de variables escalares"
+"la variable de bucle de un bucle sobre filas debe ser una "
+"variable de tipo record o row o una lista de variables escalares"
 
-#: gram.y:1065
+#: gram.y:1148
 msgid "cursor FOR loop must have only one target variable"
 msgstr "un bucle FOR de un cursor debe tener sólo una variable de destino"
 
-#: gram.y:1077
+#: gram.y:1155
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "un bucle FOR en torno a un cursor debe usar un cursor enlazado (bound)"
 
-#: gram.y:1153
+#: gram.y:1238
 msgid "integer FOR loop must have only one target variable"
-msgstr ""
-"un bucle FOR de un número entero debe tener sólo una variable de destino"
+msgstr "un bucle FOR de un número entero debe tener sólo una variable de destino"
 
-#: gram.y:1186
+#: gram.y:1273
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "no se puede especificar REVERSE en un bucle FOR de una consulta"
 
-#: gram.y:1277 gram.y:2705
-#, c-format
-msgid "\"%s\" is not a scalar variable"
-msgstr "«%s» no es una variable escalar"
-
-#: gram.y:1330 gram.y:1370 gram.y:1414 gram.y:2200 gram.y:2295 gram.y:2397
-#: gram.y:3012
+#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
+#: gram.y:3249
 msgid "unexpected end of function definition"
 msgstr "fin inesperado de la definición de la función"
 
-#: gram.y:1434 gram.y:1456 gram.y:1470 gram.y:1478 gram.y:1539 gram.y:1626
-#: gram.y:1800
+#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1652 gram.y:1759
+#: gram.y:1936 gram.y:2015 gram.y:2128 gram.y:2706 gram.y:2770 gram.y:3209
+#: gram.y:3230
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: gram.y:1460 gram.y:1462 gram.y:1804 gram.y:1806
+#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
 msgid "invalid SQLSTATE code"
 msgstr "código SQLSTATE no válido"
 
-#: gram.y:1590 gram.y:2654 gram.y:2941
-#, c-format
-msgid "syntax error at \"%s\""
-msgstr "error de sintaxis en «%s»"
-
-#: gram.y:1592
-msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
-msgstr ""
-"Se esperaba «FOR», para abrir un cursor para una variable de cursor sin "
-"enlazar (unbound)"
+#: gram.y:1706
+msgid "syntax error, expected \"FOR\""
+msgstr "error de sintaxis, se esperaba «FOR»"
 
-#: gram.y:1635
+#: gram.y:1768
 msgid "FETCH statement cannot return multiple rows"
 msgstr "la sentencia FETCH no puede retornar múltiples filas"
 
-#: gram.y:1688
+#: gram.y:1824
 msgid "cursor variable must be a simple variable"
 msgstr "variable de cursor debe ser una variable simple"
 
-#: gram.y:1695
+#: gram.y:1830
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "la variable «%s» debe ser de tipo cursor o refcursor"
 
-#: gram.y:1702 gram.y:1706 gram.y:1710
-msgid "expected a cursor or refcursor variable"
-msgstr "se espera un cursor o una variable de referencia a cursor"
+#: gram.y:1994
+msgid "label does not exist"
+msgstr "la etiqueta no existe"
 
-#: gram.y:1935 gram.y:3108
-msgid "too many variables specified in SQL statement"
-msgstr "se especificaron demasiadas variables en la sentencia SQL"
+#: gram.y:2099 gram.y:2110
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "«%s» no es una variable conocida"
 
-#: gram.y:2020 gram.y:2030 gram.y:2123
+#: gram.y:2212 gram.y:2222 gram.y:2350
 msgid "mismatched parentheses"
 msgstr "no coinciden los paréntesis"
 
-#: gram.y:2035
+#: gram.y:2226
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "falta «%s» al final de la expresión SQL"
 
-#: gram.y:2040
+#: gram.y:2232
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "falta «%s» al final de la sentencia SQL"
 
-#: gram.y:2125
+#: gram.y:2249
+msgid "missing expression"
+msgstr "expresión faltante"
+
+#: gram.y:2251
+msgid "missing SQL statement"
+msgstr "sentencia SQL faltante"
+
+#: gram.y:2352
 msgid "incomplete data type declaration"
 msgstr "declaración de tipo de dato incompleta"
 
-#: gram.y:2150
+#: gram.y:2374
 msgid "missing data type declaration"
 msgstr "declaración de tipo de dato faltante"
 
-#: gram.y:2205
+#: gram.y:2430
 msgid "INTO specified more than once"
 msgstr "INTO fue especificado más de una vez"
 
-#: gram.y:2378
+#: gram.y:2598
 msgid "expected FROM or IN"
 msgstr "se espera FROM o IN"
 
-#: gram.y:2436
-msgid ""
-"RETURN cannot have a parameter in function returning set; use RETURN NEXT or "
-"RETURN QUERY"
-msgstr ""
-"RETURN no puede tener un parámetro en una función que retorna un conjunto; "
-"use RETURN NEXT o RETURN QUERY"
+#: gram.y:2658
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "RETURN no puede tener un parámetro en una función que retorna un conjunto"
 
-#: gram.y:2442
+#: gram.y:2659
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "Use RETURN NEXT o RETURN QUERY."
+
+#: gram.y:2667
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN no puede tener parámetros en una función con parámetros OUT"
 
-#: gram.y:2448
+#: gram.y:2676
 msgid "RETURN cannot have a parameter in function returning void"
-msgstr ""
-"RETURN no puede tener un parámetro en una función returnando valor vacío"
+msgstr "RETURN no puede tener parámetro en una función que retorna void"
 
-#: gram.y:2467 gram.y:2471
+#: gram.y:2694 gram.y:2701
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
-"RETURN debe especificar una variable de tipo record o registro en una "
+"RETURN debe especificar una variable de tipo record o row en una "
 "función que retorna una fila"
 
-#: gram.y:2504
+#: gram.y:2743
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
-msgstr ""
-"RETURN NEXT no puede tener parámetros en una función con parámetros OUT"
+msgstr "RETURN NEXT no puede tener parámetros en una función con parámetros OUT"
 
-#: gram.y:2520 gram.y:2524
-msgid ""
-"RETURN NEXT must specify a record or row variable in function returning row"
+#: gram.y:2758 gram.y:2765
+msgid "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
-"RETURN NEXT debe especificar una variable tipo record o registro en una "
+"RETURN NEXT debe especificar una variable tipo record o row en una "
 "función que retorna una fila"
 
-#: gram.y:2587
+#: gram.y:2844
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "«%s» esta declarada como CONSTANT"
 
-#: gram.y:2604
-msgid "cannot assign to tg_argv"
-msgstr "no se puede asignar a tg_argv"
+#: gram.y:2906 gram.y:2918
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr "una variable de tipo record o row no puede ser parte de una lista INTO de múltiples elementos"
 
-#: gram.y:2655
-msgid ""
-"Expected record variable, row variable, or list of scalar variables "
-"following INTO."
-msgstr ""
-"Se espera una variable registro, variable de tipo fila, o una lista de "
-"variables escalares seguido de INTO."
-
-#: gram.y:2689
+#: gram.y:2963
 msgid "too many INTO variables specified"
 msgstr "se especificaron demasiadas variables INTO"
 
-#: gram.y:2823
-#, c-format
-msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-msgstr "sentencia SQL en la función PL/PgSQL «%s» cerca de la línea %d"
-
-#: gram.y:2866
-#, c-format
-msgid "string literal in PL/PgSQL function \"%s\" near line %d"
-msgstr "literal de cadena en la función PL/PgSQL «%s» cerca de la línea %d"
-
-#: gram.y:2879
-msgid "label does not exist"
-msgstr "la etiqueta no existe"
-
-#: gram.y:2893
+#: gram.y:3170
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "etiqueta de término «%s» especificada para un bloque sin etiqueta"
 
-#: gram.y:2902
+#: gram.y:3177
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
-msgstr "el nombre de la tabla «%s» difiere del nombre de bloque «%s»"
+msgstr "etiqueta de término «%s» difiere de la etiqueta de bloque «%s»"
 
-#: gram.y:2932
+#: gram.y:3204
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "el cursor «%s» no tiene argumentos"
 
-#: gram.y:2954
+#: gram.y:3218
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "el cursor «%s» tiene argumentos"
 
-#: gram.y:2992
-msgid "expected \")\""
-msgstr "se esperaba «)»"
+#: gram.y:3266
+msgid "unrecognized RAISE statement option"
+msgstr "no se reconoce la opción de sentencia RAISE"
 
-#: gram.y:3029
-#, c-format
-msgid "unrecognized RAISE statement option \"%s\""
-msgstr "no se reconoce la opción «%s» de sentencia RAISE"
-
-#: gram.y:3034
+#: gram.y:3270
 msgid "syntax error, expected \"=\""
 msgstr "error de sintaxis, se esperaba «=»"
 
-#: pl_funcs.c:275
-#, c-format
-msgid "variable \"%s\" does not exist in the current block"
-msgstr "la variable «%s» no existe en el bloque actual"
-
-#: pl_funcs.c:331
-#, c-format
-msgid "unterminated \" in identifier: %s"
-msgstr "hay una comilla doble \" sin terminar en un identificador: %s"
-
-#: pl_funcs.c:355
-#, c-format
-msgid "qualified identifier cannot be used here: %s"
-msgstr "identificador calificado no puede utilizarse aquí: %s"
-
-#: pl_funcs.c:387
+#: pl_funcs.c:216
 msgid "statement block"
 msgstr "bloque de sentencias"
 
-#: pl_funcs.c:389
+#: pl_funcs.c:218
 msgid "assignment"
 msgstr "asignación"
 
-#: pl_funcs.c:399
+#: pl_funcs.c:228
 msgid "FOR with integer loop variable"
 msgstr "bucle FOR con variable entera"
 
-#: pl_funcs.c:401
+#: pl_funcs.c:230
 msgid "FOR over SELECT rows"
-msgstr "bucle FOR en torno a registros de un SELECT"
+msgstr "bucle FOR en torno a filas de un SELECT"
 
-#: pl_funcs.c:403
+#: pl_funcs.c:232
 msgid "FOR over cursor"
 msgstr "bucle FOR en torno a un cursor"
 
-#: pl_funcs.c:415
+#: pl_funcs.c:244
 msgid "SQL statement"
 msgstr "sentencia SQL"
 
-#: pl_funcs.c:417
+#: pl_funcs.c:246
 msgid "EXECUTE statement"
 msgstr "sentencia EXECUTE"
 
-#: pl_funcs.c:419
+#: pl_funcs.c:248
 msgid "FOR over EXECUTE statement"
 msgstr "bucle FOR en torno a una sentencia EXECUTE"
 
-#: scan.l:262
-msgid "unterminated quoted identifier"
-msgstr "un identificador entre comillas está inconcluso"
-
-#: scan.l:305
-msgid "unterminated /* comment"
-msgstr "un comentario /* está inconcluso"
-
-#: scan.l:341
-msgid "unterminated quoted string"
-msgstr "una cadena de caracteres entre comillas está inconclusa"
-
-#: scan.l:381
-msgid "unterminated dollar-quoted string"
-msgstr "cadena separada por $ inconclusa"
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr "Determina el manejo de conflictos entre nombres de variables PL/pgSQL y nombres de columnas de tablas."
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:445
+#: pl_scanner.c:463
 #, c-format
 msgid "%s at end of input"
 msgstr "%s al final de la entrada"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:454
+#: pl_scanner.c:479
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
+
diff --git a/src/pl/plpgsql/src/po/fr.po b/src/pl/plpgsql/src/po/fr.po
index 7ee4009bc6c..66ac79dff54 100644
--- a/src/pl/plpgsql/src/po/fr.po
+++ b/src/pl/plpgsql/src/po/fr.po
@@ -1,7 +1,7 @@
 # translation of plpgsql.po to fr_fr
 # french message translation file for plpgsql
 #
-# $PostgreSQL: pgsql/src/pl/plpgsql/src/po/fr.po,v 1.5 2009/12/19 20:23:26 petere Exp $
+# $PostgreSQL: pgsql/src/pl/plpgsql/src/po/fr.po,v 1.6 2010/05/13 15:56:43 petere Exp $
 #
 # Use these quotes: � %s �
 # Guillaume Lelarge <[email protected]>, 2009.
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-11-24 21:08+0000\n"
-"PO-Revision-Date: 2009-11-24 23:06+0100\n"
+"POT-Creation-Date: 2010-03-06 17:14+0000\n"
+"PO-Revision-Date: 2010-03-06 19:11+0100\n"
 "Last-Translator: Guillaume Lelarge <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -19,676 +19,674 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pl_comp.c:424
-#: pl_handler.c:258
+#: pl_comp.c:422
+#: pl_handler.c:256
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "les fonctions PL/pgsql ne peuvent pas accepter le type %s"
 
-#: pl_comp.c:503
+#: pl_comp.c:501
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "n'a pas pu d�terminer le type de retour actuel pour la fonction\n"
 "polymorphique � %s �"
 
-#: pl_comp.c:535
+#: pl_comp.c:531
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions triggers peuvent seulement �tre appel�es par des triggers"
 
-#: pl_comp.c:539
-#: pl_handler.c:243
+#: pl_comp.c:535
+#: pl_handler.c:241
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "les fonctions PL/pgsql ne peuvent pas renvoyer le type %s"
 
-#: pl_comp.c:580
+#: pl_comp.c:576
 msgid "trigger functions cannot have declared arguments"
 msgstr "les fonctions triggers ne peuvent pas avoir des arguments d�clar�s"
 
-#: pl_comp.c:581
+#: pl_comp.c:577
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr ""
 "Les arguments du trigger peuvent �tre acc�d�s via TG_NARGS et TG_ARGV �\n"
 "la place."
 
-#: pl_comp.c:884
+#: pl_comp.c:880
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilation de la fonction PL/pgsql � %s � pr�s de la ligne %d"
 
-#: pl_comp.c:982
+#: pl_comp.c:978
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la r�f�rence � la colonne � %s � est ambigu"
 
-#: pl_comp.c:984
+#: pl_comp.c:980
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr ""
 "Cela pourrait faire r�f�rence � une variable PL/pgsql ou � la colonne d'une\n"
 "table."
 
-#: pl_comp.c:1192
-#: pl_comp.c:1390
-#, c-format
-msgid "row \"%s\" has no field \"%s\""
-msgstr "la ligne � %s � n'a aucun champ � %s �"
-
-#: pl_comp.c:1492
-#, c-format
-msgid "row \"%s.%s\" has no field \"%s\""
-msgstr "la ligne � %s.%s � n'a aucun champ � %s �"
-
-#: pl_comp.c:1701
+#: pl_comp.c:1690
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "la relation � %s � n'existe pas"
 
-#: pl_comp.c:1733
+#: pl_comp.c:1722
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "la relation � %s.%s � n'existe pas"
 
-#: pl_comp.c:1815
+#: pl_comp.c:1804
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variable � %s � a le pseudo-type %s"
 
-#: pl_comp.c:1876
+#: pl_comp.c:1865
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "la relation � %s � n'est pas une table"
 
-#: pl_comp.c:2030
+#: pl_comp.c:2017
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "le type � %s � est seulement un shell"
 
-#: pl_comp.c:2100
-#: pl_comp.c:2153
+#: pl_comp.c:2087
+#: pl_comp.c:2140
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condition d'exception non reconnue � %s �"
 
-#: pl_comp.c:2308
+#: pl_comp.c:2295
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr ""
 "n'a pas pu d�terminer le type d'argument actuel pour la fonction\n"
 "polymorphique � %s �"
 
-#: pl_exec.c:235
-#: pl_exec.c:510
+#: pl_exec.c:236
+#: pl_exec.c:511
 msgid "during initialization of execution state"
 msgstr "durant l'initialisation de l'�tat de la fonction"
 
-#: pl_exec.c:242
+#: pl_exec.c:243
 msgid "while storing call arguments into local variables"
 msgstr "lors du stockage des arguments dans les variables locales"
 
-#: pl_exec.c:297
-#: pl_exec.c:665
+#: pl_exec.c:298
+#: pl_exec.c:666
 msgid "during function entry"
 msgstr "durant l'entr�e d'une fonction"
 
-#: pl_exec.c:328
-#: pl_exec.c:696
+#: pl_exec.c:329
+#: pl_exec.c:697
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE ne peut pas �tre utilis� � l'ext�rieur d'une boucle"
 
-#: pl_exec.c:332
-#: pl_exec.c:700
+#: pl_exec.c:333
+#: pl_exec.c:701
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr ""
 "RAISE sans param�tre ne peut pas �tre utilis� sans un gestionnaire\n"
 "d'exception"
 
-#: pl_exec.c:336
+#: pl_exec.c:337
 msgid "control reached end of function without RETURN"
 msgstr "le contr�le a atteint la fin de la fonction sans RETURN"
 
-#: pl_exec.c:343
+#: pl_exec.c:344
 msgid "while casting return value to function's return type"
 msgstr "lors de la conversion de la valeur de retour au type de retour de la fonction"
 
-#: pl_exec.c:356
-#: pl_exec.c:2406
+#: pl_exec.c:357
+#: pl_exec.c:2398
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "fonction renvoyant un ensemble appel�e dans un contexte qui ne peut pas\n"
 "accepter un ensemble"
 
-#: pl_exec.c:394
+#: pl_exec.c:395
 msgid "returned record type does not match expected record type"
 msgstr ""
 "le type d'enregistrement renvoy� ne correspond pas au type d'enregistrement\n"
 "attendu"
 
-#: pl_exec.c:452
-#: pl_exec.c:708
+#: pl_exec.c:453
+#: pl_exec.c:709
 msgid "during function exit"
 msgstr "lors de la sortie de la fonction"
 
-#: pl_exec.c:704
+#: pl_exec.c:705
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "le contr�le a atteint la fin de la proc�dure trigger sans RETURN"
 
-#: pl_exec.c:713
+#: pl_exec.c:714
 msgid "trigger procedure cannot return a set"
 msgstr "la proc�dure trigger ne peut pas renvoyer un ensemble"
 
-#: pl_exec.c:735
+#: pl_exec.c:736
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr ""
 "la structure de ligne renvoy�e ne correspond pas � la structure de la table\n"
 "du trigger"
 
-#: pl_exec.c:798
+#: pl_exec.c:799
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "fonction PL/pgsql � %s �, ligne %d, %s"
 
-#: pl_exec.c:809
+#: pl_exec.c:810
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "fonction PL/pgsql � %s �, %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:817
+#: pl_exec.c:818
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "fonction PL/pgsql � %s �, ligne %d � %s"
 
-#: pl_exec.c:823
+#: pl_exec.c:824
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "fonction PL/pgsql � %s �"
 
-#: pl_exec.c:931
+#: pl_exec.c:932
 msgid "during statement block local variable initialization"
 msgstr "lors de l'initialisation de variables locales du bloc d'instructions"
 
-#: pl_exec.c:973
+#: pl_exec.c:974
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "la variable � %s � d�clar�e NOT NULL ne peut pas valoir NULL par d�faut"
 
-#: pl_exec.c:1022
+#: pl_exec.c:1023
 msgid "during statement block entry"
 msgstr "lors de l'entr�e dans le bloc d'instructions"
 
-#: pl_exec.c:1043
+#: pl_exec.c:1044
 msgid "during statement block exit"
 msgstr "lors de la sortie du bloc d'instructions"
 
-#: pl_exec.c:1086
+#: pl_exec.c:1087
 msgid "during exception cleanup"
 msgstr "lors du nettoyage de l'exception"
 
-#: pl_exec.c:1552
+#: pl_exec.c:1553
 msgid "case not found"
 msgstr "case introuvable"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1554
 msgid "CASE statement is missing ELSE part."
 msgstr "l'instruction CASE n'a pas la partie ELSE."
 
-#: pl_exec.c:1709
+#: pl_exec.c:1710
 msgid "lower bound of FOR loop cannot be null"
 msgstr "la limite inf�rieure de la boucle FOR ne peut pas �tre NULL"
 
-#: pl_exec.c:1724
+#: pl_exec.c:1725
 msgid "upper bound of FOR loop cannot be null"
 msgstr "la limite sup�rieure de la boucle FOR ne peut pas �tre NULL"
 
-#: pl_exec.c:1741
+#: pl_exec.c:1742
 msgid "BY value of FOR loop cannot be null"
 msgstr "la valeur BY d'une boucle FOR ne peut pas �tre NULL"
 
-#: pl_exec.c:1747
+#: pl_exec.c:1748
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "la valeur BY d'une boucle FOR doit �tre plus grande que z�ro"
 
-#: pl_exec.c:1918
-#: pl_exec.c:3168
+#: pl_exec.c:1919
+#: pl_exec.c:3179
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "curseur � %s � d�j� en cours d'utilisation"
 
-#: pl_exec.c:1941
-#: pl_exec.c:3262
+#: pl_exec.c:1942
+#: pl_exec.c:3241
 msgid "arguments given for cursor without arguments"
 msgstr "arguments donn�s pour le curseur sans arguments"
 
-#: pl_exec.c:1960
-#: pl_exec.c:3281
+#: pl_exec.c:1961
+#: pl_exec.c:3260
 msgid "arguments required for cursor"
 msgstr "arguments requis pour le curseur"
 
 #: pl_exec.c:2182
-#: gram.y:2670
+#: gram.y:2729
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "ne peut pas utiliser RETURN NEXT dans une fonction non SETOF"
 
 #: pl_exec.c:2206
-#: pl_exec.c:2274
+#: pl_exec.c:2272
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "mauvais type de r�sultat fourni dans RETURN NEXT"
 
-#: pl_exec.c:2230
-#: pl_exec.c:3649
-#: pl_exec.c:3928
-#: pl_exec.c:3962
-#: pl_exec.c:4024
-#: pl_exec.c:4043
-#: pl_exec.c:4080
+#: pl_exec.c:2228
+#: pl_exec.c:3629
+#: pl_exec.c:3908
+#: pl_exec.c:3942
+#: pl_exec.c:4004
+#: pl_exec.c:4023
+#: pl_exec.c:4060
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "l'enregistrement � %s � n'est pas encore affect�e"
 
-#: pl_exec.c:2232
-#: pl_exec.c:3651
-#: pl_exec.c:3930
-#: pl_exec.c:3964
-#: pl_exec.c:4026
-#: pl_exec.c:4045
-#: pl_exec.c:4082
+#: pl_exec.c:2230
+#: pl_exec.c:3631
+#: pl_exec.c:3910
+#: pl_exec.c:3944
+#: pl_exec.c:4006
+#: pl_exec.c:4025
+#: pl_exec.c:4062
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "La structure de ligne d'un enregistrement pas encore affect� est ind�termin�e."
 
-#: pl_exec.c:2236
-#: pl_exec.c:2255
+#: pl_exec.c:2234
+#: pl_exec.c:2253
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "mauvais type d'enregistrement fourni � RETURN NEXT"
 
-#: pl_exec.c:2299
+#: pl_exec.c:2295
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT doit avoir un param�tre"
 
-#: pl_exec.c:2332
-#: gram.y:2729
+#: pl_exec.c:2326
+#: gram.y:2788
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "ne peut pas utiliser RETURN QUERY dans une fonction non SETOF"
 
-#: pl_exec.c:2352
+#: pl_exec.c:2346
 msgid "structure of query does not match function result type"
 msgstr "la structure de la requ�te ne correspond pas au type de r�sultat de la fonction"
 
-#: pl_exec.c:2476
+#: pl_exec.c:2478
 msgid "too few parameters specified for RAISE"
 msgstr "trop peu de param�tres pour RAISE"
 
-#: pl_exec.c:2502
+#: pl_exec.c:2504
 msgid "too many parameters specified for RAISE"
 msgstr "trop de param�tres pour RAISE"
 
-#: pl_exec.c:2522
+#: pl_exec.c:2524
 msgid "RAISE statement option cannot be null"
 msgstr "l'option de l'instruction RAISE ne peut pas �tre NULL"
 
-#: pl_exec.c:2532
-#: pl_exec.c:2541
-#: pl_exec.c:2549
-#: pl_exec.c:2557
+#: pl_exec.c:2534
+#: pl_exec.c:2543
+#: pl_exec.c:2551
+#: pl_exec.c:2559
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "option RAISE d�j� sp�cifi�e : %s"
 
-#: pl_exec.c:2592
-#: pl_exec.c:2593
+#: pl_exec.c:2594
+#: pl_exec.c:2595
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2730
-#: pl_exec.c:3033
+#: pl_exec.c:2741
+#: pl_exec.c:3044
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "ne peut pas utiliser COPY TO/FROM dans PL/pgsql"
 
-#: pl_exec.c:2734
-#: pl_exec.c:3037
+#: pl_exec.c:2745
+#: pl_exec.c:3048
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "ne peut pas utiliser les instructions BEGIN/END de transactions dans PL/pgsql"
 
-#: pl_exec.c:2735
-#: pl_exec.c:3038
+#: pl_exec.c:2746
+#: pl_exec.c:3049
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utiliser un bloc BEGIN dans une clause EXCEPTION � la place."
 
-#: pl_exec.c:2883
-#: pl_exec.c:3062
+#: pl_exec.c:2894
+#: pl_exec.c:3073
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO utilis� dans une commande qui ne peut pas envoyer de donn�es"
 
-#: pl_exec.c:2903
-#: pl_exec.c:3082
+#: pl_exec.c:2914
+#: pl_exec.c:3093
 msgid "query returned no rows"
 msgstr "la requ�te n'a renvoy� aucune ligne"
 
-#: pl_exec.c:2912
-#: pl_exec.c:3091
+#: pl_exec.c:2923
+#: pl_exec.c:3102
 msgid "query returned more than one row"
 msgstr "la requ�te a renvoy� plus d'une ligne"
 
-#: pl_exec.c:2926
+#: pl_exec.c:2937
 msgid "query has no destination for result data"
 msgstr "la requ�te n'a pas de destination pour les donn�es r�sultantes"
 
-#: pl_exec.c:2927
+#: pl_exec.c:2938
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Si vous voulez annuler les r�sultats d'un SELECT, utilisez PERFORM � la place."
 
-#: pl_exec.c:2960
-#: pl_exec.c:3209
-#: pl_exec.c:5540
+#: pl_exec.c:2971
+#: pl_exec.c:5528
 msgid "query string argument of EXECUTE is null"
 msgstr "l'argument de la requ�te de EXECUTE est NULL"
 
-#: pl_exec.c:3025
+#: pl_exec.c:3036
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE de SELECT ... INTO n'est pas implant�"
 
-#: pl_exec.c:3345
-#: pl_exec.c:3436
+#: pl_exec.c:3324
+#: pl_exec.c:3415
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "la variable du curseur � %s � est NULL"
 
-#: pl_exec.c:3352
-#: pl_exec.c:3443
+#: pl_exec.c:3331
+#: pl_exec.c:3422
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "le curseur � %s � n'existe pas"
 
-#: pl_exec.c:3366
+#: pl_exec.c:3345
 msgid "relative or absolute cursor position is null"
 msgstr "la position relative ou absolue du curseur est NULL"
 
-#: pl_exec.c:3503
+#: pl_exec.c:3482
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr ""
 "une valeur NULL ne peut pas �tre affect�e � la variable � %s � d�clar�e\n"
 "non NULL"
 
-#: pl_exec.c:3548
+#: pl_exec.c:3540
 msgid "cannot assign non-composite value to a row variable"
 msgstr "ne peut pas affecter une valeur non composite � une variable de type ROW"
 
-#: pl_exec.c:3590
+#: pl_exec.c:3582
 msgid "cannot assign non-composite value to a record variable"
 msgstr "ne peut pas affecter une valeur non composite � une variable RECORD"
 
-#: pl_exec.c:3662
-#: pl_exec.c:3969
-#: pl_exec.c:4050
-#: pl_exec.c:4087
+#: pl_exec.c:3642
+#: pl_exec.c:3949
+#: pl_exec.c:4030
+#: pl_exec.c:4067
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "l'enregistrement � %s � n'a pas de champs � %s �"
 
-#: pl_exec.c:3760
+#: pl_exec.c:3740
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "le nombre de dimensions du tableau (%d) d�passe la maximum autoris� (%d)"
 
-#: pl_exec.c:3774
+#: pl_exec.c:3754
 msgid "subscripted object is not an array"
 msgstr "l'objet souscrit n'est pas un tableau"
 
-#: pl_exec.c:3797
+#: pl_exec.c:3777
 msgid "array subscript in assignment must not be null"
 msgstr "un indice de tableau dans une affectation ne peut pas �tre NULL"
 
-#: pl_exec.c:4178
+#: pl_exec.c:4158
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la requ�te � %s � ne renvoie pas de donn�es"
 
-#: pl_exec.c:4195
+#: pl_exec.c:4175
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "la requ�te � %s � a renvoy� plus d'une ligne"
 
-#: pl_exec.c:4200
+#: pl_exec.c:4180
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "la requ�te � %s � a renvoy� %d colonne"
 msgstr[1] "la requ�te � %s � a renvoy� %d colonnes"
 
-#: pl_exec.c:4262
+#: pl_exec.c:4242
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la requ�te � %s � n'est pas un SELECT"
 
-#: gram.y:435
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr "le label du bloc doit �tre plac� avant DECLARE, et non pas apr�s"
+
+#: gram.y:441
 msgid "row or record variable cannot be CONSTANT"
 msgstr "la variable ROW ou RECORD ne peut pas �tre CONSTANT"
 
-#: gram.y:445
+#: gram.y:451
 msgid "row or record variable cannot be NOT NULL"
 msgstr "la variable ROW ou RECORD ne peut pas �tre NOT NULL"
 
-#: gram.y:456
+#: gram.y:462
 msgid "default value for row or record variable is not supported"
 msgstr "la valeur par d�faut de variable ROW ou RECORD n'est pas support�e"
 
-#: gram.y:600
-#: gram.y:626
+#: gram.y:606
+#: gram.y:632
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "la variable � %s � n'existe pas"
 
-#: gram.y:644
-#: gram.y:657
+#: gram.y:650
+#: gram.y:663
 msgid "duplicate declaration"
 msgstr "d�claration dupliqu�e"
 
-#: gram.y:835
+#: gram.y:841
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "�l�ment GET DIAGNOSTICS non reconnu"
 
-#: gram.y:846
-#: gram.y:2895
+#: gram.y:852
+#: gram.y:2975
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "� %s � n'est pas une variable scalaire"
 
-#: gram.y:1108
-#: gram.y:1300
+#: gram.y:1114
+#: gram.y:1306
 msgid "loop variable of loop over rows must be a record or row variable or list of scalar variables"
 msgstr ""
 "la variable d'une boucle sur des lignes doit �tre une variable de type\n"
 "RECORD ou ROW, ou encore une liste de variables scalaires"
 
-#: gram.y:1142
+#: gram.y:1148
 msgid "cursor FOR loop must have only one target variable"
 msgstr "le curseur de la boucle FOR doit avoir seulement une variable cible"
 
-#: gram.y:1149
+#: gram.y:1155
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "le curseur de la boucle FOR doit utiliser une variable curseur limit�"
 
-#: gram.y:1232
+#: gram.y:1238
 msgid "integer FOR loop must have only one target variable"
 msgstr "la boucle FOR de type entier doit avoir une seule variable cible"
 
-#: gram.y:1267
+#: gram.y:1273
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "ne peut pas sp�cifier REVERSE dans la requ�te de la boucle FOR"
 
-#: gram.y:1378
-#: gram.y:2059
-#: gram.y:2065
-#, c-format
-msgid "\"%s\" is not a known variable"
-msgstr "� %s � n'est pas une variable connue"
-
-#: gram.y:1421
-#: gram.y:1458
-#: gram.y:1506
-#: gram.y:2366
-#: gram.y:2447
-#: gram.y:2558
-#: gram.y:3169
+#: gram.y:1420
+#: gram.y:1457
+#: gram.y:1505
+#: gram.y:2425
+#: gram.y:2506
+#: gram.y:2617
+#: gram.y:3249
 msgid "unexpected end of function definition"
 msgstr "d�finition inattendue de la fin de fonction"
 
-#: gram.y:1526
-#: gram.y:1550
-#: gram.y:1562
-#: gram.y:1569
-#: gram.y:1630
-#: gram.y:1717
-#: gram.y:1894
-#: gram.y:1973
-#: gram.y:2069
-#: gram.y:2647
-#: gram.y:2711
-#: gram.y:3129
-#: gram.y:3150
+#: gram.y:1525
+#: gram.y:1549
+#: gram.y:1561
+#: gram.y:1568
+#: gram.y:1652
+#: gram.y:1759
+#: gram.y:1936
+#: gram.y:2015
+#: gram.y:2128
+#: gram.y:2706
+#: gram.y:2770
+#: gram.y:3209
+#: gram.y:3230
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: gram.y:1554
-#: gram.y:1556
-#: gram.y:1898
-#: gram.y:1900
+#: gram.y:1553
+#: gram.y:1555
+#: gram.y:1940
+#: gram.y:1942
 msgid "invalid SQLSTATE code"
 msgstr "code SQLSTATE invalide"
 
-#: gram.y:1684
+#: gram.y:1706
 msgid "syntax error, expected \"FOR\""
 msgstr "erreur de syntaxe, � FOR � attendu"
 
-#: gram.y:1726
+#: gram.y:1768
 msgid "FETCH statement cannot return multiple rows"
 msgstr "l'instruction FETCH ne peut pas renvoyer plusieurs lignes"
 
-#: gram.y:1782
+#: gram.y:1824
 msgid "cursor variable must be a simple variable"
 msgstr "la variable de curseur doit �tre une variable simple"
 
-#: gram.y:1788
+#: gram.y:1830
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "la variable � %s � doit �tre de type cursor ou refcursor"
 
-#: gram.y:1952
+#: gram.y:1994
 msgid "label does not exist"
 msgstr "le label n'existe pas"
 
-#: gram.y:2153
-#: gram.y:2163
-#: gram.y:2291
+#: gram.y:2099
+#: gram.y:2110
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "� %s � n'est pas une variable connue"
+
+#: gram.y:2212
+#: gram.y:2222
+#: gram.y:2350
 msgid "mismatched parentheses"
 msgstr "parenth�ses non correspondantes"
 
-#: gram.y:2167
+#: gram.y:2226
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "� %s � manquant � la fin de l'expression SQL"
 
-#: gram.y:2173
+#: gram.y:2232
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "� %s � manquant � la fin de l'instruction SQL"
 
-#: gram.y:2190
+#: gram.y:2249
 msgid "missing expression"
 msgstr "expression manquante"
 
-#: gram.y:2192
+#: gram.y:2251
 msgid "missing SQL statement"
 msgstr "instruction SQL manquante"
 
-#: gram.y:2293
+#: gram.y:2352
 msgid "incomplete data type declaration"
 msgstr "d�claration incompl�te d'un type de donn�es"
 
-#: gram.y:2315
+#: gram.y:2374
 msgid "missing data type declaration"
 msgstr "d�claration manquante d'un type de donn�es"
 
-#: gram.y:2371
+#: gram.y:2430
 msgid "INTO specified more than once"
 msgstr "INTO sp�cifi� plus d'une fois"
 
-#: gram.y:2539
+#: gram.y:2598
 msgid "expected FROM or IN"
 msgstr "attendait FROM ou IN"
 
-#: gram.y:2599
+#: gram.y:2658
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "RETURN ne peut pas avoir un param�tre dans une fonction renvoyant un ensemble"
 
-#: gram.y:2600
+#: gram.y:2659
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Utilisez RETURN NEXT ou RETURN QUERY."
 
-#: gram.y:2608
+#: gram.y:2667
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN ne peut pas avoir un param�tre dans une fonction avec des param�tres OUT"
 
-#: gram.y:2617
+#: gram.y:2676
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN ne peut pas avoir un param�tre dans une fonction renvoyant void"
 
-#: gram.y:2635
-#: gram.y:2642
+#: gram.y:2694
+#: gram.y:2701
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN ne peut pas indiquer une variable RECORD ou ROW dans une fonction\n"
 "renvoyant une ligne"
 
-#: gram.y:2684
+#: gram.y:2743
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "RETURN NEXT ne peut pas avoir un param�tre dans une fonction avec des\n"
 "param�tres OUT"
 
-#: gram.y:2699
-#: gram.y:2706
+#: gram.y:2758
+#: gram.y:2765
 msgid "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN NEXT doit indiquer une variable RECORD ou ROW dans une fonction\n"
 "renvoyant une ligne"
 
-#: gram.y:2785
+#: gram.y:2844
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "� %s � est d�clar� CONSTANT"
 
-#: gram.y:2883
+#: gram.y:2906
+#: gram.y:2918
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr ""
+"la variable de type RECORD ou ROW ne peut pas faire partie d'une liste INTO �\n"
+"plusieurs �l�ments"
+
+#: gram.y:2963
 msgid "too many INTO variables specified"
 msgstr "trop de variables INTO indiqu�es"
 
-#: gram.y:3090
+#: gram.y:3170
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "label de fin � %s � sp�cifi� pour un bloc sans label"
 
-#: gram.y:3097
+#: gram.y:3177
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "label de fin � %s � diff�rent du label � %s � du bloc"
 
-#: gram.y:3124
+#: gram.y:3204
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "le curseur � %s � n'a pas d'arguments"
 
-#: gram.y:3138
+#: gram.y:3218
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "le curseur � %s � a des arguments"
 
-#: gram.y:3186
+#: gram.y:3266
 msgid "unrecognized RAISE statement option"
 msgstr "option de l'instruction RAISE inconnue"
 
-#: gram.y:3190
+#: gram.y:3270
 msgid "syntax error, expected \"=\""
 msgstr "erreur de syntaxe, � = � attendu"
 
@@ -729,17 +727,21 @@ msgid "Sets handling of conflicts between PL/pgSQL variable names and table colu
 msgstr "Configure la gestion des conflits entre les noms de variables PL/pgsql et les noms des colonnes des tables."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:464
+#: pl_scanner.c:463
 #, c-format
 msgid "%s at end of input"
 msgstr "%s � la fin de l'entr�e"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:480
+#: pl_scanner.c:479
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s sur ou pr�s de � %s �"
 
+#~ msgid "row \"%s\" has no field \"%s\""
+#~ msgstr "la ligne � %s � n'a aucun champ � %s �"
+#~ msgid "row \"%s.%s\" has no field \"%s\""
+#~ msgstr "la ligne � %s.%s � n'a aucun champ � %s �"
 #~ msgid "expected \"[\""
 #~ msgstr "� [ � attendu"
 #~ msgid "type of \"%s\" does not match that when preparing the plan"
diff --git a/src/pl/plpgsql/src/po/it.po b/src/pl/plpgsql/src/po/it.po
index 48c0a20efe3..b4d2c2a24ed 100644
--- a/src/pl/plpgsql/src/po/it.po
+++ b/src/pl/plpgsql/src/po/it.po
@@ -11,7 +11,7 @@
 # Revisori:
 #  * Gabriele Bartolini <[email protected]>
 #
-# Copyright (c) 2009, Associazione Culturale ITPUG
+# Copyright (c) 2010, Associazione Culturale ITPUG
 # Distributed under the same license of the PostgreSQL project
 #
 # LANGUAGE message translation file for plpgsql
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-07-11 05:48+0000\n"
-"PO-Revision-Date: 2009-07-23 23:12:49+0200\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"
 "Language-Team: Gruppo traduzioni ITPUG <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -35,8 +35,8 @@ msgstr ""
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: pl_comp.c:418
-#: pl_handler.c:177
+#: pl_comp.c:422
+#: pl_handler.c:256
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "Le funzioni PL/pgSQL non accettano il tipo %s"
@@ -46,752 +46,798 @@ msgstr "Le funzioni PL/pgSQL non accettano il tipo %s"
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "impossibile determinare il reale tipo di ritorno per la funzione polimorfa \"%s\""
 
-#: pl_comp.c:533
+#: pl_comp.c:531
 msgid "trigger functions can only be called as triggers"
 msgstr "le funzioni trigger possono essere chiamate esclusivamente come trigger"
 
-#: pl_comp.c:537
-#: pl_handler.c:162
+#: pl_comp.c:535
+#: pl_handler.c:241
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "Le funzioni PL/pgSQL non possono restituire un tipo %s"
 
-#: pl_comp.c:578
+#: pl_comp.c:576
 msgid "trigger functions cannot have declared arguments"
 msgstr "Le funzioni trigger non possono avere argomenti dichiarati"
 
-#: pl_comp.c:579
+#: pl_comp.c:577
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr "Gli argomenti del trigger possono essere a loro volta acceduti tramite TG_NARGS e TG_ARGV "
 
-#: pl_comp.c:769
+#: pl_comp.c:880
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilazione della funzione PL/pgSQL \"%s\" in prossimità della linea %d"
 
-#: pl_comp.c:804
-msgid "expected \"[\""
-msgstr "atteso \"[\""
-
-#: pl_comp.c:942
+#: pl_comp.c:978
 #, c-format
-msgid "row \"%s\" has no field \"%s\""
-msgstr "la riga \"%s\" non ha nessun campo \"%s\""
+msgid "column reference \"%s\" is ambiguous"
+msgstr ""
 
-#: pl_comp.c:1044
-#, c-format
-msgid "row \"%s.%s\" has no field \"%s\""
-msgstr "la riga \"%s.%s\" non ha nessun campo \"%s\""
+#: pl_comp.c:980
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr ""
 
-#: pl_comp.c:1356
+#: pl_comp.c:1690
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "la relazione \"%s\" non esiste"
 
-#: pl_comp.c:1401
+#: pl_comp.c:1722
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "la relazione \"%s.%s\" non esiste"
 
-#: pl_comp.c:1484
+#: pl_comp.c:1804
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variabile \"%s\" ha lo pseudo-tipo %s"
 
-#: pl_comp.c:1545
+#: pl_comp.c:1865
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "la relazione \"%s\" non è una tabella"
 
-#: pl_comp.c:1718
+#: pl_comp.c:2017
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "il tipo \"%s\" non è un oggetto definito"
 
-#: pl_comp.c:1788
-#: pl_comp.c:1841
+#: pl_comp.c:2087
+#: pl_comp.c:2140
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condizione di eccezione \"%s\" non riconosciuta"
 
-#: pl_comp.c:1996
+#: pl_comp.c:2295
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "il tipo reale dell'argomento non è determinabile per la funzione polimorfa \"%s\""
 
-#: pl_exec.c:235
-#: pl_exec.c:505
+#: pl_exec.c:236
+#: pl_exec.c:511
 msgid "during initialization of execution state"
 msgstr "durante l'inizializzazione dello stato di esecuzione"
 
-#: pl_exec.c:242
-#: pl_exec.c:632
+#: pl_exec.c:243
 msgid "while storing call arguments into local variables"
 msgstr "durante la memorizzazione degli argomenti di chiamata in variabili locali"
 
-#: pl_exec.c:297
-#: pl_exec.c:643
+#: pl_exec.c:298
+#: pl_exec.c:666
 msgid "during function entry"
 msgstr "durante l'ingresso nella funzione"
 
-#: pl_exec.c:328
-#: pl_exec.c:674
+#: pl_exec.c:329
+#: pl_exec.c:697
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE non può essere usato all'esterno di un ciclo"
 
-#: pl_exec.c:332
-#: pl_exec.c:678
+#: pl_exec.c:333
+#: pl_exec.c:701
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "RAISE senza parametri non può essere usato all'esterno di un gestore di eccezioni"
 
-#: pl_exec.c:336
+#: pl_exec.c:337
 msgid "control reached end of function without RETURN"
 msgstr "il controllo ha raggiunto la fine di una funzione senza incontrare alcun RETURN"
 
-#: pl_exec.c:343
+#: pl_exec.c:344
 msgid "while casting return value to function's return type"
 msgstr "durante la conversione di tipo del valore di ritorno nel tipo di ritorno della funzione"
 
-#: pl_exec.c:356
-#: pl_exec.c:2357
+#: pl_exec.c:357
+#: pl_exec.c:2398
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "è stata chiamata una funzione che restituisce un insieme in un contesto che non può accettarlo"
 
-#: pl_exec.c:391
+#: pl_exec.c:395
 msgid "returned record type does not match expected record type"
 msgstr "il tipo del record restituito non coincide con quello atteso"
 
-#: pl_exec.c:447
-#: pl_exec.c:686
+#: pl_exec.c:453
+#: pl_exec.c:709
 msgid "during function exit"
 msgstr "durante l'uscita della funzione"
 
-#: pl_exec.c:682
+#: pl_exec.c:705
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "il controllo ha raggiunto la fine di una procedura trigger senza incontrare alcun RETURN"
 
-#: pl_exec.c:691
+#: pl_exec.c:714
 msgid "trigger procedure cannot return a set"
 msgstr "la procedura trigger non può tornare un insieme"
 
-#: pl_exec.c:709
+#: pl_exec.c:736
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr "la struttura della riga restituita non coincide con la struttura della tabella che ha generato il trigger"
 
-#: pl_exec.c:771
+#: pl_exec.c:799
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "funzione PL/pgSQL \"%s\" linea %d %s"
 
-#: pl_exec.c:782
+#: pl_exec.c:810
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "funzione PL/pgSQL \"%s\" %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:790
+#: pl_exec.c:818
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "funzione PL/pgSQL \"%s\" linea %d a %s"
 
-#: pl_exec.c:796
+#: pl_exec.c:824
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "funzione PL/pgSQL \"%s\""
 
-#: pl_exec.c:905
+#: pl_exec.c:932
 msgid "during statement block local variable initialization"
 msgstr "durante l'inizializzazione di variabili locali del blocco di istruzioni"
 
-#: pl_exec.c:947
+#: pl_exec.c:974
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "la variabile \"%s\" dichiarata NOT NULL non può avere valore di default NULL"
 
-#: pl_exec.c:993
+#: pl_exec.c:1023
 msgid "during statement block entry"
 msgstr "durante l'entrata nel blocco di istruzioni"
 
-#: pl_exec.c:1014
+#: pl_exec.c:1044
 msgid "during statement block exit"
 msgstr "durante l'uscita dal blocco di istruzioni"
 
-#: pl_exec.c:1057
+#: pl_exec.c:1087
 msgid "during exception cleanup"
 msgstr "durante la finalizzazione delle eccezioni"
 
-#: pl_exec.c:1523
+#: pl_exec.c:1553
 msgid "case not found"
 msgstr "caso non trovato"
 
-#: pl_exec.c:1524
+#: pl_exec.c:1554
 msgid "CASE statement is missing ELSE part."
 msgstr "all'istruzione CASE manca la parte ELSE."
 
-#: pl_exec.c:1680
+#: pl_exec.c:1710
 msgid "lower bound of FOR loop cannot be null"
 msgstr "il più limite inferiore per un ciclo FOR non può essere nullo"
 
-#: pl_exec.c:1695
+#: pl_exec.c:1725
 msgid "upper bound of FOR loop cannot be null"
 msgstr "il più limite superiore per un ciclo FOR non può essere null"
 
-#: pl_exec.c:1712
+#: pl_exec.c:1742
 msgid "BY value of FOR loop cannot be null"
 msgstr "il valore BY di un ciclo FOR non può essere null"
 
-#: pl_exec.c:1718
+#: pl_exec.c:1748
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "il valore BY di un ciclo FOR deve essere maggiore di zero"
 
-#: pl_exec.c:1890
-#: pl_exec.c:3129
+#: pl_exec.c:1919
+#: pl_exec.c:3179
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "il cursore \"%s\" è già in uso"
 
-#: pl_exec.c:1913
-#: pl_exec.c:3223
+#: pl_exec.c:1942
+#: pl_exec.c:3241
 msgid "arguments given for cursor without arguments"
 msgstr "sono stati passati argomenti al cursore che non ne accetta"
 
-#: pl_exec.c:1932
-#: pl_exec.c:3242
+#: pl_exec.c:1961
+#: pl_exec.c:3260
 msgid "arguments required for cursor"
 msgstr "sono richiesti argomenti per il cursore"
 
-#: pl_exec.c:2150
-#: gram.y:2419
+#: pl_exec.c:2182
+#: gram.y:2729
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "non si può usare RETURN NEXT in una funzione non-SETOF"
 
-#: pl_exec.c:2174
-#: pl_exec.c:2234
+#: pl_exec.c:2206
+#: pl_exec.c:2272
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "è stato fornito un tipo di risultato non corretto a RETURN NEXT"
 
-#: pl_exec.c:2197
-#: pl_exec.c:3608
-#: pl_exec.c:3900
-#: pl_exec.c:3939
+#: pl_exec.c:2228
+#: pl_exec.c:3629
+#: pl_exec.c:3908
+#: pl_exec.c:3942
+#: pl_exec.c:4004
+#: pl_exec.c:4023
+#: pl_exec.c:4060
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "il record \"%s\" non è stato ancora assegnato"
 
-#: pl_exec.c:2199
-#: pl_exec.c:3610
-#: pl_exec.c:3902
-#: pl_exec.c:3941
+#: pl_exec.c:2230
+#: pl_exec.c:3631
+#: pl_exec.c:3910
+#: pl_exec.c:3944
+#: pl_exec.c:4006
+#: pl_exec.c:4025
+#: pl_exec.c:4062
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "La struttura della tupla di un record non ancora assegnato è indeterminata"
 
-#: pl_exec.c:2202
-#: pl_exec.c:2215
+#: pl_exec.c:2234
+#: pl_exec.c:2253
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "è stato fornito un tipo di record non corretto a RETURN NEXT"
 
-#: pl_exec.c:2259
+#: pl_exec.c:2295
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT deve avere un parametro"
 
-#: pl_exec.c:2291
-#: gram.y:2466
+#: pl_exec.c:2326
+#: gram.y:2788
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "non si può usare RETURN QUERY in una funzione non-SETOF"
 
-#: pl_exec.c:2310
+#: pl_exec.c:2346
 msgid "structure of query does not match function result type"
 msgstr "la struttura della query non coincide con il tipo del risultato della funzione"
 
-#: pl_exec.c:2427
+#: pl_exec.c:2478
 msgid "too few parameters specified for RAISE"
 msgstr "numero non sufficiente di parametri specificati per RAISE"
 
-#: pl_exec.c:2453
+#: pl_exec.c:2504
 msgid "too many parameters specified for RAISE"
 msgstr "troppi parametri specificati per RAISE"
 
-#: pl_exec.c:2473
+#: pl_exec.c:2524
 msgid "RAISE statement option cannot be null"
 msgstr "l'opzione dell'istruzione RAISE non può essere nulla"
 
-#: pl_exec.c:2483
-#: pl_exec.c:2492
-#: pl_exec.c:2500
-#: pl_exec.c:2508
+#: pl_exec.c:2534
+#: pl_exec.c:2543
+#: pl_exec.c:2551
+#: pl_exec.c:2559
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "opzione RAISE già specificata: %s"
 
-#: pl_exec.c:2543
-#: pl_exec.c:2544
-#: pl_exec.c:5135
-#: pl_exec.c:5140
-#: pl_exec.c:5149
+#: pl_exec.c:2594
+#: pl_exec.c:2595
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2686
-#: pl_exec.c:2993
+#: pl_exec.c:2741
+#: pl_exec.c:3044
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "non è possibile usare COPY verso/da un client in PL/pgSQL"
 
-#: pl_exec.c:2690
-#: pl_exec.c:2997
+#: pl_exec.c:2745
+#: pl_exec.c:3048
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "non si possono avviare/terminare transazioni in PL/pgSQL"
 
-#: pl_exec.c:2691
-#: pl_exec.c:2998
+#: pl_exec.c:2746
+#: pl_exec.c:3049
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utilizza piuttosto un blocco BEGIN con una clausola EXCEPTION."
 
-#: pl_exec.c:2843
-#: pl_exec.c:3022
+#: pl_exec.c:2894
+#: pl_exec.c:3073
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO usato con un comando che non restituisce alcun dato"
 
-#: pl_exec.c:2863
-#: pl_exec.c:3042
+#: pl_exec.c:2914
+#: pl_exec.c:3093
 msgid "query returned no rows"
 msgstr "la query non ha restituito alcuna riga"
 
-#: pl_exec.c:2872
-#: pl_exec.c:3051
+#: pl_exec.c:2923
+#: pl_exec.c:3102
 msgid "query returned more than one row"
 msgstr "la query ha restituito più di una riga"
 
-#: pl_exec.c:2886
+#: pl_exec.c:2937
 msgid "query has no destination for result data"
 msgstr "la query non ha una destinatione per i dati restituiti"
 
-#: pl_exec.c:2887
+#: pl_exec.c:2938
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Se vuoi scartare i risultati di una SELECT, utilizza PERFORM."
 
-#: pl_exec.c:2920
-#: pl_exec.c:3170
-#: pl_exec.c:5427
+#: pl_exec.c:2971
+#: pl_exec.c:5528
 msgid "query string argument of EXECUTE is null"
 msgstr "l'argomento della query di EXECUTE è nullo"
 
-#: pl_exec.c:2985
+#: pl_exec.c:3036
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE di SELECT ... INTO non è implementato"
 
-#: pl_exec.c:3304
-#: pl_exec.c:3395
+#: pl_exec.c:3324
+#: pl_exec.c:3415
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "la variabile del cursore \"%s\" è nulla"
 
-#: pl_exec.c:3311
-#: pl_exec.c:3402
+#: pl_exec.c:3331
+#: pl_exec.c:3422
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "il cursore \"%s\" non esiste"
 
-#: pl_exec.c:3325
+#: pl_exec.c:3345
 msgid "relative or absolute cursor position is null"
 msgstr "la posizione relativa o assoluta del cursore è nulla"
 
-#: pl_exec.c:3462
+#: pl_exec.c:3482
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "il valore null non può essere assegnato alla variabile \"%s\" dichiarata NOT NULL"
 
-#: pl_exec.c:3507
+#: pl_exec.c:3540
 msgid "cannot assign non-composite value to a row variable"
 msgstr "impossibile assegnare un valore non composto ad una variabile di tipo row"
 
-#: pl_exec.c:3549
+#: pl_exec.c:3582
 msgid "cannot assign non-composite value to a record variable"
 msgstr "impossibile assegnare un valore non composto ad una variabile di tipo record"
 
-#: pl_exec.c:3621
-#: pl_exec.c:3946
+#: pl_exec.c:3642
+#: pl_exec.c:3949
+#: pl_exec.c:4030
+#: pl_exec.c:4067
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "il record \"%s\" non ha nessun campo \"%s\""
 
-#: pl_exec.c:3719
+#: pl_exec.c:3740
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "il numero di dimensioni dell'array (%d) supera il limite consentito (%d)"
 
-#: pl_exec.c:3733
+#: pl_exec.c:3754
 msgid "subscripted object is not an array"
 msgstr "l'oggetto sul quale è stato richiesto un sottoindice non è un array"
 
-#: pl_exec.c:3756
+#: pl_exec.c:3777
 msgid "array subscript in assignment must not be null"
 msgstr "l'indice di un array nell'assegnamento non deve essere nullo"
 
-#: pl_exec.c:3862
-#: pl_exec.c:3887
-#: pl_exec.c:3924
-#, c-format
-msgid "type of \"%s\" does not match that when preparing the plan"
-msgstr "il tipo di \"%s\" non coincide con quello in preparazione nel piano d'esecuzione"
-
-#: pl_exec.c:3953
-#, c-format
-msgid "type of \"%s.%s\" does not match that when preparing the plan"
-msgstr "il tipo di \"%s.%s\" non coincide con quello in preparazione nel piano d'esecuzione"
-
-#: pl_exec.c:3978
-#, c-format
-msgid "type of tg_argv[%d] does not match that when preparing the plan"
-msgstr "il tipo di tg_argv[%d] non coincide con quello in preparazione nel piano d'esecuzione"
-
-#: pl_exec.c:4071
+#: pl_exec.c:4158
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la query \"%s\" non ha restituito dati"
 
-#: pl_exec.c:4088
+#: pl_exec.c:4175
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "la query \"%s\" ha restituito più di una riga"
 
-#: pl_exec.c:4093
+#: pl_exec.c:4180
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "la query \"%s\" ha restituito %d colonna"
 msgstr[1] "la query \"%s\" ha restituito %d colonne"
 
-#: pl_exec.c:4154
+#: pl_exec.c:4242
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la query \"%s\" non è una SELECT"
 
-#: pl_exec.c:5130
-msgid "N/A (dropped column)"
-msgstr "N/D (colonna eliminata)"
-
-#: pl_exec.c:5141
-#, c-format
-msgid "Number of returned columns (%d) does not match expected column count (%d)."
-msgstr "Il numero di colonne restituite (%d) non coincide con il numero di colonne attese (%d)"
-
-#: pl_exec.c:5150
-#, c-format
-msgid "Returned type %s does not match expected type %s in column \"%s\"."
-msgstr "Il tipo ritornato %s non coincide con il tipo previsto %s nella colonna \"%s\""
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr ""
 
-#: gram.y:355
+#: gram.y:441
 msgid "row or record variable cannot be CONSTANT"
 msgstr "variabile di tipo ROW o RECORD non può essere CONSTANT"
 
-#: gram.y:364
+#: gram.y:451
 msgid "row or record variable cannot be NOT NULL"
 msgstr "la variabile di tipo ROW o RECORD non può essere NOT NULL"
 
-#: gram.y:373
+#: gram.y:462
 msgid "default value for row or record variable is not supported"
 msgstr "il valore di default per variabili di tipo ROW o RECORD non è supportato"
 
-#: gram.y:522
-msgid "only positional parameters can be aliased"
-msgstr "solo i parametri posizionali possono avere un alias"
-
-#: gram.y:532
-#, c-format
-msgid "function has no parameter \"%s\""
-msgstr "la funzione non ha alcun parametro \"%s\""
+#: gram.y:606
+#: gram.y:632
+#, fuzzy, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "la relazione \"%s\" non esiste"
 
-#: gram.y:560
-#: gram.y:564
-#: gram.y:568
+#: gram.y:650
+#: gram.y:663
 msgid "duplicate declaration"
 msgstr "dichiarazione duplicata"
 
-#: gram.y:761
-#: gram.y:765
-#: gram.y:769
-msgid "expected an integer variable"
-msgstr "è attesa una variabile intera"
+#: gram.y:841
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr ""
 
-#: gram.y:1024
-#: gram.y:1213
+#: gram.y:852
+#: gram.y:2975
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" non è una variabile scalare"
+
+#: gram.y:1114
+#: gram.y:1306
 msgid "loop variable of loop over rows must be a record or row variable or list of scalar variables"
 msgstr "variabile del ciclo sulle righe deve avere una variabile di tipo row o record o una lista di variabili scalari"
 
-#: gram.y:1061
+#: gram.y:1148
 msgid "cursor FOR loop must have only one target variable"
 msgstr "il cursore FOR nel ciclo deve avere solo una variabile obiettivo"
 
-#: gram.y:1073
+#: gram.y:1155
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "il cursore FOR nel ciclo deve usare una variabile cursore vincolata"
 
-#: gram.y:1149
+#: gram.y:1238
 msgid "integer FOR loop must have only one target variable"
 msgstr "il valore integer del ciclo FOR deve avere solo una variabile obiettivo"
 
-#: gram.y:1182
+#: gram.y:1273
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "non puoi specificare REVERSE nel ciclo query FOR"
 
-#: gram.y:1273
-#: gram.y:2631
-#, c-format
-msgid "\"%s\" is not a scalar variable"
-msgstr "\"%s\" non è una variabile scalare"
-
-#: gram.y:1326
-#: gram.y:1366
-#: gram.y:1410
-#: gram.y:2187
-#: gram.y:2278
-#: gram.y:2938
+#: gram.y:1420
+#: gram.y:1457
+#: gram.y:1505
+#: gram.y:2425
+#: gram.y:2506
+#: gram.y:2617
+#: gram.y:3249
 msgid "unexpected end of function definition"
 msgstr "inaspettata fine della definizione della funzione"
 
-#: gram.y:1430
-#: gram.y:1452
-#: gram.y:1466
-#: gram.y:1474
-#: gram.y:1535
-#: gram.y:1622
-#: gram.y:1787
+#: gram.y:1525
+#: gram.y:1549
+#: gram.y:1561
+#: gram.y:1568
+#: gram.y:1652
+#: gram.y:1759
+#: gram.y:1936
+#: gram.y:2015
+#: gram.y:2128
+#: gram.y:2706
+#: gram.y:2770
+#: gram.y:3209
+#: gram.y:3230
 msgid "syntax error"
 msgstr "errore di sintassi"
 
-#: gram.y:1456
-#: gram.y:1458
-#: gram.y:1791
-#: gram.y:1793
+#: gram.y:1553
+#: gram.y:1555
+#: gram.y:1940
+#: gram.y:1942
 msgid "invalid SQLSTATE code"
 msgstr "codice SQLSTATE invalido"
 
-#: gram.y:1586
-#: gram.y:2580
-#: gram.y:2867
-#, c-format
-msgid "syntax error at \"%s\""
-msgstr "errore di sintassi a \"%s\""
+#: gram.y:1706
+#, fuzzy
+msgid "syntax error, expected \"FOR\""
+msgstr "errore di sintassi, atteso \"=\""
 
-#: gram.y:1588
-msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
-msgstr "Atteso \"FOR\", per aprire un cursore su una variabile cursore non vincolata a nessuna query ('unbound')"
+#: gram.y:1768
+#, fuzzy
+msgid "FETCH statement cannot return multiple rows"
+msgstr "l'opzione dell'istruzione RAISE non può essere nulla"
 
-#: gram.y:1675
+#: gram.y:1824
 msgid "cursor variable must be a simple variable"
 msgstr "la variabile cursore deve essere una variabile semplice"
 
-#: gram.y:1682
+#: gram.y:1830
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "la variabile \"%s\" deve essere di tipo cursor o refcursor"
 
-#: gram.y:1689
-#: gram.y:1693
-#: gram.y:1697
-msgid "expected a cursor or refcursor variable"
-msgstr "attesa una variabile di tipo cursor o refcursor"
-
-#: gram.y:1922
-#: gram.y:3035
-msgid "too many variables specified in SQL statement"
-msgstr "troppe variabili specificate nell'istruzione SQL"
+#: gram.y:1994
+msgid "label does not exist"
+msgstr "etichetta non esistente"
 
-#: gram.y:2007
-#: gram.y:2017
+#: gram.y:2099
 #: gram.y:2110
+#, fuzzy, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" non è una variabile scalare"
+
+#: gram.y:2212
+#: gram.y:2222
+#: gram.y:2350
 msgid "mismatched parentheses"
 msgstr "le parentesi non coincidono"
 
-#: gram.y:2022
+#: gram.y:2226
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "manca \"%s\" alla fine della espressione SQL"
 
-#: gram.y:2027
+#: gram.y:2232
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "manca \"%s\" alla fine dell'istruzione SQL"
 
-#: gram.y:2112
+#: gram.y:2249
+#, fuzzy
+msgid "missing expression"
+msgstr "manca \"%s\" alla fine della espressione SQL"
+
+#: gram.y:2251
+#, fuzzy
+msgid "missing SQL statement"
+msgstr "istruzione SQL"
+
+#: gram.y:2352
 msgid "incomplete data type declaration"
 msgstr "dichiarazione del tipo di dati incompleta"
 
-#: gram.y:2137
+#: gram.y:2374
 msgid "missing data type declaration"
 msgstr "manca la dichiarazione del tipo di dati"
 
-#: gram.y:2192
+#: gram.y:2430
 msgid "INTO specified more than once"
 msgstr "INTO specificato più di una volta"
 
-#: gram.y:2341
+#: gram.y:2598
 msgid "expected FROM or IN"
 msgstr "atteso FROM o IN"
 
-#: gram.y:2362
-msgid "RETURN cannot have a parameter in function returning set; use RETURN NEXT or RETURN QUERY"
-msgstr "RETURN non può avere parametri all'interno di funzioni che restituiscono insiemi; utilizzare RETURN NEXT o RETURN QUERY"
+#: gram.y:2658
+#, fuzzy
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "RETURN non può avere un parametro in una procedura (funzione che restituisce void)"
+
+#: gram.y:2659
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr ""
 
-#: gram.y:2368
+#: gram.y:2667
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN non può avere un parametro in una funzione con parametri OUT"
 
-#: gram.y:2374
+#: gram.y:2676
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN non può avere un parametro in una procedura (funzione che restituisce void)"
 
-#: gram.y:2393
-#: gram.y:2397
+#: gram.y:2694
+#: gram.y:2701
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr "RETURN deve specificare una variabile RECORD o ROW in una funzione che restituisce una riga"
 
-#: gram.y:2430
+#: gram.y:2743
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "RETURN NEXT non può avere un parametro in una funzione con parametri OUT"
 
-#: gram.y:2446
-#: gram.y:2450
+#: gram.y:2758
+#: gram.y:2765
 msgid "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr "RETURN NEXT deve specificare una variabile RECORD o ROW in una funzione che restituisce una riga"
 
-#: gram.y:2513
+#: gram.y:2844
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" è dichiarata CONSTANT"
 
-#: gram.y:2530
-msgid "cannot assign to tg_argv"
-msgstr "non si può assegnare a tg_argv"
-
-#: gram.y:2581
-msgid "Expected record variable, row variable, or list of scalar variables following INTO."
-msgstr "Attesa una variabile di tipo RECORD, ROW o una lista di variabili scalari dopo la clausola INTO"
+#: gram.y:2906
+#: gram.y:2918
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr ""
 
-#: gram.y:2615
+#: gram.y:2963
 msgid "too many INTO variables specified"
 msgstr "troppe variabili INTO specificate"
 
-#: gram.y:2749
-#, c-format
-msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-msgstr "istruzione SQL nella funzione PL/PgSQL \"%s\" vicino alla linea %d"
-
-#: gram.y:2792
-#, c-format
-msgid "string literal in PL/PgSQL function \"%s\" near line %d"
-msgstr "stringa letterale nella funzione PL/PgSQL \"%s\" vicino alla linea %d"
-
-#: gram.y:2805
-msgid "label does not exist"
-msgstr "etichetta non esistente"
-
-#: gram.y:2819
+#: gram.y:3170
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "etichetta finale \"%s\" specificata per un blocco senza etichetta"
 
-#: gram.y:2828
+#: gram.y:3177
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "l'etichetta finale \"%s\" differisce da quella del blocco \"%s\""
 
-#: gram.y:2858
+#: gram.y:3204
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "il cursore \"%s\" non ha argomenti"
 
-#: gram.y:2880
+#: gram.y:3218
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "il cursore \"%s\" ha argomenti"
 
-#: gram.y:2918
-msgid "expected \")\""
-msgstr "atteso \")\""
-
-#: gram.y:2955
-#, c-format
-msgid "unrecognized RAISE statement option \"%s\""
+#: gram.y:3266
+#, fuzzy
+msgid "unrecognized RAISE statement option"
 msgstr "opzione \"%s\" dell'istruzione RAISE non riconosciuta"
 
-#: gram.y:2960
+#: gram.y:3270
 msgid "syntax error, expected \"=\""
 msgstr "errore di sintassi, atteso \"=\""
 
-#: pl_funcs.c:359
-#, c-format
-msgid "variable \"%s\" does not exist in the current block"
-msgstr "la variabile \"%s\" non esiste nel blocco corrente"
-
-#: pl_funcs.c:415
-#, c-format
-msgid "unterminated \" in identifier: %s"
-msgstr "\" non chiusa correttamente nell'identificatore: %s"
-
-#: pl_funcs.c:439
-#, c-format
-msgid "qualified identifier cannot be used here: %s"
-msgstr "l'identificatore qualificato non può essere usato in questo punto: %s"
-
-#: pl_funcs.c:471
+#: pl_funcs.c:216
 msgid "statement block"
 msgstr "blocco di istruzioni"
 
-#: pl_funcs.c:473
+#: pl_funcs.c:218
 msgid "assignment"
 msgstr "assegnazione"
 
-#: pl_funcs.c:483
+#: pl_funcs.c:228
 msgid "FOR with integer loop variable"
 msgstr "variabile intera di un ciclo FOR"
 
-#: pl_funcs.c:485
+#: pl_funcs.c:230
 msgid "FOR over SELECT rows"
 msgstr "ciclo FOR su righe di SELECT"
 
-#: pl_funcs.c:487
+#: pl_funcs.c:232
 msgid "FOR over cursor"
 msgstr "ciclo FOR su cursore"
 
-#: pl_funcs.c:499
+#: pl_funcs.c:244
 msgid "SQL statement"
 msgstr "istruzione SQL"
 
-#: pl_funcs.c:501
+#: pl_funcs.c:246
 msgid "EXECUTE statement"
 msgstr "istruzione EXECUTE"
 
-#: pl_funcs.c:503
+#: pl_funcs.c:248
 msgid "FOR over EXECUTE statement"
 msgstr "ciclo FOR su una istruzione EXECUTE"
 
-#: scan.l:263
-msgid "unterminated quoted identifier"
-msgstr "un identificatore delimitato da apici non è chiuso correttamente"
-
-#: scan.l:306
-msgid "unterminated /* comment"
-msgstr "commento /* non chiuso correttamente"
-
-#: scan.l:342
-msgid "unterminated quoted string"
-msgstr "una stringa delimitata da apici non è chiusa correttamente"
-
-#: scan.l:382
-msgid "unterminated dollar-quoted string"
-msgstr "stringa delimitata da $ non terminata"
+#: pl_handler.c:60
+msgid "Sets handling of conflicts between PL/pgSQL variable names and table column names."
+msgstr ""
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:445
+#: pl_scanner.c:463
 #, c-format
 msgid "%s at end of input"
 msgstr "%s alla fine dell'input"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:454
+#: pl_scanner.c:479
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s a o vicino \"%s\""
 
+#~ msgid "expected \"[\""
+#~ msgstr "atteso \"[\""
+
+#~ msgid "row \"%s\" has no field \"%s\""
+#~ msgstr "la riga \"%s\" non ha nessun campo \"%s\""
+
+#~ msgid "row \"%s.%s\" has no field \"%s\""
+#~ msgstr "la riga \"%s.%s\" non ha nessun campo \"%s\""
+
+#~ msgid "type of \"%s\" does not match that when preparing the plan"
+#~ msgstr ""
+#~ "il tipo di \"%s\" non coincide con quello in preparazione nel piano "
+#~ "d'esecuzione"
+
+#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
+#~ msgstr ""
+#~ "il tipo di \"%s.%s\" non coincide con quello in preparazione nel piano "
+#~ "d'esecuzione"
+
+#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
+#~ msgstr ""
+#~ "il tipo di tg_argv[%d] non coincide con quello in preparazione nel piano "
+#~ "d'esecuzione"
+
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/D (colonna eliminata)"
+
+#~ msgid ""
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ msgstr ""
+#~ "Il numero di colonne restituite (%d) non coincide con il numero di "
+#~ "colonne attese (%d)"
+
+#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
+#~ msgstr ""
+#~ "Il tipo ritornato %s non coincide con il tipo previsto %s nella colonna "
+#~ "\"%s\""
+
+#~ msgid "only positional parameters can be aliased"
+#~ msgstr "solo i parametri posizionali possono avere un alias"
+
+#~ msgid "function has no parameter \"%s\""
+#~ msgstr "la funzione non ha alcun parametro \"%s\""
+
+#~ msgid "expected an integer variable"
+#~ msgstr "è attesa una variabile intera"
+
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "errore di sintassi a \"%s\""
+
+#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
+#~ msgstr ""
+#~ "Atteso \"FOR\", per aprire un cursore su una variabile cursore non "
+#~ "vincolata a nessuna query ('unbound')"
+
+#~ msgid "expected a cursor or refcursor variable"
+#~ msgstr "attesa una variabile di tipo cursor o refcursor"
+
+#~ msgid "too many variables specified in SQL statement"
+#~ msgstr "troppe variabili specificate nell'istruzione SQL"
+
+#~ msgid ""
+#~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
+#~ "or RETURN QUERY"
+#~ msgstr ""
+#~ "RETURN non può avere parametri all'interno di funzioni che restituiscono "
+#~ "insiemi; utilizzare RETURN NEXT o RETURN QUERY"
+
+#~ msgid "cannot assign to tg_argv"
+#~ msgstr "non si può assegnare a tg_argv"
+
+#~ msgid ""
+#~ "Expected record variable, row variable, or list of scalar variables "
+#~ "following INTO."
+#~ msgstr ""
+#~ "Attesa una variabile di tipo RECORD, ROW o una lista di variabili scalari "
+#~ "dopo la clausola INTO"
+
+#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "istruzione SQL nella funzione PL/PgSQL \"%s\" vicino alla linea %d"
+
+#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr ""
+#~ "stringa letterale nella funzione PL/PgSQL \"%s\" vicino alla linea %d"
+
+#~ msgid "expected \")\""
+#~ msgstr "atteso \")\""
+
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "la variabile \"%s\" non esiste nel blocco corrente"
+
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "\" non chiusa correttamente nell'identificatore: %s"
+
+#~ msgid "qualified identifier cannot be used here: %s"
+#~ msgstr ""
+#~ "l'identificatore qualificato non può essere usato in questo punto: %s"
+
+#~ msgid "unterminated quoted identifier"
+#~ msgstr "un identificatore delimitato da apici non è chiuso correttamente"
+
+#~ msgid "unterminated /* comment"
+#~ msgstr "commento /* non chiuso correttamente"
+
+#~ msgid "unterminated quoted string"
+#~ msgstr "una stringa delimitata da apici non è chiusa correttamente"
+
+#~ msgid "unterminated dollar-quoted string"
+#~ msgstr "stringa delimitata da $ non terminata"
diff --git a/src/pl/plpython/po/es.po b/src/pl/plpython/po/es.po
index 762863c30d0..dfeebf657e4 100644
--- a/src/pl/plpython/po/es.po
+++ b/src/pl/plpython/po/es.po
@@ -4,16 +4,16 @@
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Emanuel Calvo Franco <[email protected]>, 2009.
-# Alvaro Herrera <[email protected]>, 2009
+# Alvaro Herrera <[email protected]>, 2009-2010
 #
-# pgtranslation Id: plpython.po,v 1.4 2010/02/02 20:07:49 alvherre Exp $
+# pgtranslation Id: plpython.po,v 1.5 2010/04/26 20:15:49 alvherre Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: plpython (PostgreSQL 8.4)\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-11-03 17:08+0000\n"
-"PO-Revision-Date: 2010-02-02 17:01-0300\n"
+"POT-Creation-Date: 2010-04-26 19:14+0000\n"
+"PO-Revision-Date: 2010-04-26 16:15-0400\n"
 "Last-Translator: Emanuel Calvo Franco <[email protected]>\n"
 "Language-Team: PgSQL-es-Ayuda <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -21,53 +21,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plpython.c:363
+#: plpython.c:418
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "función PL/Python «%s»"
 
-#: plpython.c:370
+#: plpython.c:424
+msgid "PL/Python anonymous code block"
+msgstr "bloque de código anónimo de PL/Python"
+
+#: plpython.c:431
 msgid "while modifying trigger row"
 msgstr "mientras se modificaba la fila de disparador"
 
-#: plpython.c:377
+#: plpython.c:438
 msgid "while creating return value"
 msgstr "mientras se creaba el valor de retorno"
 
-#: plpython.c:489 plpython.c:515
+#: plpython.c:604 plpython.c:630
 msgid "unexpected return value from trigger procedure"
 msgstr "valor de retorno no esperado desde el procedimiento disparador"
 
-#: plpython.c:490
+#: plpython.c:605
 msgid "Expected None or a string."
 msgstr "Se esperaba None o una cadena."
 
-#: plpython.c:505
+#: plpython.c:620
 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"
 
-#: plpython.c:516
+#: plpython.c:631
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Se esperaba None, «OK», «SKIP» o «MODIFY»."
 
-#: plpython.c:568
+#: plpython.c:683
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] borrado, no se puede modicar el registro"
 
-#: plpython.c:571
+#: plpython.c:686
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] no es un diccionario"
 
-#: plpython.c:595
+#: plpython.c:710
 #, 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:601
+#: plpython.c:716
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
@@ -75,97 +79,111 @@ msgid ""
 msgstr ""
 "la llave «%s» en TD[\"new\"] no existe como columna en la fila disparadora"
 
-#: plpython.c:694
+#: plpython.c:810
 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:901
+#: plpython.c:1017
 msgid "unsupported set function return mode"
 msgstr "modo de retorno de conjunto de función no soportado"
 
-#: plpython.c:902
+#: plpython.c:1018
 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:914
+#: plpython.c:1030
 msgid "returned object cannot be iterated"
 msgstr "objeto retornado no puede ser iterado"
 
-#: plpython.c:915
+#: plpython.c:1031
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "Los funciones PL/Python que retornan conjuntos deben retornar un objeto "
 "iterable."
 
-#: plpython.c:942
+#: plpython.c:1058
 msgid "error fetching next item from iterator"
 msgstr "error extrayendo el próximo elemento del iterador"
 
-#: plpython.c:964
+#: plpython.c:1080
 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:1055
-#, c-format
-msgid "PL/Python function \"%s\" failed"
-msgstr "la función PL/Python «%s» ha fallado"
-
-#: plpython.c:1121
+#: plpython.c:1237
 msgid "PyList_SetItem() failed, while setting up arguments"
-msgstr ""
-"PyList_SetItem() falló, mientras se inicializaban los argumentos"
+msgstr "PyList_SetItem() falló, mientras se inicializaban los argumentos"
 
-#: plpython.c:1125
+#: plpython.c:1241
 msgid "PyDict_SetItemString() failed, while setting up arguments"
-msgstr ""
-"PyDict_SetItemString() falló, mientras se inicializaban los argumentos"
+msgstr "PyDict_SetItemString() falló, mientras se inicializaban los argumentos"
 
-#: plpython.c:1303
+#: plpython.c:1416
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plpython.c:1307
+#: plpython.c:1420 plpython.c:1800
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "las funciones PL/Python no pueden retornar el tipo %s"
 
-#: plpython.c:1386
+#: plpython.c:1498
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "la funciones PL/Python no pueden aceptar el tipo %s"
 
-#: plpython.c:1480
+#: plpython.c:1592
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "no se pudo compilar la función PL/Python «%s»"
 
-#: plpython.c:1846
+#: plpython.c:1802
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr ""
+
+#: plpython.c:1996
+msgid "cannot convert multidimensional array to Python list"
+msgstr "no se puede convertir array multidimensional a una lista Python"
+
+#: plpython.c:1997
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr ""
+
+#: plpython.c:2031
 msgid "could not create new dictionary"
 msgstr "no se pudo crear un nuevo diccionario"
 
-#: plpython.c:1922 plpython.c:1969
+#: plpython.c:2107
+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:2163
 msgid "could not create string representation of Python object"
-msgstr "no se pudo crear la representación de cadema del objeto de Python"
+msgstr "no se pudo crear la representación de cadena de texto del objeto de Python"
 
-#: plpython.c:1980
+#: plpython.c:2174
 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)"
+"no se pudo convertir el objeto Python a un cstring: la representación de "
+"cadena Python parece tener bytes nulos (\\0)"
 
-#: plpython.c:2041
+#: plpython.c:2207
+msgid ""
+"return value of function with array return type is not a Python sequence"
+msgstr ""
+
+#: plpython.c:2282
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la llave «%s» no fue encontrada en el mapa"
 
-#: plpython.c:2042
+#: plpython.c:2283
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
@@ -173,18 +191,18 @@ msgstr ""
 "Para retornar null en una columna, agregue el valor None al mapa, con llave "
 "llamada igual que la columna."
 
-#: plpython.c:2085
+#: plpython.c:2326
 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"
 
-#: plpython.c:2178
+#: plpython.c:2419
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "el atributo «%s» no existe en el objeto Python"
 
-#: plpython.c:2179
+#: plpython.c:2420
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
@@ -192,110 +210,112 @@ msgstr ""
 "Para retornar null en una columna, haga que el objeto retornado tenga un "
 "atributo llamado igual que la columna, con valor None."
 
-#: plpython.c:2406
+#: plpython.c:2654
 msgid "plan.status takes no arguments"
 msgstr "plan.status no lleva argumentos"
 
-#: plpython.c:2530 plpython.c:2673
+#: plpython.c:2778 plpython.c:2921
 msgid "transaction aborted"
 msgstr "transacción abortada"
 
-#: plpython.c:2537
+#: plpython.c:2785
 msgid "invalid arguments for plpy.prepare"
 msgstr "argumentos no válidos para plpy.prepare"
 
-#: plpython.c:2544
+#: plpython.c:2792
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "el segundo argumento de plpy.prepare debe ser una secuencia"
 
-#: plpython.c:2594
+#: plpython.c:2842
 #, 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:2622
+#: plpython.c:2869
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare no soporta tipos compuestos"
 
-#: plpython.c:2650
+#: plpython.c:2898
 msgid "unrecognized error in PLy_spi_prepare"
 msgstr "error no reconocido en PLy_spi_prepare"
 
-#: plpython.c:2686
+#: plpython.c:2934
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera una consulta o un plan"
 
-#: plpython.c:2703
+#: plpython.c:2951
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute lleva una secuencia como segundo argumento"
 
-#: plpython.c:2719 plpython.c:2750
+#: plpython.c:2967
 msgid "could not execute plan"
 msgstr "no se pudo ejecutar el plan"
 
-#: plpython.c:2722
+#: 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] "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:2813
+#: plpython.c:3047
 msgid "unrecognized error in PLy_spi_execute_plan"
 msgstr "error no reconocido en PLy_spi_execute_plan"
 
-#: plpython.c:2832
+#: plpython.c:3066
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "falló SPI_execute_plan: %s"
 
-#: plpython.c:2858
+#: plpython.c:3093
 msgid "unrecognized error in PLy_spi_execute_query"
 msgstr "error no reconocido en PLy_spi_execute_query"
 
-#: plpython.c:2867
+#: plpython.c:3102
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "falló SPI_execute: %s"
 
-#: plpython.c:2927
+#: plpython.c:3162
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "error desconocido en PLy_spi_execute_fetch_result"
 
-#: plpython.c:2963
+#: plpython.c:3213
 msgid "untrapped error in initialization"
 msgstr "error no capturado en la inicialización"
 
-#: plpython.c:2966
+#: plpython.c:3216
 msgid "could not create procedure cache"
 msgstr "no se pudo crear el cache de procedimientos"
 
-#: plpython.c:2978
+#: plpython.c:3228
 msgid "could not import \"__main__\" module"
 msgstr "no se pudo importar el módulo «__main__»"
 
-#: plpython.c:2985
+#: plpython.c:3235
 msgid "could not initialize globals"
 msgstr "no se pudo inicializar las globales"
 
-#: plpython.c:3096
+#: plpython.c:3353
 msgid "could not parse error message in plpy.elog"
 msgstr "no se pudo analizar el mensaje de error de plpy.elog"
 
-#: plpython.c:3221 plpython.c:3225
+#: plpython.c:3482 plpython.c:3486
 #, c-format
 msgid "PL/Python: %s"
 msgstr "PL/Python: %s"
 
-#: plpython.c:3222
+#: plpython.c:3483
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3317
+#: plpython.c:3596
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: plpython.c:3371
+#: plpython.c:3650
 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"
+msgstr ""
+"no se pudo convertir el objeto Unicode de Python a la codificación de "
+"servidor de PostgreSQL"
diff --git a/src/pl/plpython/po/it.po b/src/pl/plpython/po/it.po
index f5a0e745ee8..a484fae5173 100644
--- a/src/pl/plpython/po/it.po
+++ b/src/pl/plpython/po/it.po
@@ -11,15 +11,15 @@
 # Revisori:
 #  * Gabriele Bartolini <[email protected]>
 #
-# Copyright (c) 2009, Associazione Culturale ITPUG
+# Copyright (c) 2010, Associazione Culturale ITPUG
 # Distributed under the same license of the PostgreSQL project
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: plpython-it\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-07-11 05:48+0000\n"
-"PO-Revision-Date: 2009-07-17 00:38:50+0200\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"
 "Language-Team: Gruppo traduzioni ITPUG <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -28,256 +28,293 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: plpython.c:428
-#: plpython.c:453
+#: plpython.c:418
+#, 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"
+
+#: plpython.c:604
+#: plpython.c:630
 msgid "unexpected return value from trigger procedure"
 msgstr "valore di ritorno inatteso dalla prodedura di trigger"
 
-#: plpython.c:429
+#: plpython.c:605
 msgid "Expected None or a string."
 msgstr "Atteso None o una stringa."
 
-#: plpython.c:443
+#: 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"
 
-#: plpython.c:454
+#: plpython.c:631
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Atteso None, \"OK\", \"SKIP\", o \"MODIFY\"."
 
-#: plpython.c:501
+#: plpython.c:683
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] cancellato, impossibile modificare la riga"
 
-#: plpython.c:504
+#: plpython.c:686
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] non è un dizionario"
 
-#: plpython.c:523
+#: plpython.c:710
 #, c-format
-msgid "name of TD[\"new\"] attribute at ordinal position %d is not a string"
-msgstr "il nome dell'attributo TD[\"new\"] alla posizione %d non è una stringa"
+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:527
+#: plpython.c:716
 #, 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:548
-#, c-format
-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"
-
-#: plpython.c:630
+#: 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"
 
-#: plpython.c:838
+#: plpython.c:1017
 msgid "unsupported set function return mode"
 msgstr "modalità di ritorno della funzione set non supportata"
 
-#: plpython.c:839
+#: plpython.c:1018
 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"
 
-#: plpython.c:851
+#: plpython.c:1030
 msgid "returned object cannot be iterated"
 msgstr "l'oggetto ritornato non può essere iterato"
 
-#: plpython.c:852
+#: plpython.c:1031
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "le funzioni set-returning di PL/Python devono tornare un oggetto iterabile"
 
-#: plpython.c:880
+#: plpython.c:1058
 msgid "error fetching next item from iterator"
 msgstr "errore nell'ottenere l'elemento successivo dall'iteratore"
 
-#: plpython.c:898
+#: plpython.c:1080
 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"
 
-#: plpython.c:945
-#, c-format
-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"
-
-#: plpython.c:994
-#, c-format
-msgid "PL/Python function \"%s\" failed"
-msgstr "la funzione PL/Python \"%s\" è fallita"
-
-#: plpython.c:1064
-#, c-format
-msgid "PyList_SetItem() failed for PL/Python function \"%s\" while setting up arguments"
-msgstr "PyList_SetItem() è fallita eseguendo la funzione PL/Python \"%s\" durante l'impostazione degli argomenti"
+#: plpython.c:1237
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "PyList_SetItem() è fallita durante l'impostazione degli argomenti"
 
-#: plpython.c:1068
-#, c-format
-msgid "PyDict_SetItemString() failed for PL/Python function \"%s\" while setting up arguments"
-msgstr "PyDict_SetItemString() è fallita eseguendo la funzione PL/Python \"%s\" durante l'impostazione degli argomenti"
+#: plpython.c:1241
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "PyDict_SetItemString() è fallita durante l'impostazione degli argomenti"
 
-#: plpython.c:1246
+#: plpython.c:1416
 msgid "trigger functions can only be called as triggers"
 msgstr "le funzioni trigger possono essere chiamate solo come trigger"
 
-#: plpython.c:1250
+#: plpython.c:1420
+#: plpython.c:1800
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "le funzioni PL/Python non possono tornare il tipo %s"
 
-#: plpython.c:1329
+#: plpython.c:1498
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "le funzioni PL/Python non possono accettare il tipo %s"
 
-#: plpython.c:1423
+#: plpython.c:1592
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "impossibile compilare la funzione PL/Python \"%s\""
 
-#: plpython.c:1735
+#: plpython.c:1802
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr ""
+
+#: plpython.c:1996
+msgid "cannot convert multidimensional array to Python list"
+msgstr ""
+
+#: plpython.c:1997
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr ""
+
+#: plpython.c:2031
 msgid "could not create new dictionary"
 msgstr "impossibile creare il nuovo dizionario"
 
-#: plpython.c:1822
-#: plpython.c:1911
-#: plpython.c:1982
-msgid "could not compute string representation of Python object"
-msgstr "impossibile calcolare la rappresentazione di tipo stringa dell'oggetto Python"
+#: plpython.c:2107
+msgid "could not create bytes representation of Python object"
+msgstr "impossibile creare la rappresentazione di tipo byte dell'oggetto Python"
+
+#: plpython.c:2163
+msgid "could not create string representation of Python object"
+msgstr "impossibile creare la rappresentazione di tipo stringa dell'oggetto Python"
+
+#: plpython.c:2174
+msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
+msgstr ""
+
+#: plpython.c:2207
+msgid "return value of function with array return type is not a Python sequence"
+msgstr ""
 
-#: plpython.c:1836
+#: plpython.c:2282
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la chiave \"%s\" non è stata trovata nel dizionario"
 
-#: plpython.c:1837
+#: 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."
 
-#: plpython.c:1881
+#: 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"
 
-#: plpython.c:1995
+#: plpython.c:2419
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "l'attributo \"%s\" non esiste nell'oggetto Python"
 
-#: plpython.c:1996
+#: 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."
 
-#: plpython.c:2218
+#: plpython.c:2654
 msgid "plan.status takes no arguments"
 msgstr "plan.status non accetta argomenti"
 
-#: plpython.c:2348
-#: plpython.c:2487
+#: plpython.c:2778
+#: plpython.c:2921
 msgid "transaction aborted"
 msgstr "transazione abortita"
 
-#: plpython.c:2355
+#: plpython.c:2785
 msgid "invalid arguments for plpy.prepare"
 msgstr "argomenti non validi per plpy.prepare"
 
-#: plpython.c:2362
+#: plpython.c:2792
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "il secondo argomento di plpy.prepare deve essere una sequenza"
 
-#: plpython.c:2407
+#: plpython.c:2842
 #, 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:2434
+#: plpython.c:2869
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare non supporta tipi composti"
 
-#: plpython.c:2462
+#: plpython.c:2898
 msgid "unrecognized error in PLy_spi_prepare"
 msgstr "errore non riconosciuto in PLy_spi_prepare"
 
-#: plpython.c:2464
-#: plpython.c:2628
-#: plpython.c:2675
-#, c-format
-msgid "in PL/Python function \"%s\""
-msgstr "nella funzione PL/Python \"%s\""
-
-#: plpython.c:2500
+#: plpython.c:2934
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute si aspetta una query o un plan"
 
-#: plpython.c:2517
+#: plpython.c:2951
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute richiede una sequenza come secondo argomento"
 
-#: plpython.c:2533
-#: plpython.c:2562
-#, c-format
-msgid "PL/Python function \"%s\" could not execute plan"
-msgstr "la funzione PL/Python \"%s\" non può eseguire il piano"
+#: plpython.c:2967
+msgid "could not execute plan"
+msgstr "impossibile eseguire il piano"
 
-#: plpython.c:2537
+#: 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:2626
+#: plpython.c:3047
 msgid "unrecognized error in PLy_spi_execute_plan"
 msgstr "errore non riconosciuto nella funzione PLy_spi_execute_plan"
 
-#: plpython.c:2647
+#: plpython.c:3066
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan ha fallito: %s"
 
-#: plpython.c:2673
+#: plpython.c:3093
 msgid "unrecognized error in PLy_spi_execute_query"
 msgstr "errore non riconosciuto nella funzione PLy_spi_execute_query"
 
-#: plpython.c:2684
+#: plpython.c:3102
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute ha fallito: %s"
 
-#: plpython.c:2744
+#: plpython.c:3162
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "errore non riconosciuto nella funzione PLy_spi_execute_fetch_result"
 
-#: plpython.c:2780
+#: plpython.c:3213
 msgid "untrapped error in initialization"
 msgstr "errore non catturato durante l'inizializzazione"
 
-#: plpython.c:2783
+#: plpython.c:3216
 msgid "could not create procedure cache"
 msgstr "impossibile creare la procedura cache"
 
-#: plpython.c:2795
+#: plpython.c:3228
 msgid "could not import \"__main__\" module"
 msgstr "impossibile importare il modulo \"__main__\""
 
-#: plpython.c:2802
+#: plpython.c:3235
 msgid "could not initialize globals"
 msgstr "impossibile inizializzare le variabili globali"
 
-#: plpython.c:2904
+#: plpython.c:3353
 msgid "could not parse error message in plpy.elog"
 msgstr "impossibile interpretare il messaggio di errore in plpy.elog"
 
-#: plpython.c:3020
+#: plpython.c:3482
+#: plpython.c:3486
 #, c-format
 msgid "PL/Python: %s"
 msgstr "PL/Python: %s"
 
-#: plpython.c:3021
+#: plpython.c:3483
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3111
+#: plpython.c:3596
 msgid "out of memory"
 msgstr "memoria esaurita"
 
+#: plpython.c:3650
+msgid "could not convert Python Unicode object to PostgreSQL server encoding"
+msgstr ""
+
+#~ 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"
diff --git a/src/pl/plpython/po/ja.po b/src/pl/plpython/po/ja.po
index b5dfc1db20d..03bb6018fca 100644
--- a/src/pl/plpython/po/ja.po
+++ b/src/pl/plpython/po/ja.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4beta1\n"
+"Project-Id-Version: PostgreSQL 8.5alpha3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-11 10:30+0900\n"
+"POT-Creation-Date: 2010-02-21 21:48+0900\n"
 "PO-Revision-Date: 2009-04-11 10:31+0900\n"
 "Last-Translator: HOTTA Michihide <[email protected]>\n"
 "Language-Team: Japan PostgreSQL Users Group <[email protected]>\n"
@@ -15,168 +15,176 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plpython.c:420 plpython.c:445
+#: plpython.c:418
+msgid "PL/Python function \"%s\""
+msgstr "PL/Python 関数 \"%s\""
+
+#: plpython.c:425
+msgid "while modifying trigger row"
+msgstr "トリガー行の変更中に"
+
+#: plpython.c:432
+msgid "while creating return value"
+msgstr "戻り値の作成中に"
+
+#: plpython.c:544 plpython.c:570
 msgid "unexpected return value from trigger procedure"
 msgstr "トリガー手続きから期待しない戻り値が返されました"
 
-#: plpython.c:421
+#: plpython.c:545
 msgid "Expected None or a string."
 msgstr "None もしくは文字列を期待していました。"
 
-#: plpython.c:435
+#: plpython.c:560
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr ""
-"PL/Python トリガー関数が、DELETE トリガーで \"MODIFY\" を返しました"
-"-- 無視しました"
+"PL/Python トリガー関数が、DELETE トリガーで \"MODIFY\" を返しました-- 無視し"
+"ました"
 
-#: plpython.c:446
+#: plpython.c:571
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "None, \"OK\", \"SKIP\", \"MODIFY\" のいずれかを期待していました"
 
-#: plpython.c:493
+#: plpython.c:623
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] は削除されました。今となっては変更できません。"
 
-#: plpython.c:496
+#: plpython.c:626
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] は辞書ではありません"
 
-#: plpython.c:515
-#, c-format
-msgid "name of TD[\"new\"] attribute at ordinal position %d is not a string"
+#: plpython.c:650
+msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "%d 番目の TD[\"new\"] 属性の名前が文字列ではありません"
 
-#: plpython.c:519
-#, c-format
+#: plpython.c:656
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
 "row"
 msgstr ""
-"TD[\"new\"] で見つかったキー \"%s\" は、行レベルトリガーにおけるカラムとしては"
-"存在しません"
+"TD[\"new\"] で見つかったキー \"%s\" は、行レベルトリガーにおけるカラムとして"
+"は存在しません"
 
-#: plpython.c:540
-#, c-format
-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:622
+#: plpython.c:749
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "トリガーの引数を構成中に、新しい辞書を生成できませんでした"
 
-#: plpython.c:830
+#: plpython.c:956
 msgid "unsupported set function return mode"
 msgstr "未サポートの集合関数リターンモードです"
 
-#: plpython.c:831
+#: plpython.c:957
 msgid ""
 "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
-"PL/Python の集合を返す関数では、１回のコールのたびに値だけを返すことが"
-"サポートされています"
+"PL/Python の集合を返す関数では、コールのたびに値だけを返すことしかできません"
 
-#: plpython.c:843
+#: plpython.c:969
 msgid "returned object cannot be iterated"
 msgstr "返されたオブジェクトは反復適用できません"
 
-#: plpython.c:844
+#: plpython.c:970
 msgid "PL/Python set-returning functions must return an iterable object."
-msgstr "PL/Python の集合を返す関数では、イテレータ（反復子）オブジェクトを"
+msgstr ""
+"PL/Python の集合を返す関数では、反復可能オブジェクトを"
 "返さなければなりません"
 
-#: plpython.c:872
+#: plpython.c:997
 msgid "error fetching next item from iterator"
 msgstr "イテレータ（反復子）から次の項目をフェッチ（取り出し）できません"
 
-#: plpython.c:890
+#: plpython.c:1019
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "\"void\" 型を返す PL/Python 関数は None 型を返しません"
 
-#: plpython.c:937
-#, c-format
-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:986
-#, c-format
+#: plpython.c:1110
 msgid "PL/Python function \"%s\" failed"
 msgstr "PL/Python 関数 \"%s\" が実行に失敗しました"
 
-#: plpython.c:1056
-#, c-format
-msgid ""
-"PyList_SetItem() failed for PL/Python function \"%s\" while setting up "
-"arguments"
-msgstr ""
-"PL/Python 関数 \"%s\" で引数を設定する際に、PyList_SetItem() に失敗しました"
+#: plpython.c:1176
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "引数を設定する際に、PyList_SetItem() に失敗しました"
 
-#: plpython.c:1060
-#, c-format
-msgid ""
-"PyDict_SetItemString() failed for PL/Python function \"%s\" while setting up "
-"arguments"
-msgstr ""
-"PL/Python 関数 \"%s\" で引数を設定する際に、PyDict_SetItemString() に失敗しました"
+#: plpython.c:1180
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "引数を設定する際に、PyDict_SetItemString() に失敗しました"
 
-#: plpython.c:1238
+#: plpython.c:1358
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数はトリガーとしてのみコールできます"
 
-#: plpython.c:1242
-#, c-format
+#: plpython.c:1362 plpython.c:1746
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python 関数は %s 型を返せません"
 
-#: plpython.c:1321
-#, c-format
+#: plpython.c:1441
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python 関数は %s 型を受け付けません"
 
-#: plpython.c:1415
-#, c-format
+#: plpython.c:1535
 msgid "could not compile PL/Python function \"%s\""
-msgstr "PL/Python 関数 \"%s\" をコンパイルできません"
+msgstr "PL/Python 関数 \"%s\" をコンパイルできませんでした"
+
+#: plpython.c:1748
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr "PL/Python は行タイプが配列の場合の変換をサポートしていません"
+
+#: plpython.c:1941
+msgid "cannot convert multidimensional array to Python list"
+msgstr "多次元配列を Python のリストに変換できません"
+
+#: plpython.c:1942
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python は一次元配列だけをサポートしています"
 
-#: plpython.c:1727
+#: plpython.c:1976
 msgid "could not create new dictionary"
-msgstr "新しいディレクトリを作れません"
+msgstr "新しいディレクトリを作れませんでした"
 
-#: plpython.c:1814 plpython.c:1903 plpython.c:1974
-msgid "could not compute string representation of Python object"
+#: plpython.c:2052
+msgid "could not create bytes representation of Python object"
+msgstr "Python オブジェクトのバイト表現を生成できませんでした"
+
+#: plpython.c:2107
+msgid "could not create string representation of Python object"
 msgstr "Python オブジェクトの文字列表現を生成できませんでした"
 
-#: plpython.c:1828
-#, c-format
+#: plpython.c:2118
+msgid ""
+"could not convert Python object into cstring: Python string representation "
+"appears to contain null bytes"
+msgstr ""
+"Python オブジェクトを ctring に変換できませんでした："
+"Python の文字列表現に null バイトが含まれているようです"
+
+#: plpython.c:2150
+msgid ""
+"return value of function with array return type is not a Python sequence"
+msgstr ""
+"配列の戻り値を持つ関数の戻り値は Python のシーケンスではありません"
+
+#: plpython.c:2222
 msgid "key \"%s\" not found in mapping"
 msgstr "マッピング上にキー \"%s\" が見つかりません"
 
-#: plpython.c:1829
+#: plpython.c:2223
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
 msgstr ""
-"カラムに null を入れて返すには、カラムの後につけた名前をキーとして、"
+"カラムに null を入れて返すには、そのカラムの後につけた名前をキーとして"
 "マッピングに None 値を追加してください"
 
-#: plpython.c:1873
+#: plpython.c:2266
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "返されたシーケンスの長さが、その行のカラム数と異なります"
 
-#: plpython.c:1987
-#, c-format
+#: plpython.c:2359
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "属性 \"%s\" が Python オブジェクト中に存在しません"
 
-#: plpython.c:1988
+#: plpython.c:2360
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
@@ -184,111 +192,104 @@ msgstr ""
 "カラムに null を入れて返す場合は、そのカラムの後につけた名前で表される属性が"
 "値として None を持ち、返されるオブジェクトがその属性を含むようにしてください"
 
-#: plpython.c:2210
+#: plpython.c:2594
 msgid "plan.status takes no arguments"
 msgstr "plan.status は引数を取りません"
 
-#: plpython.c:2340 plpython.c:2479
+#: plpython.c:2718 plpython.c:2861
 msgid "transaction aborted"
 msgstr "トランザクションがアボートしました"
 
-#: plpython.c:2347
+#: plpython.c:2725
 msgid "invalid arguments for plpy.prepare"
 msgstr "plpy.prepare の引数が不正です"
 
-#: plpython.c:2354
+#: plpython.c:2732
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "plpy.prepare の第二引数はシーケンスでなければなりません"
 
-#: plpython.c:2399
-#, c-format
+#: plpython.c:2782
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: %d 番目の型名が文字列ではありません"
 
-#: plpython.c:2426
+#: plpython.c:2810
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare は複合型をサポートしていません"
 
-#: plpython.c:2454
+#: plpython.c:2838
 msgid "unrecognized error in PLy_spi_prepare"
 msgstr "PLy_spi_prepare で認識できないエラーを検出しました"
 
-#: plpython.c:2456 plpython.c:2618 plpython.c:2665
-#, c-format
-msgid "in PL/Python function \"%s\""
-msgstr "PL/Python 関数 \"%s\" で"
-
-#: plpython.c:2492
+#: plpython.c:2874
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute はクエリーもしくは実行計画を期待していました"
 
-#: plpython.c:2509
+#: plpython.c:2891
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute は第二引数としてシーケンスを取ります"
 
-#: plpython.c:2525 plpython.c:2552
-#, c-format
-msgid "PL/Python function \"%s\" could not execute plan"
-msgstr "PL/Python 関数 \"%s\" は計画を実行できませんでした"
+#: plpython.c:2907 plpython.c:2938
+msgid "could not execute plan"
+msgstr "プランを実行できませんでした"
 
-#: plpython.c:2529
-#, c-format
+#: plpython.c:2910
 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:2616
+#: plpython.c:3001
 msgid "unrecognized error in PLy_spi_execute_plan"
 msgstr "PLy_spi_execute_plan で認識できないエラーを検出しました"
 
-#: plpython.c:2637
-#, c-format
+#: plpython.c:3020
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan が失敗しました：%s"
 
-#: plpython.c:2663
+#: plpython.c:3046
 msgid "unrecognized error in PLy_spi_execute_query"
 msgstr "PLy_spi_execute_query で認識できないエラーを検出しました"
 
-#: plpython.c:2674
-#, c-format
+#: plpython.c:3055
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute が失敗しました：%s"
 
-#: plpython.c:2734
+#: plpython.c:3115
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "PLy_spi_execute_fetch_result で認識できないエラーを検出しました"
 
-#: plpython.c:2770
+#: plpython.c:3166
 msgid "untrapped error in initialization"
 msgstr "初期化中に捕獲できないエラーがありました"
 
-#: plpython.c:2773
+#: plpython.c:3169
 msgid "could not create procedure cache"
 msgstr "手続き用キャッシュ(procedure cache)を生成できませんでした"
 
-#: plpython.c:2785
+#: plpython.c:3181
 msgid "could not import \"__main__\" module"
 msgstr "\"__main__\" モジュールをインポートできませんでした"
 
-#: plpython.c:2792
+#: plpython.c:3188
 msgid "could not initialize globals"
 msgstr "グローバル変数(globals)を初期化できませんでした"
 
-#: plpython.c:2894
+#: plpython.c:3303
 msgid "could not parse error message in plpy.elog"
 msgstr "plpy.elog でエラーメッセージをパースできませんでした"
 
-#: plpython.c:2990
-#, c-format
+#: plpython.c:3428 plpython.c:3432
 msgid "PL/Python: %s"
 msgstr "PL/Python: %s"
 
-#: plpython.c:2991
-#, c-format
+#: plpython.c:3429
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3081
+#: plpython.c:3524
 msgid "out of memory"
 msgstr "メモリ不足です"
+
+#: plpython.c:3595
+msgid "could not convert Python Unicode object to PostgreSQL server encoding"
+msgstr "Python のユニコードオブジェクトを PostgreSQL サーバーの"
+"エンコーディングに変換できませんでした"
diff --git a/src/pl/tcl/po/it.po b/src/pl/tcl/po/it.po
index 7d318b5294c..384afbab0eb 100644
--- a/src/pl/tcl/po/it.po
+++ b/src/pl/tcl/po/it.po
@@ -11,28 +11,28 @@
 # Revisori:
 #  * Gabriele Bartolini <[email protected]>
 #
-# Copyright (c) 2009, Associazione Culturale ITPUG
+# Copyright (c) 2010, Associazione Culturale ITPUG
 # Distributed under the same license of the PostgreSQL project
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pltcl\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-07-11 05:48+0000\n"
-"PO-Revision-Date: 2009-07-16 00:42:45+0200\n"
-"Last-Translator: Flavio Spada <[email protected]>\n"
+"POT-Creation-Date: 2010-03-26 13:16+0000\n"
+"PO-Revision-Date: 2010-03-27 12:44:19+0100\n"
+"Last-Translator: Gabriele Bartolini <[email protected]>\n"
 "Language-Team: Gruppo traduzioni ITPUG <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: pltcl.c:1027
+#: pltcl.c:1029
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1028
+#: pltcl.c:1030
 #, c-format
 msgid ""
 "%s\n"
@@ -45,20 +45,20 @@ msgstr ""
 msgid "out of memory"
 msgstr "memoria esaurita"
 
-#: pltcl.c:1192
+#: pltcl.c:1191
 msgid "trigger functions can only be called as triggers"
 msgstr "le funzioni trigger possono essere chiamate solo come trigger"
 
-#: pltcl.c:1201
+#: pltcl.c:1200
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "le funzioni PL/Tcl non possono ritornare il tipo %s"
 
-#: pltcl.c:1213
+#: pltcl.c:1212
 msgid "PL/Tcl functions cannot return composite types"
 msgstr "le funzioni PL.Tcl non possono ritornare tipi composti"
 
-#: pltcl.c:1253
+#: pltcl.c:1251
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "le funzioni PL/Tcl non possono accettare il tipo %s"