Translation updates

9 files changed, 1706 insertions, 733 deletions

diff --git a/src/pl/plperl/po/fr.po b/src/pl/plperl/po/fr.po
index 7e869894edb..dd178613dca 100644
--- a/src/pl/plperl/po/fr.po
+++ b/src/pl/plperl/po/fr.po
@@ -10,181 +10,199 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-06-29 21:15+0000\n"
-"PO-Revision-Date: 2010-06-29 23:30+0100\n"
+"POT-Creation-Date: 2011-06-13 14:52+0000\n"
+"PO-Revision-Date: 2011-06-13 17:49+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:255
+#: plperl.c:361
 msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Si true, le code Perl de confiance et sans confiance sera compil� en mode\n"
 "strict."
 
-#: plperl.c:263
+#: plperl.c:375
 msgid "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
 "Code d'initialisation Perl � ex�cuter lorsque un interpr�teur Perl est\n"
 "initialis�."
 
-#: plperl.c:280
+#: plperl.c:397
 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:288
+#: plperl.c:405
 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:453
-#: plperl.c:605
-#: plperl.c:610
-#: plperl.c:708
-#: plperl.c:721
-#: plperl.c:763
-#: plperl.c:778
-#: plperl.c:1315
-#: plperl.c:1423
-#: plperl.c:1479
+#: plperl.c:622
+#: plperl.c:784
+#: plperl.c:789
+#: plperl.c:893
+#: plperl.c:904
+#: plperl.c:945
+#: plperl.c:966
+#: plperl.c:1863
+#: plperl.c:1958
+#: plperl.c:2020
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:454
+#: plperl.c:623
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "lors de l'ex�cution de PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:606
+#: plperl.c:785
 msgid "while parsing Perl initialization"
 msgstr "lors de l'analyse de l'initialisation de perl"
 
-#: plperl.c:611
+#: plperl.c:790
 msgid "while running Perl initialization"
 msgstr "lors de l'ex�cution de l'initialisation de perl"
 
-#: plperl.c:709
+#: plperl.c:894
 msgid "while executing PLC_TRUSTED"
 msgstr "lors de l'ex�cution de PLC_TRUSTED"
 
-#: plperl.c:722
+#: plperl.c:905
 msgid "while executing utf8fix"
 msgstr "lors de l'ex�cution de utf8fix"
 
-#: plperl.c:764
+#: plperl.c:946
 msgid "while executing plperl.on_plperl_init"
 msgstr "lors de l'ex�cution de plperl.on_plperl_init"
 
-#: plperl.c:779
+#: plperl.c:967
 msgid "while executing plperl.on_plperlu_init"
 msgstr "lors de l'ex�cution de plperl.on_plperlu_init"
 
-#: plperl.c:821
-#: plperl.c:1018
+#: plperl.c:1013
+#: plperl.c:1536
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Le hachage Perl contient la colonne � %s � inexistante"
 
-#: plperl.c:994
+#: plperl.c:1095
+#, 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)"
+
+#: plperl.c:1109
+msgid "multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"les tableaux multidimensionnels doivent avoir des expressions de tableaux\n"
+"avec les dimensions correspondantes"
+
+#: plperl.c:1214
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "la fonction PL/perl doit renvoyer la r�f�rence � un hachage ou � un tableau"
+
+#: plperl.c:1513
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} n'existe pas"
 
-#: plperl.c:998
+#: plperl.c:1517
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} n'est pas une r�f�rence de hachage"
 
-#: plperl.c:1232
-#: plperl.c:1921
+#: plperl.c:1740
+#: plperl.c:2471
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "Les fonctions PL/perl ne peuvent pas renvoyer le type %s"
 
-#: plperl.c:1244
-#: plperl.c:1967
+#: plperl.c:1753
+#: plperl.c:2518
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "Les fonctions PL/perl ne peuvent pas accepter le type %s"
 
-#: plperl.c:1319
+#: plperl.c:1867
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "n'a pas obtenu une r�f�rence CODE lors de la compilation de la fonction � %s �"
 
-#: plperl.c:1531
+#: plperl.c:2072
 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:1574
+#: plperl.c:2116
 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:1607
+#: plperl.c:2145
 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:1616
+#: plperl.c:2154
 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:1736
+#: plperl.c:2268
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignore la ligne modifi�e dans le trigger DELETE"
 
-#: plperl.c:1744
+#: plperl.c:2276
 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:1856
+#: plperl.c:2402
+#: plperl.c:2408
 msgid "out of memory"
 msgstr "m�moire �puis�e"
 
-#: plperl.c:1912
+#: plperl.c:2462
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions trigger peuvent seulement �tre appel�es par des triggers"
 
-#: plperl.c:2225
+#: plperl.c:2838
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "ne peut pas utiliser return_next dans une fonction non SETOF"
 
-#: plperl.c:2231
+#: plperl.c:2844
 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:3025
+#: plperl.c:3610
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "fonction PL/Perl � %s �"
 
-#: plperl.c:3037
+#: plperl.c:3622
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilation de la fonction PL/Perl � %s �"
 
-#: plperl.c:3046
+#: plperl.c:3631
 msgid "PL/Perl anonymous code block"
 msgstr "bloc de code PL/Perl anonyme"
 
 #~ msgid "while executing PLC_SAFE_OK"
 #~ msgstr "lors de l'ex�cution de PLC_SAFE_OK"
+
 #~ msgid "creation of Perl function \"%s\" failed: %s"
 #~ msgstr "�chec de la cr�ation de la fonction Perl � %s � : %s"
+
 #~ msgid "error from Perl function \"%s\": %s"
 #~ msgstr "�chec dans la fonction Perl � %s � : %s"
-
diff --git a/src/pl/plperl/po/ja.po b/src/pl/plperl/po/ja.po
index d68ec883410..25a71f69fc0 100644
--- a/src/pl/plperl/po/ja.po
+++ b/src/pl/plperl/po/ja.po
@@ -5,103 +5,117 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
+"Project-Id-Version: PostgreSQL 9.1 beta 2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-17 18:33+0900\n"
-"PO-Revision-Date: 2010-07-17 18:33+0900\n"
-"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
+"POT-Creation-Date: 2011-06-15 17:12+0900\n"
+"PO-Revision-Date: 2011-06-15 21:48+0900\n"
+"Last-Translator: Honda Shigehiro\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plperl.c:257
+#: plperl.c:361
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "真ならば信頼し、信頼されないPerlのコードはstrictモードでコンパイルされます。"
 
-#: plperl.c:265
+#: plperl.c:375
 msgid ""
 "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr "Perl のインタプリタが初期化される際に実行されるべき Perl 初期化コード"
 
-#: plperl.c:282
+#: plperl.c:397
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr "plperl が最初に使用される際に一度実行されるべき Perl 初期化コード"
 
-#: plperl.c:290
+#: plperl.c:405
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr "plperlu が最初に使用される際に一度実行されるべき Perl 初期化コード"
 
-#: plperl.c:455 plperl.c:608 plperl.c:613 plperl.c:711 plperl.c:724
-#: plperl.c:766 plperl.c:781 plperl.c:1318 plperl.c:1426 plperl.c:1482
+#: plperl.c:622 plperl.c:784 plperl.c:789 plperl.c:893 plperl.c:904
+#: plperl.c:945 plperl.c:966 plperl.c:1863 plperl.c:1958 plperl.c:2020
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:456
+#: plperl.c:623
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "PostgreSQL::InServer::SPI::bootstrap の実行中に"
 
-#: plperl.c:609
+#: plperl.c:785
 msgid "while parsing Perl initialization"
 msgstr "Perl 初期化処理のパース中に"
 
-#: plperl.c:614
+#: plperl.c:790
 msgid "while running Perl initialization"
 msgstr "Perl 初期化処理の実行中に"
 
-#: plperl.c:712
+#: plperl.c:894
 msgid "while executing PLC_TRUSTED"
 msgstr "PLC_TRUSTED の実行中に"
 
-#: plperl.c:725
+#: plperl.c:905
 msgid "while executing utf8fix"
 msgstr "utf8fix の実行中に"
 
-#: plperl.c:767
+#: plperl.c:946
 msgid "while executing plperl.on_plperl_init"
 msgstr "plperl.on_plperl_init の実行中に"
 
-#: plperl.c:782
+#: plperl.c:967
 msgid "while executing plperl.on_plperlu_init"
 msgstr "plperl.on_plperlu_init の実行中に"
 
-#: plperl.c:824 plperl.c:1021
+#: plperl.c:1013 plperl.c:1536
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perlハッシュに存在しない列\"%s\"が含まれます"
 
-#: plperl.c:997
+#: plperl.c:1095
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "配列の次数(%d)が上限(%d)を超えています"
+
+#: plperl.c:1109
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr "多次元配列は次数に合った配列式を持たなければなりません"
+
+#: plperl.c:1214
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "PL/Perl関数はハッシュまたは配列への参照を返す必要があります"
+
+#: plperl.c:1513
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new}は存在しません"
 
-#: plperl.c:1001
+#: plperl.c:1517
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new}はハッシュへの参照ではありません"
 
-#: plperl.c:1235 plperl.c:1924
+#: plperl.c:1740 plperl.c:2471
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "PL/Perl関数は%s型を返すことができません"
 
-#: plperl.c:1247 plperl.c:1970
+#: plperl.c:1753 plperl.c:2518
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "PL/Perl関数は%s型を受け付けられません"
 
-#: plperl.c:1322
+#: plperl.c:1867
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "関数 \"%s\" のコンパイルからはコード参照を取得しませんでした"
 
-#: plperl.c:1534
+#: plperl.c:2072
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "このコンテキストで集合値の関数は集合を受け付けられません"
 
-#: plperl.c:1577
+#: plperl.c:2116
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
@@ -109,39 +123,39 @@ msgstr ""
 "集合を返すPL/Perl関数は配列への参照を返す、または、return_nextを使用する必要"
 "があります"
 
-#: plperl.c:1610
+#: plperl.c:2145
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr "複合型を返すPL/Perl関数はハッシュへの参照を返す必要があります"
 
-#: plperl.c:1619
+#: plperl.c:2154
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "レコード型を受け付けられないコンテキストでレコードを返す関数が呼び出されまし"
 "た"
 
-#: plperl.c:1739
+#: plperl.c:2268
 msgid "ignoring modified row in DELETE trigger"
 msgstr "DELETEトリガにて変更された行を無視します"
 
-#: plperl.c:1747
+#: plperl.c:2276
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr "PL/Perlトリガ関数の結果は\"SKIP\"または\"MODIFY\"でなければなりません"
 
-#: plperl.c:1859
+#: plperl.c:2402 plperl.c:2408
 msgid "out of memory"
 msgstr "メモリ不足です"
 
-#: plperl.c:1915
+#: plperl.c:2462
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数はトリガーとしてのみコールできます"
 
-#: plperl.c:2228
+#: plperl.c:2838
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "SETOF関数以外ではreturn_nextを使用することはできません"
 
-#: plperl.c:2234
+#: plperl.c:2844
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
@@ -149,16 +163,16 @@ msgstr ""
 "複合型のSETOFを返すPL/Perl関数はハッシュへの参照を持つreturn_nextを呼び出さな"
 "ければなりません"
 
-#: plperl.c:3028
+#: plperl.c:3610
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "PL/Perl 関数 \"%s\""
 
-#: plperl.c:3040
+#: plperl.c:3622
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "PL/Perl 関数 \"%s\" のコンパイル"
 
-#: plperl.c:3049
+#: plperl.c:3631
 msgid "PL/Perl anonymous code block"
 msgstr "PL/Perl の無名コードブロック"
diff --git a/src/pl/plperl/po/pt_BR.po b/src/pl/plperl/po/pt_BR.po
index a3856a4b178..0d241bde71f 100644
--- a/src/pl/plperl/po/pt_BR.po
+++ b/src/pl/plperl/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Brazilian Portuguese message translation file for plperl
 # Copyright (C) 2009 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2009-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-26 15:34-0300\n"
+"POT-Creation-Date: 2011-06-25 18:29-0300\n"
 "PO-Revision-Date: 2009-05-10 01:12-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -16,96 +16,117 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:257
+#: plperl.c:361
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Se verdadeiro, código Perl confiável e não-confiável será compilado em modo "
 "estrito."
 
-#: plperl.c:265
+#: plperl.c:375
 msgid ""
 "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
-"Código de inicialização Perl executado quando um interpretador Perl for inicializado."
+"Código de inicialização Perl executado quando um interpretador Perl for "
+"inicializado."
 
-#: plperl.c:282
+#: plperl.c:397
 msgid "Perl initialization code to execute once when plperl is first used."
-msgstr "Código de inicialização Perl executado quando plperl for utilizado pela primeira vez."
+msgstr ""
+"Código de inicialização Perl executado quando plperl for utilizado pela "
+"primeira vez."
 
-#: plperl.c:290
+#: plperl.c:405
 msgid "Perl initialization code to execute once when plperlu is first used."
-msgstr "Código de inicialização Perl executado quando plperlu for utilizado pela primeira vez."
+msgstr ""
+"Código de inicialização Perl executado quando plperlu for utilizado pela "
+"primeira vez."
 
-#: plperl.c:455 plperl.c:608 plperl.c:613 plperl.c:711 plperl.c:724
-#: plperl.c:766 plperl.c:781 plperl.c:1318 plperl.c:1426 plperl.c:1482
+#: plperl.c:622 plperl.c:784 plperl.c:789 plperl.c:893 plperl.c:904
+#: plperl.c:945 plperl.c:966 plperl.c:1863 plperl.c:1958 plperl.c:2020
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:456
+#: plperl.c:623
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "ao executar PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:609
+#: plperl.c:785
 msgid "while parsing Perl initialization"
 msgstr "ao analisar código de inicialização Perl"
 
-#: plperl.c:614
+#: plperl.c:790
 msgid "while running Perl initialization"
 msgstr "ao executar código de inicialização Perl"
 
-#: plperl.c:712
+#: plperl.c:894
 msgid "while executing PLC_TRUSTED"
 msgstr "ao executar PLC_TRUSTED"
 
-#: plperl.c:725
+#: plperl.c:905
 msgid "while executing utf8fix"
 msgstr "ao executar utf8fix"
 
-#: plperl.c:767
+#: plperl.c:946
 msgid "while executing plperl.on_plperl_init"
 msgstr "ao executar plperl.on_plperl_init"
 
-#: plperl.c:782
+#: plperl.c:967
 msgid "while executing plperl.on_plperlu_init"
 msgstr "ao executar plperl.on_plperlu_init"
 
-#: plperl.c:824 plperl.c:1021
+#: plperl.c:1013 plperl.c:1536
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "hash Perl contém coluna inexistente \"%s\""
 
-#: plperl.c:997
+#: plperl.c:1095
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "número de dimensões da matriz (%d) excede o máximo permitido (%d)"
+
+#: plperl.c:1109
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"matrizes multidimensionais devem ter expressões de matriz com dimensões "
+"correspondentes"
+
+#: plperl.c:1214
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "função PL/Perl deve retornar referência a um hash ou uma matriz"
+
+#: plperl.c:1513
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} não existe"
 
-#: plperl.c:1001
+#: plperl.c:1517
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} não é uma referência hash"
 
-#: plperl.c:1235 plperl.c:1924
+#: plperl.c:1740 plperl.c:2471
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "funções PL/Perl não podem retornar tipo %s"
 
-#: plperl.c:1247 plperl.c:1970
+#: plperl.c:1753 plperl.c:2518
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "funções PL/Perl não podem aceitar tipo %s"
 
-#: plperl.c:1322
+#: plperl.c:1867
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "não obteve uma referência CODE da compilação da função \"%s\""
 
-#: plperl.c:1534
+#: plperl.c:2072
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "função que tem argumento do tipo conjunto foi chamada em um contexto que não "
 "pode aceitar um conjunto"
 
-#: plperl.c:1577
+#: plperl.c:2116
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
@@ -113,40 +134,40 @@ msgstr ""
 "funçao PL/Perl que retorna conjunto deve retornar referência para matriz ou "
 "usar return_next"
 
-#: plperl.c:1610
+#: plperl.c:2145
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr "função que retorna tipo composto deve retornar referência a um hash"
 
-#: plperl.c:1619
+#: plperl.c:2154
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "função que retorna record foi chamada em um contexto que não pode aceitar "
 "tipo record"
 
-#: plperl.c:1739
+#: plperl.c:2268
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignorando registro modificado em gatilho DELETE"
 
-#: plperl.c:1747
+#: plperl.c:2276
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr ""
 "resultado da função de gatilho PL/Perl deve ser undef, \"SKIP\" ou \"MODIFY\""
 
-#: plperl.c:1859
+#: plperl.c:2402 plperl.c:2408
 msgid "out of memory"
 msgstr "sem memória"
 
-#: plperl.c:1915
+#: plperl.c:2462
 msgid "trigger functions can only be called as triggers"
 msgstr "funções de gatilho só podem ser chamadas como gatilhos"
 
-#: plperl.c:2228
+#: plperl.c:2838
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "não pode utilizar return_next em uma função que não retorna conjunto"
 
-#: plperl.c:2234
+#: plperl.c:2844
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
@@ -154,16 +175,16 @@ msgstr ""
 "função PL/Perl que retorna um conjunto de tipo composto deve chamar "
 "return_next com referência a um hash"
 
-#: plperl.c:3028
+#: plperl.c:3610
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "função PL/Perl \"%s\""
 
-#: plperl.c:3040
+#: plperl.c:3622
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilação da função PL/Perl \"%s\""
 
-#: plperl.c:3049
+#: plperl.c:3631
 msgid "PL/Perl anonymous code block"
 msgstr "bloco de código PL/Perl anônimo"
diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
index 5be1859a903..d28f06e834d 100644
--- a/src/pl/plpgsql/src/nls.mk
+++ b/src/pl/plpgsql/src/nls.mk
@@ -1,6 +1,6 @@
 # src/pl/plpgsql/src/nls.mk
 CATALOG_NAME     = plpgsql
-AVAIL_LANGUAGES  = de es fr it ja ko pt_BR ro zh_CN zh_TW
+AVAIL_LANGUAGES  = de es fr it ja ko pl pt_BR ro zh_CN zh_TW
 GETTEXT_FILES    = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/pl/plpgsql/src/po/fr.po b/src/pl/plpgsql/src/po/fr.po
index 8336dd787b9..95fdc7a0380 100644
--- a/src/pl/plpgsql/src/po/fr.po
+++ b/src/pl/plpgsql/src/po/fr.po
@@ -10,725 +10,768 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-06-29 21:15+0000\n"
-"PO-Revision-Date: 2010-06-29 23:32+0100\n"
+"POT-Creation-Date: 2011-06-13 14:52+0000\n"
+"PO-Revision-Date: 2011-06-13 17:57+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pl_comp.c:422
-#: pl_handler.c:256
+#: pl_comp.c:427
+#: pl_handler.c:266
 #, 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:501
+#: pl_comp.c:506
 #, 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:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions triggers peuvent seulement �tre appel�es par des triggers"
 
-#: pl_comp.c:535
-#: pl_handler.c:241
+#: pl_comp.c:540
+#: pl_handler.c:251
 #, 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:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "les fonctions triggers ne peuvent pas avoir des arguments d�clar�s"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 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:880
+#: pl_comp.c:912
 #, 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:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "le nom du param�tre � %s � est utilis� plus d'une fois"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la r�f�rence � la colonne � %s � est ambigu"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 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:1690
+#: pl_comp.c:1227
+#: pl_comp.c:1255
+#: pl_exec.c:3862
+#: pl_exec.c:4208
+#: pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "l'enregistrement � %s � n'a pas de champs � %s �"
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "la relation � %s � n'existe pas"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "la relation � %s.%s � n'existe pas"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variable � %s � a le pseudo-type %s"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "la relation � %s � n'est pas une table"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "le type � %s � est seulement un shell"
 
-#: pl_comp.c:2087
-#: pl_comp.c:2140
+#: pl_comp.c:2190
+#: pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condition d'exception non reconnue � %s �"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, 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:236
-#: pl_exec.c:511
+#: pl_exec.c:239
+#: pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "durant l'initialisation de l'�tat de la fonction"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr "lors du stockage des arguments dans les variables locales"
 
-#: pl_exec.c:298
-#: pl_exec.c:666
+#: pl_exec.c:301
+#: pl_exec.c:667
 msgid "during function entry"
 msgstr "durant l'entr�e d'une fonction"
 
-#: pl_exec.c:329
-#: pl_exec.c:697
+#: pl_exec.c:332
+#: pl_exec.c:698
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE ne peut pas �tre utilis� � l'ext�rieur d'une boucle"
 
-#: 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:337
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "le contr�le a atteint la fin de la fonction sans RETURN"
 
-#: pl_exec.c:344
+#: pl_exec.c:343
 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:357
-#: pl_exec.c:2409
+#: pl_exec.c:356
+#: pl_exec.c:2591
 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:395
+#: pl_exec.c:394
 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:453
-#: pl_exec.c:709
+#: pl_exec.c:452
+#: pl_exec.c:706
 msgid "during function exit"
 msgstr "lors de la sortie de la fonction"
 
-#: pl_exec.c:705
+#: pl_exec.c:702
 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:714
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "la proc�dure trigger ne peut pas renvoyer un ensemble"
 
-#: pl_exec.c:736
+#: pl_exec.c:733
 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:799
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "fonction PL/pgsql � %s �, ligne %d, %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:807
 #, 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:818
+#: pl_exec.c:815
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "fonction PL/pgsql � %s �, ligne %d � %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "fonction PL/pgsql � %s �"
 
-#: pl_exec.c:932
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "lors de l'initialisation de variables locales du bloc d'instructions"
 
-#: pl_exec.c:974
+#: pl_exec.c:971
 #, 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:1023
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "lors de l'entr�e dans le bloc d'instructions"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "lors de la sortie du bloc d'instructions"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "lors du nettoyage de l'exception"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "case introuvable"
 
-#: pl_exec.c:1554
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "l'instruction CASE n'a pas la partie ELSE."
 
-#: pl_exec.c:1710
+#: pl_exec.c:1725
 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:1725
+#: pl_exec.c:1740
 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:1742
+#: pl_exec.c:1757
 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:1748
+#: pl_exec.c:1763
 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:1920
-#: pl_exec.c:3191
+#: pl_exec.c:1933
+#: pl_exec.c:3395
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "curseur � %s � d�j� en cours d'utilisation"
 
-#: pl_exec.c:1943
-#: pl_exec.c:3253
+#: pl_exec.c:1956
+#: pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "arguments donn�s pour le curseur sans arguments"
 
-#: pl_exec.c:1962
-#: pl_exec.c:3272
+#: pl_exec.c:1975
+#: pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "arguments requis pour le curseur"
 
-#: pl_exec.c:2014
-#: pl_exec.c:4423
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "l'expression FOREACH ne doit pas �tre NULL"
+
+#: pl_exec.c:2069
 #, c-format
-msgid "cursor \"%s\" closed unexpectedly"
-msgstr "le curseur � %s � a �t� ferm� de fa�on inattendu"
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "l'expression FOREACH doit renvoyer un tableau, pas un type %s"
 
-#: pl_exec.c:2193
-#: gram.y:2729
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "la dimension de la partie (%d) est en dehors des valeurs valides (0..%d)"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "la variable d'une boucle FOREACH ... SLICE doit �tre d'un type tableau"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "la valeur d'une boucle FOREACH ne doit pas �tre de type tableau"
+
+#: pl_exec.c:2375
+#: gram.y:2844
 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:2217
-#: pl_exec.c:2283
+#: pl_exec.c:2399
+#: pl_exec.c:2465
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "mauvais type de r�sultat fourni dans RETURN NEXT"
 
-#: pl_exec.c:2239
-#: pl_exec.c:3641
-#: pl_exec.c:3920
-#: pl_exec.c:3954
-#: pl_exec.c:4016
-#: pl_exec.c:4035
-#: pl_exec.c:4072
+#: pl_exec.c:2421
+#: pl_exec.c:3849
+#: pl_exec.c:4166
+#: pl_exec.c:4201
+#: pl_exec.c:4268
+#: pl_exec.c:4287
+#: pl_exec.c:4355
+#: pl_exec.c:4378
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "l'enregistrement � %s � n'est pas encore affect�e"
 
-#: pl_exec.c:2241
-#: pl_exec.c:3643
-#: pl_exec.c:3922
-#: pl_exec.c:3956
-#: pl_exec.c:4018
-#: pl_exec.c:4037
-#: pl_exec.c:4074
+#: pl_exec.c:2423
+#: pl_exec.c:3851
+#: pl_exec.c:4168
+#: pl_exec.c:4203
+#: pl_exec.c:4270
+#: pl_exec.c:4289
+#: pl_exec.c:4357
+#: pl_exec.c:4380
 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:2245
-#: pl_exec.c:2264
+#: pl_exec.c:2427
+#: pl_exec.c:2446
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "mauvais type d'enregistrement fourni � RETURN NEXT"
 
-#: pl_exec.c:2306
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT doit avoir un param�tre"
 
-#: pl_exec.c:2337
-#: gram.y:2788
+#: pl_exec.c:2519
+#: gram.y:2903
 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:2357
+#: pl_exec.c:2539
 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:2489
+#: pl_exec.c:2637
+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:2678
 msgid "too few parameters specified for RAISE"
 msgstr "trop peu de param�tres pour RAISE"
 
-#: pl_exec.c:2515
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "trop de param�tres pour RAISE"
 
-#: pl_exec.c:2535
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "l'option de l'instruction RAISE ne peut pas �tre NULL"
 
-#: pl_exec.c:2545
-#: pl_exec.c:2554
-#: pl_exec.c:2562
-#: pl_exec.c:2570
+#: pl_exec.c:2734
+#: pl_exec.c:2743
+#: pl_exec.c:2751
+#: pl_exec.c:2759
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "option RAISE d�j� sp�cifi�e : %s"
 
-#: pl_exec.c:2605
-#: pl_exec.c:2606
+#: pl_exec.c:2794
+#: pl_exec.c:2795
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2752
-#: pl_exec.c:3056
+#: pl_exec.c:2945
+#: pl_exec.c:3081
+#: pl_exec.c:3260
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "ne peut pas utiliser COPY TO/FROM dans PL/pgsql"
 
-#: pl_exec.c:2756
-#: pl_exec.c:3060
+#: pl_exec.c:2949
+#: pl_exec.c:3085
+#: pl_exec.c:3264
 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:2757
-#: pl_exec.c:3061
+#: pl_exec.c:2950
+#: pl_exec.c:3086
+#: pl_exec.c:3265
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utiliser un bloc BEGIN dans une clause EXCEPTION � la place."
 
-#: pl_exec.c:2905
-#: pl_exec.c:3085
+#: pl_exec.c:3109
+#: pl_exec.c:3289
 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:2925
-#: pl_exec.c:3105
+#: pl_exec.c:3129
+#: pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "la requ�te n'a renvoy� aucune ligne"
 
-#: pl_exec.c:2934
-#: pl_exec.c:3114
+#: pl_exec.c:3138
+#: pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "la requ�te a renvoy� plus d'une ligne"
 
-#: pl_exec.c:2948
+#: pl_exec.c:3152
 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:2949
+#: pl_exec.c:3153
 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:2982
-#: pl_exec.c:5573
+#: pl_exec.c:3186
+#: pl_exec.c:5929
 msgid "query string argument of EXECUTE is null"
 msgstr "l'argument de la requ�te de EXECUTE est NULL"
 
-#: pl_exec.c:3047
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE de SELECT ... INTO n'est pas implant�"
 
-#: pl_exec.c:3048
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "Vous pouvez aussi utiliser EXECUTE ... INTO � la place."
+#: pl_exec.c:3252
+msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
+msgstr "Vous pouvez aussi utiliser EXECUTE ... INTO ou EXECUTE CREATE TABLE ... AS � la place."
 
-#: pl_exec.c:3336
-#: pl_exec.c:3427
+#: pl_exec.c:3540
+#: pl_exec.c:3631
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "la variable du curseur � %s � est NULL"
 
-#: pl_exec.c:3343
-#: pl_exec.c:3434
+#: pl_exec.c:3547
+#: pl_exec.c:3638
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "le curseur � %s � n'existe pas"
 
-#: pl_exec.c:3357
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "la position relative ou absolue du curseur est NULL"
 
-#: pl_exec.c:3494
+#: pl_exec.c:3702
 #, 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:3552
+#: pl_exec.c:3760
 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:3594
+#: pl_exec.c:3802
 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:3654
-#: pl_exec.c:3961
-#: pl_exec.c:4042
-#: pl_exec.c:4079
-#, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "l'enregistrement � %s � n'a pas de champs � %s �"
-
-#: pl_exec.c:3752
+#: pl_exec.c:3973
 #, 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:3766
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "l'objet souscrit n'est pas un tableau"
 
-#: pl_exec.c:3789
+#: pl_exec.c:4015
 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:4170
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la requ�te � %s � ne renvoie pas de donn�es"
 
-#: pl_exec.c:4178
+#: pl_exec.c:4501
 #, 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:4204
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "la requ�te � %s � a renvoy� plus d'une ligne"
 
-#: pl_exec.c:4262
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la requ�te � %s � n'est pas un SELECT"
 
-#: gram.y:423
+#: gram.y:430
 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
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "les collationnements ne sont pas support�s par le type %s"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
 msgstr "la variable ROW ou RECORD ne peut pas �tre CONSTANT"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "la variable ROW ou RECORD ne peut pas �tre NOT NULL"
 
-#: gram.y:462
+#: gram.y:486
 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:606
-#: gram.y:632
+#: gram.y:631
+#: gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "la variable � %s � n'existe pas"
 
-#: gram.y:650
-#: gram.y:663
+#: gram.y:675
+#: gram.y:688
 msgid "duplicate declaration"
 msgstr "d�claration dupliqu�e"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "�l�ment GET DIAGNOSTICS non reconnu"
 
-#: gram.y:852
-#: gram.y:2975
+#: gram.y:892
+#: gram.y:3090
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "� %s � n'est pas une variable scalaire"
 
-#: gram.y:1114
-#: gram.y:1306
+#: gram.y:1154
+#: gram.y:1347
 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:1148
+#: gram.y:1188
 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:1155
+#: gram.y:1195
 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:1238
+#: gram.y:1278
 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:1273
+#: gram.y:1314
 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:1420
-#: gram.y:1457
-#: gram.y:1505
-#: gram.y:2425
-#: gram.y:2506
-#: gram.y:2617
-#: gram.y:3249
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "la variable d'une boucle FOREACH doit �tre une variable connue ou une liste de variables"
+
+#: gram.y:1513
+#: gram.y:1550
+#: gram.y:1598
+#: gram.y:2540
+#: gram.y:2621
+#: gram.y:2732
+#: gram.y:3365
 msgid "unexpected end of function definition"
 msgstr "d�finition inattendue de la fin de fonction"
 
-#: 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
+#: gram.y:1618
+#: gram.y:1642
+#: gram.y:1654
+#: gram.y:1661
+#: gram.y:1750
+#: gram.y:1758
+#: gram.y:1772
+#: gram.y:1867
+#: gram.y:2048
+#: gram.y:2127
+#: gram.y:2242
+#: gram.y:2821
+#: gram.y:2885
+#: gram.y:3325
+#: gram.y:3346
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: gram.y:1553
-#: gram.y:1555
-#: gram.y:1940
-#: gram.y:1942
+#: gram.y:1646
+#: gram.y:1648
+#: gram.y:2052
+#: gram.y:2054
 msgid "invalid SQLSTATE code"
 msgstr "code SQLSTATE invalide"
 
-#: gram.y:1706
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "erreur de syntaxe, � FOR � attendu"
 
-#: gram.y:1768
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "l'instruction FETCH ne peut pas renvoyer plusieurs lignes"
 
-#: gram.y:1824
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "la variable de curseur doit �tre une variable simple"
 
-#: gram.y:1830
+#: gram.y:1938
 #, 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:1994
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "le label n'existe pas"
 
-#: gram.y:2099
-#: gram.y:2110
+#: gram.y:2213
+#: gram.y:2224
 #, 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
+#: gram.y:2326
+#: gram.y:2336
+#: gram.y:2464
 msgid "mismatched parentheses"
 msgstr "parenth�ses non correspondantes"
 
-#: gram.y:2226
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "� %s � manquant � la fin de l'expression SQL"
 
-#: gram.y:2232
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "� %s � manquant � la fin de l'instruction SQL"
 
-#: gram.y:2249
+#: gram.y:2363
 msgid "missing expression"
 msgstr "expression manquante"
 
-#: gram.y:2251
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "instruction SQL manquante"
 
-#: gram.y:2352
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "d�claration incompl�te d'un type de donn�es"
 
-#: gram.y:2374
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "d�claration manquante d'un type de donn�es"
 
-#: gram.y:2430
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO sp�cifi� plus d'une fois"
 
-#: gram.y:2598
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "attendait FROM ou IN"
 
-#: gram.y:2658
+#: gram.y:2773
 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:2659
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Utilisez RETURN NEXT ou RETURN QUERY."
 
-#: gram.y:2667
+#: gram.y:2782
 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:2676
+#: gram.y:2791
 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:2694
-#: gram.y:2701
+#: gram.y:2809
+#: gram.y:2816
 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:2743
+#: gram.y:2858
 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:2758
-#: gram.y:2765
+#: gram.y:2873
+#: gram.y:2880
 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:2844
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "� %s � est d�clar� CONSTANT"
 
-#: gram.y:2906
-#: gram.y:2918
+#: gram.y:3021
+#: gram.y:3033
 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
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "trop de variables INTO indiqu�es"
 
-#: gram.y:3170
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "label de fin � %s � sp�cifi� pour un bloc sans label"
 
-#: gram.y:3177
+#: gram.y:3293
 #, 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:3204
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "le curseur � %s � n'a pas d'arguments"
 
-#: gram.y:3218
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "le curseur � %s � a des arguments"
 
-#: gram.y:3266
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "option de l'instruction RAISE inconnue"
 
-#: gram.y:3270
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "erreur de syntaxe, � = � attendu"
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "bloc d'instructions"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "affectation"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "variable enti�re de boucle FOR"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "FOR sur des lignes de SELECT"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "FOR sur un curseur"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH sur un tableau"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "instruction SQL"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "instruction EXECUTE"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "FOR sur une instruction EXECUTE"
 
@@ -737,92 +780,123 @@ 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:463
+#: pl_scanner.c:467
 #, 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:479
+#: pl_scanner.c:483
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s sur ou pr�s de � %s �"
 
+#~ msgid "cursor \"%s\" closed unexpectedly"
+#~ msgstr "le curseur � %s � a �t� ferm� de fa�on inattendu"
+
 #~ 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"
 #~ msgstr ""
 #~ "le type de � %s � ne correspond pas � ce qui est pr�par� dans le plan"
+
 #~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
 #~ msgstr ""
 #~ "le type de � %s.%s � ne correspond pas � ce qui est pr�par� dans le plan"
+
 #~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
 #~ msgstr ""
 #~ "le type de tg_argv[%d] ne correspond pas � ce qui est pr�par� dans le plan"
+
 #~ msgid "N/A (dropped column)"
 #~ msgstr "N/A (colonne supprim�e)"
+
 #~ msgid ""
 #~ "Number of returned columns (%d) does not match expected column count (%d)."
 #~ msgstr ""
 #~ "Le nombre de colonnes renvoy�es (%d) ne correspond pas au nombre de "
 #~ "colonnes\n"
 #~ "attendues (%d)."
+
 #~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
 #~ msgstr ""
-#~ "Le type %s renvoy� ne correspond pas au type %s attendu dans la colonne � %"
-#~ "s �."
+#~ "Le type %s renvoy� ne correspond pas au type %s attendu dans la colonne � "
+#~ "%s �."
+
 #~ msgid "only positional parameters can be aliased"
 #~ msgstr "seuls les param�tres de position peuvent avoir un alias"
+
 #~ msgid "function has no parameter \"%s\""
 #~ msgstr "la fonction n'a pas de param�tre � %s �"
+
 #~ msgid "expected an integer variable"
 #~ msgstr "attend une variable enti�re"
+
 #~ msgid "syntax error at \"%s\""
 #~ msgstr "erreur de syntaxe � � %s �"
+
 #~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
 #~ msgstr ""
 #~ "Attendait � FOR � pour ouvrir un curseur pour une variable sans limite."
+
 #~ msgid "expected a cursor or refcursor variable"
 #~ msgstr "attendait une variable de type cursor ou refcursor"
+
 #~ msgid "too many variables specified in SQL statement"
 #~ msgstr "trop de variables sp�cifi�es dans l'instruction SQL"
+
 #~ msgid ""
 #~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
 #~ "or RETURN QUERY"
 #~ msgstr ""
 #~ "RETURN ne peut pas avoir un param�tre dans une fonction renvoyant des\n"
 #~ "lignes ; utilisez RETURN NEXT ou RETURN QUERY"
+
 #~ msgid "cannot assign to tg_argv"
 #~ msgstr "ne peut pas affecter � tg_argv"
+
 #~ msgid ""
 #~ "Expected record variable, row variable, or list of scalar variables "
 #~ "following INTO."
 #~ msgstr ""
 #~ "Attendait une variable RECORD, ROW ou une liste de variables scalaires\n"
 #~ "suivant INTO."
+
 #~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-#~ msgstr "instruction SQL dans la fonction PL/pgsql � %s � pr�s de la ligne %d"
+#~ msgstr ""
+#~ "instruction SQL dans la fonction PL/pgsql � %s � pr�s de la ligne %d"
+
 #~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
 #~ msgstr ""
 #~ "cha�ne litt�rale dans la fonction PL/pgsql � %s � pr�s de la ligne %d"
+
 #~ msgid "expected \")\""
 #~ msgstr "� ) � attendu"
+
 #~ msgid "variable \"%s\" does not exist in the current block"
 #~ msgstr "la variable � %s � n'existe pas dans le bloc actuel"
+
 #~ msgid "unterminated \" in identifier: %s"
 #~ msgstr "\" non termin� dans l'identifiant : %s"
+
 #~ msgid "qualified identifier cannot be used here: %s"
 #~ msgstr "l'identifiant qualifi� ne peut pas �tre utilis� ici : %s"
+
 #~ msgid "unterminated quoted identifier"
 #~ msgstr "identifiant entre guillemets non termin�"
+
 #~ msgid "unterminated /* comment"
 #~ msgstr "commentaire /* non termin�"
+
 #~ msgid "unterminated quoted string"
 #~ msgstr "cha�ne entre guillemets non termin�e"
+
 #~ msgid "unterminated dollar-quoted string"
 #~ msgstr "cha�ne entre dollars non termin�e"
-
diff --git a/src/pl/plpgsql/src/po/ja.po b/src/pl/plpgsql/src/po/ja.po
index d622bffd4ee..e92f1d898f4 100644
--- a/src/pl/plpgsql/src/po/ja.po
+++ b/src/pl/plpgsql/src/po/ja.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0 beta 3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-20 12:57+0900\n"
-"PO-Revision-Date: 2010-07-21 18:46+0900\n"
+"POT-Creation-Date: 2011-06-15 16:28+0900\n"
+"PO-Revision-Date: 2011-06-15 16:40+0900\n"
 "Last-Translator: HOTTA Michihde <hotta@net-newbie.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -13,31 +13,31 @@ msgstr ""
 "X-Poedit-Country: JAPAN\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pl_comp.c:422 pl_handler.c:256
+#: pl_comp.c:427 pl_handler.c:266
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "PL/pgSQL 関数では %s 型は指定できません"
 
-#: pl_comp.c:501
+#: pl_comp.c:506
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "関数 \"%s\" が多様な形を持つため、実際の戻り値の型を特定できませんでした"
 
-#: pl_comp.c:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数はトリガーとしてのみコールできます"
 
-#: pl_comp.c:535 pl_handler.c:241
+#: pl_comp.c:540 pl_handler.c:251
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "PL/pgSQL 関数は %s 型を返せません"
 
-#: pl_comp.c:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "トリガー関数には引数を宣言できません"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
@@ -45,398 +45,433 @@ msgstr ""
 "その代わり、トリガーの引数には TG_NARGS と TG_ARGV を通してのみアクセスできま"
 "す"
 
-#: pl_comp.c:880
+#: pl_comp.c:912
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "PL/pgSQL 関数 \"%s\" の %d 行目付近でのコンパイル"
 
-#: pl_comp.c:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "パラメータ \"%s\" が複数指定されました"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "列参照\"%s\"は曖昧です"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr ""
 "PL/pgSQL変数もしくはテーブルのカラム名いずれかを参照していた可能性があります"
 
-#: pl_comp.c:1690
+#: pl_comp.c:1227 pl_comp.c:1255 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "レコード \"%s\" には列 \"%s\" はありません"
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "リレーション \"%s\" がありません"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "リレーション \"%s.%s\" がありません"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "変数 \"%s\" の型は擬似タイプ %s です"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "リレーション \"%s\" はテーブルではありません"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "型  \"%s\" はシェルでのみ使えます"
 
-#: pl_comp.c:2087 pl_comp.c:2140
+#: pl_comp.c:2190 pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "例外条件 \"%s\" が認識できません"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "関数 \"%s\" が多様な形を持つため、実際の引数の型を特定できませんでした"
 
-#: pl_exec.c:236 pl_exec.c:511
+#: pl_exec.c:239 pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "実行状態の初期化中に"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr "引数をローカル変数に格納する際に"
 
-#: pl_exec.c:298 pl_exec.c:666
+#: pl_exec.c:301 pl_exec.c:667
 msgid "during function entry"
 msgstr "関数登録の際に"
 
-#: pl_exec.c:329 pl_exec.c:697
+#: pl_exec.c:332 pl_exec.c:698
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE はループの外では使えません"
 
-#: pl_exec.c:333 pl_exec.c:701
-msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr "引数の無い RAISE は、例外ハンドラの外では使えません"
-
-#: pl_exec.c:337
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "RETURN が現れる前に、制御が関数の終わりに達しました"
 
-#: pl_exec.c:344
+#: pl_exec.c:343
 msgid "while casting return value to function's return type"
 msgstr "戻り値を関数の戻り値の型へキャストする際に"
 
-#: pl_exec.c:357 pl_exec.c:2400
+#: pl_exec.c:356 pl_exec.c:2591
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "値のセットを受け付けないような文脈で、セット値を返す関数が呼ばれました"
 
-#: pl_exec.c:395
+#: pl_exec.c:394
 msgid "returned record type does not match expected record type"
 msgstr "戻りレコードの型が期待するレコードの型と一致しません"
 
-#: pl_exec.c:453 pl_exec.c:709
+#: pl_exec.c:452 pl_exec.c:706
 msgid "during function exit"
 msgstr "関数を抜ける際に"
 
-#: pl_exec.c:705
+#: pl_exec.c:702
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "RETURN が現れる前に、制御がトリガー手続きの終わりに達しました"
 
-#: pl_exec.c:714
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "トリガー手続きはセットを返すことができません"
 
-#: pl_exec.c:736
+#: pl_exec.c:733
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr "返された行の構造が、トリガーしているテーブルの構造とマッチしません"
 
-#: pl_exec.c:799
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "PL/pgSQL 関数 \"%s\" の %d 行目で %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:807
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "PL/pgSQL 関数 \"%s\" で %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:818
+#: pl_exec.c:815
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "PL/pgSQL 関数 \"%s\" の %d 行目の型 %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "PL/pgSQL 関数 \"%s\""
 
-#: pl_exec.c:932
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "ステートメントブロックでローカル変数を初期化する際に"
 
-#: pl_exec.c:974
+#: pl_exec.c:971
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr ""
 "変数 \"%s\" は NOT NULL として宣言されているため、初期値を NULL にすることは"
 "できません"
 
-#: pl_exec.c:1023
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "ステートメントブロックを登録する際に"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "ステートメントブロックを抜ける際に"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "例外をクリーンアップする際に"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "case が見つかりません"
 
-#: pl_exec.c:1554
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "CASE ステートメントに ELSE 部分がありません"
 
-#: pl_exec.c:1710
+#: pl_exec.c:1725
 msgid "lower bound of FOR loop cannot be null"
 msgstr "FOR ループの下限を NULL にすることはできません"
 
-#: pl_exec.c:1725
+#: pl_exec.c:1740
 msgid "upper bound of FOR loop cannot be null"
 msgstr "FOR ループの上限を NULL にすることはできません"
 
-#: pl_exec.c:1742
+#: pl_exec.c:1757
 msgid "BY value of FOR loop cannot be null"
 msgstr "FOR ループにおける BY の値を NULL にすることはできません"
 
-#: pl_exec.c:1748
+#: pl_exec.c:1763
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "FOR ループにおける BY の値はゼロより大きくなければなりません"
 
-#: pl_exec.c:1920 pl_exec.c:3182
+#: pl_exec.c:1933 pl_exec.c:3395
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "カーソル \"%s\" はすでに使われています"
 
-#: pl_exec.c:1943 pl_exec.c:3244
+#: pl_exec.c:1956 pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "引数なしのカーソルに引数が与えられました"
 
-#: pl_exec.c:1962 pl_exec.c:3263
+#: pl_exec.c:1975 pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "カーソルには引数が必要です"
 
-#: pl_exec.c:2184 gram.y:2729
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "FOREACH式はNULLではいけません"
+
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "FOREACH式は%s型ではなく配列を生成しなければなりません"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "範囲次元%dは有効範囲0から%dまでの間にありません"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "FOREACH ... SLICEループ変数は配列型でなければなりません"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "FOREACHループ変数は配列型ではいけません"
+
+#: pl_exec.c:2375 gram.y:2844
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "SETOF でない関数では RETURN NEXT は使えません"
 
-#: pl_exec.c:2208 pl_exec.c:2274
+#: pl_exec.c:2399 pl_exec.c:2465
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "RETURN NEXT において誤った戻り値の型が指定されています"
 
-#: pl_exec.c:2230 pl_exec.c:3632 pl_exec.c:3911 pl_exec.c:3945 pl_exec.c:4007
-#: pl_exec.c:4026 pl_exec.c:4063
+#: pl_exec.c:2421 pl_exec.c:3849 pl_exec.c:4166 pl_exec.c:4201 pl_exec.c:4268
+#: pl_exec.c:4287 pl_exec.c:4355 pl_exec.c:4378
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "レコード \"%s\" には、まだ値が代入されていません"
 
-#: pl_exec.c:2232 pl_exec.c:3634 pl_exec.c:3913 pl_exec.c:3947 pl_exec.c:4009
-#: pl_exec.c:4028 pl_exec.c:4065
+#: pl_exec.c:2423 pl_exec.c:3851 pl_exec.c:4168 pl_exec.c:4203 pl_exec.c:4270
+#: pl_exec.c:4289 pl_exec.c:4357 pl_exec.c:4380
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "まだ代入されていないレコードのタプル構造は不定です"
 
-#: pl_exec.c:2236 pl_exec.c:2255
+#: pl_exec.c:2427 pl_exec.c:2446
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "RETURN NEXT において、誤ったレコード型が指定されています"
 
-#: pl_exec.c:2297
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT にはパラメーターが必要です"
 
-#: pl_exec.c:2328 gram.y:2788
+#: pl_exec.c:2519 gram.y:2903
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "SETOF でない関数では RETURN QUERY は使えません"
 
-#: pl_exec.c:2348
+#: pl_exec.c:2539
 msgid "structure of query does not match function result type"
 msgstr "クエリーの構造が関数の戻り値の型と一致しません"
 
-#: pl_exec.c:2480
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr "引数の無い RAISE は、例外ハンドラの外では使えません"
+
+#: pl_exec.c:2678
 msgid "too few parameters specified for RAISE"
 msgstr "RAISE に指定されたパラメーターの数が足りません"
 
-#: pl_exec.c:2506
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "RAISE に指定されたパラメーターの数が多すぎます"
 
-#: pl_exec.c:2526
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "RAISE ステートメントのオプションには NULL は指定できません"
 
-#: pl_exec.c:2536 pl_exec.c:2545 pl_exec.c:2553 pl_exec.c:2561
+#: pl_exec.c:2734 pl_exec.c:2743 pl_exec.c:2751 pl_exec.c:2759
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "RAISE オプションは既に指定されています: %s"
 
-#: pl_exec.c:2596 pl_exec.c:2597
+#: pl_exec.c:2794 pl_exec.c:2795
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2743 pl_exec.c:3047
+#: pl_exec.c:2945 pl_exec.c:3081 pl_exec.c:3260
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "PL/pgSQL 内では COPY to/from は使えません"
 
-#: pl_exec.c:2747 pl_exec.c:3051
+#: pl_exec.c:2949 pl_exec.c:3085 pl_exec.c:3264
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "PL/pgSQL 内ではトランザクションを開始／終了できません"
 
-#: pl_exec.c:2748 pl_exec.c:3052
+#: pl_exec.c:2950 pl_exec.c:3086 pl_exec.c:3265
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "代わりに EXCEPTION 句を伴う BEGIN ブロックを使用してください"
 
-#: pl_exec.c:2896 pl_exec.c:3076
+#: pl_exec.c:3109 pl_exec.c:3289
 msgid "INTO used with a command that cannot return data"
 msgstr "データを返せない命令で INTO が使われました"
 
-#: pl_exec.c:2916 pl_exec.c:3096
+#: pl_exec.c:3129 pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "クエリーは行を返しませんでした"
 
-#: pl_exec.c:2925 pl_exec.c:3105
+#: pl_exec.c:3138 pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "クエリーが複数の行を返しました"
 
-#: pl_exec.c:2939
+#: pl_exec.c:3152
 msgid "query has no destination for result data"
 msgstr "クエリーに結果データの返却先が指定されていません"
 
-#: pl_exec.c:2940
+#: pl_exec.c:3153
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "SELECT の結果を破棄したい場合は、代わりに PERFORM を使ってください"
 
-#: pl_exec.c:2973 pl_exec.c:5547
+#: pl_exec.c:3186 pl_exec.c:5929
 msgid "query string argument of EXECUTE is null"
 msgstr "EXECUTE のクエリー文字列の引数が NULL です"
 
-#: pl_exec.c:3038
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "SELECT ... INTO の EXECUTE は実装されていません"
 
-#: pl_exec.c:3039
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "代わりに EXECUTE ... INTO を使ってください"
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr "代わりにEXECUTE ... INTOまたはEXECUTE CREATE TABLE ... ASを使用する方がよいかもしれません。"
 
-#: pl_exec.c:3327 pl_exec.c:3418
+#: pl_exec.c:3540 pl_exec.c:3631
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "カーソル変数 \"%s\" が NULL です"
 
-#: pl_exec.c:3334 pl_exec.c:3425
+#: pl_exec.c:3547 pl_exec.c:3638
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "カーソル \"%s\" は存在しません"
 
-#: pl_exec.c:3348
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "相対もしくは絶対カーソル位置が NULL です"
 
-#: pl_exec.c:3485
+#: pl_exec.c:3702
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "NOT NULL として宣言された変数 \"%s\" には NULL を代入できません"
 
-#: pl_exec.c:3543
+#: pl_exec.c:3760
 msgid "cannot assign non-composite value to a row variable"
 msgstr "複合値でない値を行変数に代入できません"
 
-#: pl_exec.c:3585
+#: pl_exec.c:3802
 msgid "cannot assign non-composite value to a record variable"
 msgstr "複合値でない値をレコード変数に代入できません"
 
-#: pl_exec.c:3645 pl_exec.c:3952 pl_exec.c:4033 pl_exec.c:4070
-#, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "レコード \"%s\" には列 \"%s\" はありません"
-
-#: pl_exec.c:3743
+#: pl_exec.c:3973
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "配列の次元数(%d)が指定可能な最大値(%d)を超えています"
 
-#: pl_exec.c:3757
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "添字つきオブジェクトは配列ではありません"
 
-#: pl_exec.c:3780
+#: pl_exec.c:4015
 msgid "array subscript in assignment must not be null"
 msgstr "代入における配列の添字が NULL であってはなりません"
 
-#: pl_exec.c:4161
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "クエリー \"%s\" がデータを返しませんでした"
 
-#: pl_exec.c:4169
+#: pl_exec.c:4501
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "クエリー \"%s\" が %d 個の列を返しました"
 msgstr[1] "クエリー \"%s\" が %d 個の列を返しました"
 
-#: pl_exec.c:4195
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "クエリー \"%s\" が複数の行を返しました"
 
-#: pl_exec.c:4253
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "クエリー \"%s\" が SELECT ではありません"
 
-#: pl_gram.c:1091
+#: pl_gram.c:1137
 msgid "syntax error: cannot back up"
 msgstr "構文エラー: バックアップできません"
 
-#: gram.y:423
+#: gram.y:430
 msgid "block label must be placed before DECLARE, not after"
 msgstr "ブロックラベルは DECLARE の後ではなく前に置かなければなりません"
 
-#: gram.y:441
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "%s型では照合順序はサポートされません"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
 msgstr "行またはレコード変数を CONSTRAINT にはできません"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "行またはレコード変数を NOT NULL にはできません"
 
-#: gram.y:462
+#: gram.y:486
 msgid "default value for row or record variable is not supported"
 msgstr "行またはレコード変数のデフォルト値指定はサポートされていません"
 
-#: gram.y:606 gram.y:632
+#: gram.y:631 gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "変数\"%s\"は存在しません"
 
-#: gram.y:650 gram.y:663
+#: gram.y:675 gram.y:688
 msgid "duplicate declaration"
 msgstr "重複した宣言です。"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "GET DIAGNOSTICS 項目が認識できません"
 
-#: gram.y:852 gram.y:2975
+#: gram.y:892 gram.y:3090
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" はスカラー変数ではありません"
 
-#: gram.y:1114 gram.y:1306
+#: gram.y:1154 gram.y:1347
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
@@ -444,216 +479,224 @@ msgstr ""
 "行をまたがるループにおけるループ変数は、レコード、行変数、スカラー変数並びの"
 "いずれかでなければなりません"
 
-#: gram.y:1148
+#: gram.y:1188
 msgid "cursor FOR loop must have only one target variable"
 msgstr "カーソルを使った FOR ループには、ターゲット変数が１個だけ必要です"
 
-#: gram.y:1155
+#: gram.y:1195
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr ""
 "カーソルを使った FOR ループでは、それに関連付けられたカーソル変数を使用しなけ"
 "ればなりません"
 
-#: gram.y:1238
+#: gram.y:1278
 msgid "integer FOR loop must have only one target variable"
 msgstr "整数を使った FOR ループには、ターゲット変数が１個だけ必要です"
 
-#: gram.y:1273
+#: gram.y:1314
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "クエリーを使った FOR ループの中では REVERSE は指定できません"
 
-#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
-#: gram.y:3249
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "FOREACHのループ変数は既知の変数または変数のリストでなければなりません"
+
+#: gram.y:1513 gram.y:1550 gram.y:1598 gram.y:2540 gram.y:2621 gram.y:2732
+#: gram.y:3365
 msgid "unexpected end of function definition"
 msgstr "予期しない関数定義の終端に達しました"
 
-#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1652 gram.y:1759
-#: gram.y:1936 gram.y:2015 pl_gram.c:3644 gram.y:2128 gram.y:2706 gram.y:2770
-#: gram.y:3209 gram.y:3230
+#: gram.y:1618 gram.y:1642 gram.y:1654 gram.y:1661 gram.y:1750 gram.y:1758
+#: gram.y:1772 gram.y:1867 gram.y:2048 gram.y:2127 pl_gram.c:3810 gram.y:2242
+#: gram.y:2821 gram.y:2885 gram.y:3325 gram.y:3346
 msgid "syntax error"
 msgstr "構文エラー"
 
-#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
 msgid "invalid SQLSTATE code"
 msgstr "無効な SQLSTATE コードです"
 
-#: gram.y:1706
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "構文エラー。\"FOR\" を期待していました"
 
-#: gram.y:1768
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "FETCH ステートメントは複数行を返せません"
 
-#: gram.y:1824
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "カーソル変数は単純変数でなければなりません"
 
-#: gram.y:1830
+#: gram.y:1938
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "変数 \"%s\" は cursor 型または refcursor 型でなければなりません"
 
-#: gram.y:1994
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "ラベルが存在しません"
 
-#: pl_gram.c:3640
+#: pl_gram.c:3806
 msgid "syntax error; also virtual memory exhausted"
 msgstr "構文エラー: 仮想メモリも枯渇しました"
 
-#: pl_gram.c:3760
+#: pl_gram.c:3926
 msgid "parser stack overflow"
 msgstr "パーサのスタックがオーバーフローしました"
 
-#: gram.y:2099 gram.y:2110
+#: gram.y:2213 gram.y:2224
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\"は既知の変数ではありません"
 
-#: gram.y:2212 gram.y:2222 gram.y:2350
+#: gram.y:2326 gram.y:2336 gram.y:2464
 msgid "mismatched parentheses"
 msgstr "カッコが対応していません"
 
-#: gram.y:2226
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "SQL 表現式の終端に \"%s\" がありません"
 
-#: gram.y:2232
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "SQL ステートメントの終端に \"%s\" がありません"
 
-#: gram.y:2249
+#: gram.y:2363
 msgid "missing expression"
 msgstr "表現式がありません"
 
-#: gram.y:2251
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "SQLステートメントがありません"
 
-#: gram.y:2352
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "データ型の定義が不完全です"
 
-#: gram.y:2374
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "データ型の定義がありません"
 
-#: gram.y:2430
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO が複数回指定されています"
 
-#: gram.y:2598
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "FROM もしくは IN を期待していました"
 
-#: gram.y:2658
+#: gram.y:2773
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "値のセットを返す関数では、RETURNにパラメータを指定できません"
 
-#: gram.y:2659
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "RETURN NEXT もしくは RETURN QUERY を使用してください"
 
-#: gram.y:2667
+#: gram.y:2782
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "OUT パラメータのない関数では、RETURN にはパラメータを指定できません"
 
-#: gram.y:2676
+#: gram.y:2791
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "void を返す関数では、RETURN にはパラメータを指定できません"
 
-#: gram.y:2694 gram.y:2701
+#: gram.y:2809 gram.y:2816
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "行を返す関数では、RETURN にレコードまたは行変数を指定しなければなりません"
 
-#: gram.y:2743
+#: gram.y:2858
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "OUT パラメータのない関数では、RETURN NEXT にはパラメータを指定できません"
 
-#: gram.y:2758 gram.y:2765
+#: gram.y:2873 gram.y:2880
 msgid ""
 "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "行を返す関数では、RETURN NEXT にレコードまたは行変数を指定しなければなりませ"
 "ん"
 
-#: gram.y:2844
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" は CONSTANT として宣言されています"
 
-#: gram.y:2906 gram.y:2918
+#: gram.y:3021 gram.y:3033
 msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr ""
 "レコードもしくは行変数は、複数項目を持つ INTO リストの一部分としては指定でき"
 "ません"
 
-#: gram.y:2963
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "INTO 変数の指定が多すぎます"
 
-#: gram.y:3170
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "ラベル無しブロックで終端ラベル \"%s\" が指定されました"
 
-#: gram.y:3177
+#: gram.y:3293
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "終端ラベル \"%s\" がブロックのラベル \"%s\" と異なります"
 
-#: gram.y:3204
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "カーソル \"%s\" に引数がありません"
 
-#: gram.y:3218
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "カーソル \"%s\" に引数がついています"
 
-#: gram.y:3266
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "RAISE ステートメントのオプションを認識できません"
 
-#: gram.y:3270
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "構文エラー。\"=\" を期待していました"
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "ステートメントブロック"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "代入"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "整数のループ変数を伴う FOR"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "SELECT 行を制御する FOR"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "カーソルを制御する FOR"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "配列全体に対するFOREACH"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "SQL ステートメント"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "EXECUTE ステートメント"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "EXECUTE ステートメントを制御する FOR"
 
@@ -664,13 +707,13 @@ msgid ""
 msgstr "PL/pgSQL変数名とテーブルのカラム名の間の衝突処理を設定してください"
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:463
+#: pl_scanner.c:467
 #, c-format
 msgid "%s at end of input"
 msgstr "入力の最後で %s"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:479
+#: pl_scanner.c:483
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "\"%2$s\" もしくはその近辺で %1$s"
diff --git a/src/pl/plpgsql/src/po/pl.po b/src/pl/plpgsql/src/po/pl.po
new file mode 100644
index 00000000000..21e27f0eebb
--- /dev/null
+++ b/src/pl/plpgsql/src/po/pl.po
@@ -0,0 +1,749 @@
+# LANGUAGE message translation file for plpgsql
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-07 20:52+0000\n"
+"PO-Revision-Date: 2011-07-28 22:36+0100\n"
+"Last-Translator: Wojciech Muła <wojciech_mula@poczta.onet.pl>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+
+#: pl_comp.c:427 pl_handler.c:266
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "funkcje PL/pgSQL nie obsługują typu %s"
+
+#: pl_comp.c:506
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr "nie można określić, jaki typ zwraca funkcja polimorficzna \"%s\""
+
+#: pl_comp.c:536
+msgid "trigger functions can only be called as triggers"
+msgstr ""
+"procedury wyzwalaczy nie mogą być wywoływane bezpośrednio, a jedynie przez "
+"wyzwalacze"
+
+#: pl_comp.c:540 pl_handler.c:251
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "funkcje PL/pgSQL nie mogą zwracać wartości typu %s"
+
+#: pl_comp.c:583
+msgid "trigger functions cannot have declared arguments"
+msgstr "funkcje wyzwalaczy nie mogą przyjmować żadnych argumentów"
+
+#: pl_comp.c:584
+msgid ""
+"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
+"instead."
+msgstr ""
+"Argumenty dla procedury wyzwalacza są umieszczane w zmiennych TG_NARGS oraz "
+"TG_ARGV."
+
+#: pl_comp.c:912
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "kompilacja funkcji PL/pgSQL \"%s\", w wierszu %d"
+
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "nazwa argumentu \"%s\" użyta więcej niż raz"
+
+#: pl_comp.c:1045
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "nazwa kolumny \"%s\" jest niejednoznaczna"
+
+#: pl_comp.c:1047
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr "Nazwa może odnosić się do zmiennej PL/pgSQL albo kolumny tabeli."
+
+#: pl_comp.c:1227 pl_comp.c:1255 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "rekord \"%s\" nie posiada pola \"%s\""
+
+#: pl_comp.c:1782
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "relacja \"%s\" nie istnieje"
+
+#: pl_comp.c:1814
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "relacja \"%s.%s\" nie istnieje"
+
+#: pl_comp.c:1896
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "zmienna \"%s\" jest psuedo-typu %s"
+
+#: pl_comp.c:1957
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "relacja \"%s\" nie jest tabelą"
+
+#: pl_comp.c:2117
+#, fuzzy, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "typ \"%s\" jest jedynie powłoką"
+
+#: pl_comp.c:2190 pl_comp.c:2243
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "nieznana nazwa wyjątku \"%s\""
+
+#: pl_comp.c:2401
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr "nie można określić typu argumentu dla funkcji polimorficznej \"%s\""
+
+#: pl_exec.c:239 pl_exec.c:510
+#, fuzzy
+msgid "during initialization of execution state"
+msgstr "podczas inicjalizacji ??? wykonywania zapytania"
+
+#: pl_exec.c:246
+msgid "while storing call arguments into local variables"
+msgstr "podczas przepisywania argumentów aktualnych do lokalnych zmiennych"
+
+#: pl_exec.c:301 pl_exec.c:667
+msgid "during function entry"
+msgstr "podczas wchodzenia do funkcji"
+
+#: pl_exec.c:332 pl_exec.c:698
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "instrukcja CONTINUE nie może być użyta poza pętlą"
+
+#: pl_exec.c:336
+msgid "control reached end of function without RETURN"
+msgstr "osiągnięto koniec funkcji, brakuje instrukcji RETURN"
+
+#: pl_exec.c:343
+msgid "while casting return value to function's return type"
+msgstr "podczas rzutowania zwracanej wartości na typ wyniku funkcji"
+
+#: pl_exec.c:356 pl_exec.c:2591
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"funkcja zwracająca zbiór rekordów wywołana w kontekście, w którym nie jest "
+"to dopuszczalne"
+
+#: pl_exec.c:394
+msgid "returned record type does not match expected record type"
+msgstr "został zwrócony rekord o niewłaściwym typie"
+
+#: pl_exec.c:452 pl_exec.c:706
+msgid "during function exit"
+msgstr "podczas kończenie funkcji"
+
+#: pl_exec.c:702
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "osiągnięto koniec funkcji wyzwalacza, brakuje instrukcji RETURN"
+
+#: pl_exec.c:711
+msgid "trigger procedure cannot return a set"
+msgstr "procedura wyzwalacza nie może zwracać zbioru rekordów"
+
+#: pl_exec.c:733
+msgid ""
+"returned row structure does not match the structure of the triggering table"
+msgstr ""
+"struktura zwróconego rekord nie odpowiada strukturze tabeli dla której "
+"wywołano wyzwalacz"
+
+#: pl_exec.c:796
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "funkcja PL/pgSQL \"%s\", wiersz %d %s"
+
+#: pl_exec.c:807
+#, c-format
+msgid "PL/pgSQL function \"%s\" %s"
+msgstr "funkcja PL/pgSQL \"%s\" %s"
+
+#. translator: last %s is a plpgsql statement type name
+#: pl_exec.c:815
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "funkcja PL/pgSQL \"%s\", wiersz %d w %s"
+
+#: pl_exec.c:821
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "funkcja PL/pgSQL \"%s\""
+
+#: pl_exec.c:929
+msgid "during statement block local variable initialization"
+msgstr "podczas inicjalizacji zmiennych lokalnych bloku instrukcji"
+
+#: pl_exec.c:971
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr ""
+"zmienna \"%s\" zadeklarowana jako NOT NULL nie może mieć wartości domyślnej "
+"NULL"
+
+#: pl_exec.c:1021
+msgid "during statement block entry"
+msgstr "podczas wchodzenia do bloku instrukcji"
+
+#: pl_exec.c:1042
+msgid "during statement block exit"
+msgstr "podczas opuszczania bloku instrukcji"
+
+#: pl_exec.c:1085
+msgid "during exception cleanup"
+msgstr "podczas kończenia obsługi wyjątków"
+
+#: pl_exec.c:1570
+msgid "case not found"
+msgstr "etykieta instrukcji wyboru nie znaleziona"
+
+#: pl_exec.c:1571
+msgid "CASE statement is missing ELSE part."
+msgstr "w wyrażeniu CASE brakuje ELSE"
+
+#: pl_exec.c:1725
+msgid "lower bound of FOR loop cannot be null"
+msgstr "początkowa wartość dla pętli FOR nie może być NULL"
+
+#: pl_exec.c:1740
+msgid "upper bound of FOR loop cannot be null"
+msgstr "końcowa wartość dla pętli FOR nie może być NULL"
+
+#: pl_exec.c:1757
+msgid "BY value of FOR loop cannot be null"
+msgstr "wartość wyrażenia BY w pętli FOR nie może być NULL"
+
+#: pl_exec.c:1763
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "wartość wyrażenia BY w pętli FOR musi być większa od zera"
+
+#: pl_exec.c:1933 pl_exec.c:3395
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "kursor \"%s\" jest już używany"
+
+#: pl_exec.c:1956 pl_exec.c:3457
+msgid "arguments given for cursor without arguments"
+msgstr "podano argumenty dla kursora nie przyjmującego żadnych argumentów"
+
+#: pl_exec.c:1975 pl_exec.c:3476
+msgid "arguments required for cursor"
+msgstr "parametry wymagane dla kursora"
+
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "wyrażenie w instrukcji FOREACH nie może być NULL"
+
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "typem wyrażenie w instrukcji FOREACH musi być tablica (array), nie %s"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "wymiar wycinka tablicy (%d) przekracza dopuszczalny zakres 0..%d"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr ""
+"zmienna użyta w pętli FOREACH ... SLICE musi być typu tablicowego (array)"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "zmienna użyta w pętli FOREACH nie może być typu tablicowego (array)"
+
+#: pl_exec.c:2375 gram.y:2844
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr ""
+"instrukcja RETURN NEXT nie może zostać użyta w funkcjach nie zwracających "
+"zbioru rekordów"
+
+#: pl_exec.c:2399 pl_exec.c:2465
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "niewłaściwy typ wyniku w instrukcji RETURN NEXT"
+
+#: pl_exec.c:2421 pl_exec.c:3849 pl_exec.c:4166 pl_exec.c:4201 pl_exec.c:4268
+#: pl_exec.c:4287 pl_exec.c:4355 pl_exec.c:4378
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "struktura rekordu \"%s\" nie jest jeszcze znana"
+
+#: pl_exec.c:2423 pl_exec.c:3851 pl_exec.c:4168 pl_exec.c:4203 pl_exec.c:4270
+#: pl_exec.c:4289 pl_exec.c:4357 pl_exec.c:4380
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr ""
+"Struktura jest nieokreślona dla niezainicjowanego rekordu abstrakcyjnego"
+
+#: pl_exec.c:2427 pl_exec.c:2446
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr "błędny typ rekordu w instrukcji RETURN NEXT"
+
+#: pl_exec.c:2488
+msgid "RETURN NEXT must have a parameter"
+msgstr "po RETURN NEXT musi pojawić się parametr"
+
+#: pl_exec.c:2519 gram.y:2903
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr ""
+"nie można używać instrukcji RETURN QUERY w funkcjach nie zwracających zbioru "
+"rekordów"
+
+#: pl_exec.c:2539
+msgid "structure of query does not match function result type"
+msgstr ""
+"typ rekordu zwracany przez zapytanie nie odpowiada typowi zwracanemu przez "
+"funkcję"
+
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr "RAISE bez argumentów jest dopuszczalne tylko w bloku obsługi wyjątków"
+
+#: pl_exec.c:2678
+msgid "too few parameters specified for RAISE"
+msgstr "za mało argumentów dla instrukcji RAISE"
+
+#: pl_exec.c:2704
+msgid "too many parameters specified for RAISE"
+msgstr "za dużo argumentów dla instrukcji RAISE"
+
+#: pl_exec.c:2724
+msgid "RAISE statement option cannot be null"
+msgstr "argument dla wyrażenia RAISE nie może być NULL"
+
+#: pl_exec.c:2734 pl_exec.c:2743 pl_exec.c:2751 pl_exec.c:2759
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "argument dla instrukcji RAISE został już podany: %s"
+
+#: pl_exec.c:2795
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pl_exec.c:2945 pl_exec.c:3081 pl_exec.c:3260
+msgid "cannot COPY to/from client in PL/pgSQL"
+msgstr "instrukcja COPY nie jest obsługiwana w PL/pgSQL"
+
+#: pl_exec.c:2949 pl_exec.c:3085 pl_exec.c:3264
+msgid "cannot begin/end transactions in PL/pgSQL"
+msgstr "nie można rozpocząć ani zakończyć transakcji w PL/pgSQL"
+
+#: pl_exec.c:2950 pl_exec.c:3086 pl_exec.c:3265
+msgid "Use a BEGIN block with an EXCEPTION clause instead."
+msgstr "Zamiast tego użyj bloku BEGIN wraz z klauzulą EXCEPTION."
+
+#: pl_exec.c:3109 pl_exec.c:3289
+msgid "INTO used with a command that cannot return data"
+msgstr "INTO zostało użyte z zapytaniem, które nie zwraca danych"
+
+#: pl_exec.c:3129 pl_exec.c:3309
+msgid "query returned no rows"
+msgstr "zapytanie nie zwróciło żadnych wierszy"
+
+#: pl_exec.c:3138 pl_exec.c:3318
+msgid "query returned more than one row"
+msgstr "zapytanie zwróciło więcej niż jeden rekord"
+
+#: pl_exec.c:3152
+msgid "query has no destination for result data"
+msgstr "nie wskazano gdzie mają zostać zapisane wyniki zapytania"
+
+#: pl_exec.c:3153
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr ""
+"Jeśli wyniki zapytania nie są istotne, używaj instrukcji PERFOM zamiast "
+"SELECT."
+
+#: pl_exec.c:3186 pl_exec.c:5929
+msgid "query string argument of EXECUTE is null"
+msgstr "treść zapytania dla instrukcji EXECUTE ma wartość NULL"
+
+#: pl_exec.c:3251
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "użycie SELECT ... INTO w instrukcji EXECUTE nie jest obsługiwane"
+
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr ""
+"Zamiast tego możesz użyć EXECUTE ... INTO lub EXECUTE CREATE TABLE ... AS."
+
+#: pl_exec.c:3540 pl_exec.c:3631
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "zmienna kursorowa \"%s\" ma wartość NULL"
+
+#: pl_exec.c:3547 pl_exec.c:3638
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "kursor \"%s\" nie istnieje"
+
+#: pl_exec.c:3561
+msgid "relative or absolute cursor position is null"
+msgstr "względna lub bezwzględna pozycja kursora o wartości NULL"
+
+#: pl_exec.c:3702
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr ""
+"zmienna \"%s\" została zadeklarowana jako NOT NULL, nie można przypisać "
+"wartości NULL"
+
+#: pl_exec.c:3760
+#, fuzzy
+msgid "cannot assign non-composite value to a row variable"
+msgstr "nie można przypisać wartości skalarnej do zmiennej rekordowej"
+
+#: pl_exec.c:3802
+#, fuzzy
+msgid "cannot assign non-composite value to a record variable"
+msgstr "nie można przypisać wartości skalarnej do zmiennej rekordowej"
+
+#: pl_exec.c:3973
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "liczba wymiarów tablicy (%d) przekracza maksimum (%d)"
+
+#: pl_exec.c:3992
+msgid "subscripted object is not an array"
+msgstr "indeksowanie jest możliwe jedynie dla obiektu typu tablicowego (array)"
+
+#: pl_exec.c:4015
+msgid "array subscript in assignment must not be null"
+msgstr ""
+"w instrukcji przypisania do elementu tablicy (array) indeksem elementu nie "
+"może być NULL"
+
+#: pl_exec.c:4493
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "zapytanie \"%s\" nie zwróciło żadnych danych"
+
+#: pl_exec.c:4501
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "zapytanie \"%s\" zwróciło %d kolumnę"
+msgstr[1] "zapytanie \"%s\" zwróciło %d kolumny"
+msgstr[2] "zapytanie \"%s\" zwróciło %d kolumn"
+
+#: pl_exec.c:4527
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "zapytanie \"%s\" zwróciło więcej niż jeden wiersz"
+
+#: pl_exec.c:4585
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "zapytanie \"%s\" nie jest kwerendą (SELECT)"
+
+#: gram.y:430
+msgid "block label must be placed before DECLARE, not after"
+msgstr "etykieta bloku musi pojawić się przed częścią DECLARE, nie po niej"
+
+#: gram.y:450
+#, fuzzy, c-format
+msgid "collations are not supported by type %s"
+msgstr "rzutowanie nie jest dostępne dla typu %s"
+
+#: gram.y:465
+msgid "row or record variable cannot be CONSTANT"
+msgstr "rekord nie może być zadeklarowany jako CONSTANT"
+
+#: gram.y:475
+msgid "row or record variable cannot be NOT NULL"
+msgstr "rekord nie może być zadeklarowany jako NOT NULL"
+
+#: gram.y:486
+msgid "default value for row or record variable is not supported"
+msgstr ""
+"domyślna wartość dla rekordów (abstrakcyjnych oraz konkretnego typu) nie "
+"jest obsługiwana"
+
+#: gram.y:631 gram.y:657
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "zmienna \"%s\" nie istnieje"
+
+#: gram.y:675 gram.y:688
+msgid "duplicate declaration"
+msgstr "powtórzona deklaracja"
+
+#: gram.y:881
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "nieobsługiwany parametr dla instrukcji GET DIAGNOSTICS"
+
+#: gram.y:892 gram.y:3090
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" nie jest zmienną skalarną"
+
+#: gram.y:1154 gram.y:1347
+msgid ""
+"loop variable of loop over rows must be a record or row variable or list of "
+"scalar variables"
+msgstr ""
+"zmienna w pętli dla zapytań musi być rekordem (abstrakcyjnym lub konkretnego "
+"typu) albo listą zmiennych skalarnych"
+
+#: gram.y:1188
+msgid "cursor FOR loop must have only one target variable"
+msgstr ""
+"w pętli FOR używającej kursorów dopuszczalna jest tylko jedna zmienna "
+"iteracyjna"
+
+#: gram.y:1195
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "w pętli FOR można używać jedynie ograniczonych kursorów"
+
+#: gram.y:1278
+msgid "integer FOR loop must have only one target variable"
+msgstr "w pętli FOR dla liczb całkowitych można używać jednej zmiennej"
+
+#: gram.y:1314
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "nie można używać REVERSE w pętli FOR dla zapytań"
+
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "zmienne używane w pętli FOREACH muszą zostać wcześniej zadeklarowana"
+
+#: gram.y:1513 gram.y:1550 gram.y:1598 gram.y:2540 gram.y:2621 gram.y:2732
+#: gram.y:3365
+msgid "unexpected end of function definition"
+msgstr "nieoczekiwany koniec definicji funkcji"
+
+#: gram.y:1618 gram.y:1642 gram.y:1654 gram.y:1661 gram.y:1750 gram.y:1758
+#: gram.y:1772 gram.y:1867 gram.y:2048 gram.y:2127 gram.y:2242 gram.y:2821
+#: gram.y:2885 gram.y:3325 gram.y:3346
+msgid "syntax error"
+msgstr "błąd składni"
+
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
+msgid "invalid SQLSTATE code"
+msgstr "błędny kod SQLSTATE"
+
+#: gram.y:1814
+msgid "syntax error, expected \"FOR\""
+msgstr "błąd składniowy, spodziewano się \"FOR\""
+
+#: gram.y:1876
+msgid "FETCH statement cannot return multiple rows"
+msgstr "instrukcja FETCH nie może zwracać wielu wierszy"
+
+#: gram.y:1932
+#, fuzzy
+msgid "cursor variable must be a simple variable"
+msgstr "zmienna kursorowa musi być zmienną prostą"
+
+#: gram.y:1938
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "zmienna \"%s\" musi być typu cursor lub refcursor"
+
+#: gram.y:2106
+msgid "label does not exist"
+msgstr "etykieta nie istnieje"
+
+#: gram.y:2213 gram.y:2224
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" nie jest zmienną"
+
+#: gram.y:2326 gram.y:2336 gram.y:2464
+msgid "mismatched parentheses"
+msgstr "niepasujące nawiasy"
+
+#: gram.y:2340
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "brakuje \"%s\" na końcu wyrażenia SQL"
+
+#: gram.y:2346
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "brakuje \"%s\" na końcu instrukcji SQL"
+
+#: gram.y:2363
+msgid "missing expression"
+msgstr "brakuje wyrażenia"
+
+#: gram.y:2365
+msgid "missing SQL statement"
+msgstr "brakuje instrukcji SQL"
+
+#: gram.y:2466
+msgid "incomplete data type declaration"
+msgstr "deklaracja typu abstrakcyjnego"
+
+#: gram.y:2489
+msgid "missing data type declaration"
+msgstr "brakująca deklaracja typu"
+
+#: gram.y:2545
+msgid "INTO specified more than once"
+msgstr "INTO użyte więcej niż raz"
+
+#: gram.y:2713
+msgid "expected FROM or IN"
+msgstr "spodziewano się \"FROM\" lub \"IN\""
+
+#: gram.y:2773
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr ""
+"instrukcja RETURN nie może mieć parametru w funkcjach zwracających zbiory "
+"rekordów (SETOF ...)"
+
+#: gram.y:2774
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "Użyj RETURN NEXT lub RETURN QUERY."
+
+#: gram.y:2782
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr ""
+"instrukcja RETURN nie może mieć parametrów w funkcji posiadającej argumenty "
+"wyjściowe (OUT, INOUT)"
+
+#: gram.y:2791
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr ""
+"instrukcja RETURN nie może mieć parametru w funkcji, która nic nie zwraca"
+
+#: gram.y:2809 gram.y:2816
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr ""
+"w funkcji zwracającej zbiory rekordów parametrem instrukcji RETURN musi być "
+"rekord (abstrakcyjny lub konkretnego typu)"
+
+#: gram.y:2858
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr ""
+"instrukcja RETURN NEXT nie może mieć parametrów w funkcji posiadające "
+"argumenty wyjściowe (OUT, INOUT)"
+
+#: gram.y:2873 gram.y:2880
+msgid ""
+"RETURN NEXT must specify a record or row variable in function returning row"
+msgstr ""
+"w funkcji zwracającej rekord parametrem instrukcji RETURN NEXT musi również "
+"być rekord"
+
+#: gram.y:2959
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\" zadeklarowano jako CONSTANT"
+
+#: gram.y:3021 gram.y:3033
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr ""
+"zmienna rekordowa nie może być celem w wyrażeniu INTO określonym dla więcej "
+"niż jednego argumentu"
+
+#: gram.y:3078
+msgid "too many INTO variables specified"
+msgstr "po INTO podano za dużo zmiennych"
+
+#: gram.y:3286
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "etykieta \"%s\" podana na końcu bloku, który nie posiada etykiety"
+
+#: gram.y:3293
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "etykieta końcowa \"%s\" jest inna niż etykieta bloku \"%s\""
+
+#: gram.y:3320
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "kursor \"%s\" nie przyjmuje parametrów"
+
+#: gram.y:3334
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "kursor \"%s\" przyjmuje parametry"
+
+#: gram.y:3382
+msgid "unrecognized RAISE statement option"
+msgstr "nieznany parametr dla instrukcji RAISE"
+
+#: gram.y:3386
+msgid "syntax error, expected \"=\""
+msgstr "błąd składniowy, spodziewano się \"=\""
+
+#: pl_funcs.c:218
+msgid "statement block"
+msgstr "blok instrukcji"
+
+#: pl_funcs.c:220
+msgid "assignment"
+msgstr "przypisanie"
+
+#: pl_funcs.c:230
+msgid "FOR with integer loop variable"
+msgstr "pętla FOR ze zmienną typu całkowitego"
+
+#: pl_funcs.c:232
+#, fuzzy
+msgid "FOR over SELECT rows"
+msgstr "pętla FOR po rekordach z zapytania SELECT"
+
+#: pl_funcs.c:234
+#, fuzzy
+msgid "FOR over cursor"
+msgstr "pętla FOR po wartościach kursora"
+
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "pętla FOREACH po elementach tablicy (array)"
+
+#: pl_funcs.c:248
+msgid "SQL statement"
+msgstr "wyrażenie SQL"
+
+#: pl_funcs.c:250
+msgid "EXECUTE statement"
+msgstr "instrukcja EXECUTE"
+
+#: pl_funcs.c:252
+msgid "FOR over EXECUTE statement"
+msgstr "pętla FOR po wynikach instrukcji EXECUTE"
+
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr ""
+"Ustawia sposób rozwiązywania niejednoznaczności nazw zmiennych PL/pgSQL i "
+"kolumn tabel."
+
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:467
+#, c-format
+msgid "%s at end of input"
+msgstr "%s na końcu danych wejściowych"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:483
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s w lub pobliżu \"%s\""
diff --git a/src/pl/plpython/po/fr.po b/src/pl/plpython/po/fr.po
index f13458aab79..25f077a2c6b 100644
--- a/src/pl/plpython/po/fr.po
+++ b/src/pl/plpython/po/fr.po
@@ -10,343 +10,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-26 02:05+0000\n"
-"PO-Revision-Date: 2010-08-26 20:36+0100\n"
+"POT-Creation-Date: 2011-06-13 14:52+0000\n"
+"PO-Revision-Date: 2011-06-13 17:51+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "fonction PL/python � %s �"
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "bloc de code PL/Python anonyme"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "lors de la modification de la ligne du trigger"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "lors de la cr�ation de la valeur de retour"
 
-#: plpython.c:613
-#: plpython.c:639
+#: plpython.c:707
+#: plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "valeur de retour inattendue de la proc�dure trigger"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "Attendait None ou une cha�ne de caract�res."
 
-#: plpython.c:629
+#: plpython.c:723
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr ""
 "la fonction trigger PL/python a renvoy� � MODIFY � dans un trigger DELETE\n"
 "-- ignor�"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Attendait None, � OK �, � SKIP � ou � MODIFY �."
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] supprim�, ne peut pas modifier la ligne"
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] n'est pas un dictionnaire"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "la cl� TD[\"new\"] � la position ordinale %d n'est pas une cha�ne"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr ""
 "la cl� � %s � trouv�e dans TD[\"new\"]  n'existe pas comme colonne\n"
 "de la ligne impact�e par le trigger"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr ""
 "n'a pas pu cr�er un nouveau dictionnaire lors de la construction des\n"
 "arguments du trigger"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "mode de retour non support� pour la fonction SET"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
 "les fonctions PL/python renvoyant des ensembles supportent seulement une\n"
 "valeur renvoy�e par appel"
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "l'objet renvoy� ne supporte pas les it�rations"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "les fonctions PL/python renvoyant des ensembles doivent renvoyer un objet\n"
 "it�rable"
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "erreur lors de la r�cup�ration du prochain �l�ment de l'it�rateur"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "la fonction PL/python avec un code de retour � void � ne renvoyait pas None"
 
-#: plpython.c:1246
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "annulation forc�e d'une sous-transaction qui n'a jamais �t� quitt�e"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "�chec de PyList_SetItem() lors de l'initialisation des arguments"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "�chec de PyDict_SetItemString() lors de l'initialisation des arguments"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "�chec de PyCObject_AsVoidPtr()"
+#: plpython.c:1419
+msgid "function returning record called in context that cannot accept type record"
+msgstr ""
+"fonction renvoyant le type record appel�e dans un contexte qui ne peut pas\n"
+"accepter le type record"
 
-#: plpython.c:1427
+#: plpython.c:1633
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions trigger peuvent seulement �tre appel�es par des triggers"
 
-#: plpython.c:1431
-#: plpython.c:1815
+#: plpython.c:1638
+#: plpython.c:2089
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "les fonctions PL/python ne peuvent pas renvoyer le type %s"
 
-#: plpython.c:1509
+#: plpython.c:1721
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "les fonctions PL/python ne peuvent pas accepter le type %s"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "�chec de PyCObject_FromVoidPtr()"
-
-#: plpython.c:1606
+#: plpython.c:1817
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "n'a pas pu compiler la fonction PL/python � %s �"
 
-#: plpython.c:1817
+#: plpython.c:1820
+msgid "could not compile anonymous PL/Python code block"
+msgstr "n'a pas pu compiler le bloc de code anonyme PL/python"
+
+#: plpython.c:2091
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python ne supporte pas les conversions vers des tableaux de types row."
 
-#: plpython.c:2020
+#: plpython.c:2300
 msgid "cannot convert multidimensional array to Python list"
 msgstr "ne peut pas convertir un tableau multidimensionnel en liste Python"
 
-#: plpython.c:2021
+#: plpython.c:2301
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python supporte seulement les tableaux uni-dimensionnels."
 
-#: plpython.c:2057
+#: plpython.c:2340
 msgid "could not create new dictionary"
 msgstr "n'a pas pu cr�er le nouveau dictionnaire"
 
-#: plpython.c:2133
+#: plpython.c:2435
 msgid "could not create bytes representation of Python object"
 msgstr "n'a pas pu cr�er une repr�sentation octets de l'objet Python"
 
-#: plpython.c:2189
+#: plpython.c:2533
 msgid "could not create string representation of Python object"
 msgstr "n'a pas pu cr�er une repr�sentation cha�ne de caract�res de l'objet Python"
 
-#: plpython.c:2200
+#: plpython.c:2544
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "n'a pas pu convertir l'objet Python en csting : la repr�sentation de la cha�ne Python contient des octets nuls"
 
-#: plpython.c:2233
+#: plpython.c:2578
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "la valeur de retour de la fonction de type tableau n'est pas une s�quence Python"
 
-#: plpython.c:2308
+#: plpython.c:2654
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la cl� � %s � introuvable dans la correspondance"
 
-#: plpython.c:2309
+#: plpython.c:2655
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr ""
 "Pour renvoyer NULL dans une colonne, ajoutez la valeur None � la\n"
 "correspondance de la cl� nomm�e d'apr�s la colonne."
 
-#: plpython.c:2352
+#: plpython.c:2703
 msgid "length of returned sequence did not match number of columns in row"
 msgstr ""
 "la longueur de la s�quence renvoy�e ne correspondait pas au nombre de\n"
 "colonnes dans la ligne"
 
-#: plpython.c:2445
+#: plpython.c:2803
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "l'attribut � %s � n'existe pas dans l'objet Python"
 
-#: plpython.c:2446
+#: plpython.c:2804
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr ""
 "Pour renvoyer NULL dans une colonne, faites en sorte que l'objet renvoy� ait\n"
 "un attribut nomm� suivant la colonne de valeur None."
 
-#: plpython.c:2680
+#: plpython.c:3123
 msgid "plan.status takes no arguments"
 msgstr "plan.status ne prends pas d'arguments"
 
-#: plpython.c:2804
-#: plpython.c:2947
-msgid "transaction aborted"
-msgstr "transaction annul�e"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "arguments invalides pour plpy.prepare"
-
-#: plpython.c:2818
+#: plpython.c:3247
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "le second argument de plpy.prepare doit �tre une s�quence"
 
-#: plpython.c:2868
+#: plpython.c:3297
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare : le nom du type sur la position ordinale %d n'est pas une cha�ne"
 
-#: plpython.c:2895
+#: plpython.c:3329
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare ne supporte pas les types composites"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "erreur inconnue dans PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpython.c:3419
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.prepare attendait une requ�te ou un plan"
 
-#: plpython.c:2977
+#: plpython.c:3438
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute prends une s�quence dans son second argument"
 
-#: plpython.c:2993
+#: plpython.c:3454
 msgid "could not execute plan"
 msgstr "n'a pas pu ex�cuter le plan"
 
-#: plpython.c:2996
+#: plpython.c:3457
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "S�quence attendue de %d argument, %d obtenu : %s"
 msgstr[1] "S�quence attendue de %d arguments, %d obtenus : %s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "erreur inconnue dans PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpython.c:3599
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "�chec de SPI_execute_plan : %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "erreur inconnue dans PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpython.c:3677
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "�chec de SPI_execute : %s"
 
-#: plpython.c:3185
+#: plpython.c:3732
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "erreur inconnue dans PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
+#: plpython.c:3794
+msgid "this subtransaction has already been entered"
+msgstr "cette sous-transaction est en cours d'utilisation"
+
+#: plpython.c:3800
+#: plpython.c:3852
+msgid "this subtransaction has already been exited"
+msgstr "d�j� sorti de cette sous-transaction"
+
+#: plpython.c:3846
+msgid "this subtransaction has not been entered"
+msgstr "cette sous-transaction n'a jamais �t� utilis�e"
+
+#: plpython.c:3858
+msgid "there is no subtransaction to exit from"
+msgstr "il n'y a pas de transaction � quitter"
+
+#: plpython.c:3940
+msgid "could not add the spiexceptions module"
+msgstr "n'a pas pu ajouter le module � spiexceptions �"
+
+#: plpython.c:4017
 msgid "Python major version mismatch in session"
 msgstr "Diff�rence de version majeure de Python dans la session"
 
-#: plpython.c:3240
+#: plpython.c:4018
 #, c-format
 msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
 msgstr ""
 "Cette session a auparavant utilis� la version majeure %d de Python et elle\n"
 "essaie maintenant d'utiliser la version majeure %d."
 
-#: plpython.c:3242
+#: plpython.c:4020
 msgid "Start a new session to use a different Python major version."
 msgstr ""
 "Lancez une nouvelle session pour utiliser une version majeure diff�rente de\n"
 "Python."
 
-#: plpython.c:3257
+#: plpython.c:4035
 msgid "untrapped error in initialization"
 msgstr "erreur non r�cup�r�e dans l'initialisation"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "n'a pas pu cr�er le cache de proc�dure"
-
-#: plpython.c:3272
+#: plpython.c:4063
 msgid "could not import \"__main__\" module"
 msgstr "n'a pas pu importer le module � __main__ �"
 
-#: plpython.c:3279
+#: plpython.c:4070
 msgid "could not initialize globals"
 msgstr "n'a pas pu initialiser les variables globales"
 
-#: plpython.c:3397
+#: plpython.c:4183
 msgid "could not parse error message in plpy.elog"
 msgstr "n'a pas pu analyser le message d'erreur dans plpy.elog"
 
-#: plpython.c:3526
-#: plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/python : %s"
-
-#: plpython.c:3527
+#: plpython.c:4207
+#: plpython.c:4437
+#: plpython.c:4438
+#: plpython.c:4439
+#: plpython.c:4440
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "m�moire �puis�e"
-
-#: plpython.c:3694
+#: plpython.c:4794
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
 msgstr "n'a pas pu convertir l'objet Unicode Python en encodage serveur PostgreSQL"
 
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "�chec de PyCObject_AsVoidPtr()"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "�chec de PyCObject_FromVoidPtr()"
+
+#~ msgid "transaction aborted"
+#~ msgstr "transaction annul�e"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "arguments invalides pour plpy.prepare"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "erreur inconnue dans PLy_spi_prepare"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "erreur inconnue dans PLy_spi_execute_plan"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "erreur inconnue dans PLy_spi_execute_query"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "n'a pas pu cr�er le cache de proc�dure"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/python : %s"
+
+#~ msgid "out of memory"
+#~ msgstr "m�moire �puis�e"
+
 #~ msgid "PL/Python function \"%s\" failed"
 #~ msgstr "�chec de la fonction PL/python � %s �"
+
 #~ msgid ""
 #~ "could not compute string representation of Python object in PL/Python "
 #~ "function \"%s\" while modifying trigger row"
 #~ msgstr ""
 #~ "n'a pas pu traiter la repr�sentation de la cha�ne d'un objet Python dans\n"
-#~ "la fonction PL/Python � %s � lors de la modification de la ligne du trigger"
+#~ "la fonction PL/Python � %s � lors de la modification de la ligne du "
+#~ "trigger"
+
 #~ msgid ""
 #~ "could not create string representation of Python object in PL/Python "
 #~ "function \"%s\" while creating return value"
 #~ msgstr ""
 #~ "n'a pas pu cr�er la repr�sentation en cha�ne de caract�re de l'objet\n"
-#~ "Python dans la fonction PL/python � %s � lors de la cr�ation de la valeur\n"
+#~ "Python dans la fonction PL/python � %s � lors de la cr�ation de la "
+#~ "valeur\n"
 #~ "de retour"
+
 #~ msgid "PL/Python function \"%s\" could not execute plan"
 #~ msgstr "la fonction PL/python � %s � n'a pas pu ex�cuter un plan"
-
diff --git a/src/pl/plpython/po/ja.po b/src/pl/plpython/po/ja.po
index 87e96c65577..7cb2f5fe2a2 100644
--- a/src/pl/plpython/po/ja.po
+++ b/src/pl/plpython/po/ja.po
@@ -4,67 +4,65 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0rc1\n"
+"Project-Id-Version: PostgreSQL 9.1 beta2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-08 04:40+0900\n"
-"PO-Revision-Date: 2010-09-08 04:50+0900\n"
-"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
+"POT-Creation-Date: 2011-06-16 05:31+0900\n"
+"PO-Revision-Date: 2011-06-16 05:47+0900\n"
+"Last-Translator: Honda Shigehiro <honda@postgresql.jp>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "PL/Python 関数 \"%s\""
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "PL/Python の無名コードブロック"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "トリガー行を変更する際に"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "戻り値を生成する際に"
 
-#: plpython.c:613 plpython.c:639
+#: plpython.c:707 plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "トリガー手続きから期待しない戻り値が返されました"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "None もしくは文字列を期待していました。"
 
-#: plpython.c:629
+#: plpython.c:723
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
-msgstr ""
-"PL/Python トリガー関数が、DELETE トリガーで \"MODIFY\" を返しました-- 無視し"
-"ました"
+msgstr "PL/Python トリガー関数が、DELETE トリガーで \"MODIFY\" を返しました-- 無視しました"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "None, \"OK\", \"SKIP\", \"MODIFY\" のいずれかを期待していました"
+msgstr "None, \"OK\", \"SKIP\", \"MODIFY\" のいずれかを期待していました。"
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] は削除されました。もはや変更できません"
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] は辞書ではありません"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "TD[\"new\"] 辞書の%d番目のキーが文字列ではありません"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
@@ -73,99 +71,106 @@ msgstr ""
 "TD[\"new\"] で見つかったキー \"%s\" は、行レベルトリガーにおけるカラムとして"
 "は存在しません"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "トリガーの引数を構成中に、新しい辞書を生成できませんでした"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "未サポートの集合関数リターンモードです"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid ""
 "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
 "PL/Python の集合を返す関数では、１回のコールのたびに値だけを返すことがサポー"
 "トされています"
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "返されたオブジェクトは反復適用できません"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "PL/Python の集合を返す関数では、イテレータ（反復子）オブジェクトを返さなけれ"
 "ばなりません"
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "イテレータ（反復子）から次の項目をフェッチ（取り出し）できません"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "\"void\" 型を返す PL/Python 関数は None 型を返しません"
 
-#: plpython.c:1246
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "終了していないサブトランザクションを強制的にアボートしています"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "引数を設定する際に、PyList_SetItem() に失敗しました"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "引数を設定する際に、PyDict_SetItemString() に失敗しました"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() に失敗しました"
+#: plpython.c:1419
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"レコード型を受け付けられないコンテキストでレコードを返す関数が呼び出されまし"
+"た"
 
-#: plpython.c:1427
+#: plpython.c:1633
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数はトリガーとしてのみコールできます"
 
-#: plpython.c:1431 plpython.c:1815
+#: plpython.c:1638 plpython.c:2089
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python 関数は %s 型を返せません"
 
-#: plpython.c:1509
+#: plpython.c:1721
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python 関数は %s 型を受け付けません"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() に失敗しました"
-
-#: plpython.c:1606
+#: plpython.c:1817
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "PL/Python 関数 \"%s\" をコンパイルできません"
 
-#: plpython.c:1817
+#: plpython.c:1820
+msgid "could not compile anonymous PL/Python code block"
+msgstr "PL/Python匿名コードブロックをコンパイルできません"
+
+#: plpython.c:2091
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python は行タイプ配列への変換をサポートしていません"
 
-#: plpython.c:2020
+#: plpython.c:2300
 msgid "cannot convert multidimensional array to Python list"
 msgstr "多次元配列を Python の list に変換できません"
 
-#: plpython.c:2021
+#: plpython.c:2301
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python でサポートしているのは一次元配列のみです。"
 
-#: plpython.c:2057
+#: plpython.c:2340
 msgid "could not create new dictionary"
 msgstr "新しいディレクトリを作れません"
 
-#: plpython.c:2133
+#: plpython.c:2435
 msgid "could not create bytes representation of Python object"
 msgstr "バイト表現の Python オブジェクトを生成できませんでした"
 
-#: plpython.c:2189
+#: plpython.c:2533
 msgid "could not create string representation of Python object"
 msgstr "文字列表現の Python オブジェクトを生成できませんでした"
 
-#: plpython.c:2200
+#: plpython.c:2544
 msgid ""
 "could not convert Python object into cstring: Python string representation "
 "appears to contain null bytes"
@@ -173,17 +178,17 @@ msgstr ""
 "Python オブジェクトを cstring に変換できませんでした：Python の文字列表現が "
 "null バイトを持つことになってしまいます"
 
-#: plpython.c:2233
+#: plpython.c:2578
 msgid ""
 "return value of function with array return type is not a Python sequence"
 msgstr "戻り値が配列である関数の戻り値が Python シーケンスではありません"
 
-#: plpython.c:2308
+#: plpython.c:2654
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "マッピング上にキー \"%s\" が見つかりません"
 
-#: plpython.c:2309
+#: plpython.c:2655
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
@@ -191,16 +196,16 @@ msgstr ""
 "カラムに null を入れて返すには、カラムの後につけた名前をキーとして、マッピン"
 "グに None 値を追加してください"
 
-#: plpython.c:2352
+#: plpython.c:2703
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "返されたシーケンスの長さが、その行のカラム数と異なります"
 
-#: plpython.c:2445
+#: plpython.c:2803
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "属性 \"%s\" が Python オブジェクト中に存在しません"
 
-#: plpython.c:2446
+#: plpython.c:2804
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
@@ -208,80 +213,80 @@ msgstr ""
 "カラムに null を入れて返す場合は、そのカラムの後につけた名前で表される属性が"
 "値として None を持ち、返されるオブジェクトがその属性を含むようにしてください"
 
-#: plpython.c:2680
+#: plpython.c:3123
 msgid "plan.status takes no arguments"
 msgstr "plan.status は引数を取りません"
 
-#: plpython.c:2804 plpython.c:2947
-msgid "transaction aborted"
-msgstr "トランザクションがアボートしました"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "plpy.prepare の引数が不正です"
-
-#: plpython.c:2818
+#: plpython.c:3247
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "plpy.prepare の第二引数はシーケンスでなければなりません"
 
-#: plpython.c:2868
+#: plpython.c:3297
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: %d 番目の型名が文字列ではありません"
 
-#: plpython.c:2895
+#: plpython.c:3329
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare は複合型をサポートしていません"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "PLy_spi_prepare で認識できないエラーを検出しました"
-
-#: plpython.c:2960
+#: plpython.c:3419
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute はクエリーもしくは実行計画を期待していました"
 
-#: plpython.c:2977
+#: plpython.c:3438
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute は第二引数としてシーケンスを取ります"
 
-#: plpython.c:2993
+#: plpython.c:3454
 msgid "could not execute plan"
 msgstr "プランを実行できませんでした"
 
-#: plpython.c:2996
+#: plpython.c:3457
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "%d 番目の引数はシーケンスを期待していましたが、%d が現れました：%s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "PLy_spi_execute_plan で認識できないエラーを検出しました"
-
-#: plpython.c:3092
+#: plpython.c:3599
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan が失敗しました：%s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "PLy_spi_execute_query で認識できないエラーを検出しました"
-
-#: plpython.c:3128
+#: plpython.c:3677
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute が失敗しました：%s"
 
-#: plpython.c:3185
+#: plpython.c:3732
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "PLy_spi_execute_fetch_result で認識できないエラーを検出しました"
 
-#: plpython.c:3239
+#: plpython.c:3794
+msgid "this subtransaction has already been entered"
+msgstr "このサブトランザクションは到達済みです"
+
+#: plpython.c:3800 plpython.c:3852
+msgid "this subtransaction has already been exited"
+msgstr "このサブトランザクションは終了済みです"
+
+#: plpython.c:3846
+msgid "this subtransaction has not been entered"
+msgstr "このサブトランザクションには到達しません"
+
+#: plpython.c:3858
+msgid "there is no subtransaction to exit from"
+msgstr "終了するためのサブトランザクションがありません"
+
+#: plpython.c:3940
+msgid "could not add the spiexceptions module"
+msgstr "spiexceptionsモジュールを追加できませんでした"
+
+#: plpython.c:4017
 msgid "Python major version mismatch in session"
 msgstr "セッションにおいて Python のメジャーバージョンが合致しません"
 
-#: plpython.c:3240
+#: plpython.c:4018
 #, c-format
 msgid ""
 "This session has previously used Python major version %d, and it is now "
@@ -290,48 +295,66 @@ msgstr ""
 "このセッションではすでに Python のメジャーバージョン %d が使われていました"
 "が、ここで Python のメジャーバージョン %d を使おうとしています。"
 
-#: plpython.c:3242
+#: plpython.c:4020
 msgid "Start a new session to use a different Python major version."
 msgstr ""
 "Python の異なったメジャーバージョンを使う場合は、新しいセッションを開始してく"
 "ださい"
 
-#: plpython.c:3257
+#: plpython.c:4035
 msgid "untrapped error in initialization"
 msgstr "初期化中に捕獲できないエラーがありました"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "手続き用キャッシュ(procedure cache)を生成できませんでした"
-
-#: plpython.c:3272
+#: plpython.c:4063
 msgid "could not import \"__main__\" module"
 msgstr "\"__main__\" モジュールをインポートできませんでした"
 
-#: plpython.c:3279
+#: plpython.c:4070
 msgid "could not initialize globals"
 msgstr "グローバル変数(globals)を初期化できませんでした"
 
-#: plpython.c:3397
+#: plpython.c:4183
 msgid "could not parse error message in plpy.elog"
 msgstr "plpy.elog でエラーメッセージをパースできませんでした"
 
-#: plpython.c:3526 plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
-
-#: plpython.c:3527
+#: plpython.c:4207 plpython.c:4437 plpython.c:4438 plpython.c:4439
+#: plpython.c:4440
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "メモリ不足です"
-
-#: plpython.c:3694
+#: plpython.c:4794
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
 msgstr ""
 "Python の Unicode オブジェクトを PostgreSQL サーバのエンコーディングに変換で"
 "きませんでした"
+
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "PyCObject_AsVoidPtr() に失敗しました"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "PyCObject_FromVoidPtr() に失敗しました"
+
+#~ msgid "transaction aborted"
+#~ msgstr "トランザクションがアボートしました"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "plpy.prepare の引数が不正です"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "PLy_spi_prepare で認識できないエラーを検出しました"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "PLy_spi_execute_plan で認識できないエラーを検出しました"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "PLy_spi_execute_query で認識できないエラーを検出しました"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "手続き用キャッシュ(procedure cache)を生成できませんでした"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
+
+#~ msgid "out of memory"
+#~ msgstr "メモリ不足です"