Translation updates

7 files changed, 650 insertions, 759 deletions

diff --git a/src/pl/plperl/nls.mk b/src/pl/plperl/nls.mk
index b01ef14239..d5db01f8fd 100644
--- a/src/pl/plperl/nls.mk
+++ b/src/pl/plperl/nls.mk
@@ -1,6 +1,6 @@
 # src/pl/plperl/nls.mk
 CATALOG_NAME     = plperl
-AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ro ru tr zh_CN zh_TW
+AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ro ru sv tr zh_CN zh_TW
 GETTEXT_FILES    = plperl.c SPI.c
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/pl/plperl/po/sv.po b/src/pl/plperl/po/sv.po
new file mode 100644
index 0000000000..8963dd0260
--- /dev/null
+++ b/src/pl/plperl/po/sv.po
@@ -0,0 +1,190 @@
+# LANGUAGE message translation file for plperl
+# Copyright (C) 2014 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Mats Erik Andersson <bsd@gisladisker.se>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: plperl (PostgreSQL) 9.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2014-11-25 16:07+0000\n"
+"PO-Revision-Date: 2014-11-30 23:36+0100\n"
+"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: plperl.c:401
+msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
+msgstr "Med sant värde kommer tillförlitlig och otillförl. Perl-kod att kompileras i strikt form."
+
+#: plperl.c:415
+msgid "Perl initialization code to execute when a Perl interpreter is initialized."
+msgstr "Perl-kod för initialisering, utföres när perl-tolken förbereds."
+
+#: plperl.c:437
+msgid "Perl initialization code to execute once when plperl is first used."
+msgstr "Perl-kod för engångs-initialisering då plperl används första gången."
+
+#: plperl.c:445
+msgid "Perl initialization code to execute once when plperlu is first used."
+msgstr "Perl-kod för engångs-initialisering då plperlu används första gången."
+
+#: plperl.c:662 plperl.c:836 plperl.c:841 plperl.c:954 plperl.c:965
+#: plperl.c:1006 plperl.c:1027 plperl.c:2045 plperl.c:2140 plperl.c:2202
+#: plperl.c:2259
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plperl.c:663
+#, c-format
+msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
+msgstr "Vid utförande av PostgreSQL::InServer::SPI::bootstrap"
+
+#: plperl.c:837
+#, c-format
+msgid "while parsing Perl initialization"
+msgstr "Vid tolkning av perls initieringssteg"
+
+#: plperl.c:842
+#, c-format
+msgid "while running Perl initialization"
+msgstr "Vid utförande av perls initieringssteg"
+
+#: plperl.c:955
+#, c-format
+msgid "while executing PLC_TRUSTED"
+msgstr "Vid utförande av PLC_TRUSTED"
+
+#: plperl.c:966
+#, c-format
+msgid "while executing utf8fix"
+msgstr "Vid utförande av utf8fix"
+
+#: plperl.c:1007
+#, c-format
+msgid "while executing plperl.on_plperl_init"
+msgstr "Vid utförande av plperl.on_plperl_init"
+
+#: plperl.c:1028
+#, c-format
+msgid "while executing plperl.on_plperlu_init"
+msgstr "Vid utförande av plperl.on_plperlu_init"
+
+#: plperl.c:1072 plperl.c:1689
+#, c-format
+msgid "Perl hash contains nonexistent column \"%s\""
+msgstr "Perlhash nämner en okänd spalt \"%s\"."
+
+#: plperl.c:1157
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "Antalet array-dimensioner (%d) överskrider det maximalt tillåtna (%d)."
+
+#: plperl.c:1169 plperl.c:1186
+#, c-format
+msgid "multidimensional arrays must have array expressions with matching dimensions"
+msgstr "Flerdimensionella vektorer måste ha array-uttryck av passande dimension."
+
+#: plperl.c:1223
+#, c-format
+msgid "cannot convert Perl array to non-array type %s"
+msgstr "Kan inte omvandla perlvektor till icke-array av typ \"%s\"."
+
+#: plperl.c:1319
+#, c-format
+msgid "cannot convert Perl hash to non-composite type %s"
+msgstr "Kan inte omvandla en perlhash till osammansatt typ \"%s\"."
+
+#: plperl.c:1330
+#, c-format
+msgid "function returning record called in context that cannot accept type record"
+msgstr "En funktion med post som värde anropades i sammanhang där poster inte kan godtagas."
+
+#: plperl.c:1345
+#, c-format
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "Funktioner i PL/Perl måste svara med referens till hash eller array."
+
+#: plperl.c:1666
+#, c-format
+msgid "$_TD->{new} does not exist"
+msgstr "$_TD->{new} finns inte."
+
+#: plperl.c:1670
+#, c-format
+msgid "$_TD->{new} is not a hash reference"
+msgstr "$_TD->{new} är inte en hash-referens."
+
+#: plperl.c:1921 plperl.c:2718
+#, c-format
+msgid "PL/Perl functions cannot return type %s"
+msgstr "Funktioner i PL/Perl kan inte svara med typ \"%s\"."
+
+#: plperl.c:1934 plperl.c:2763
+#, c-format
+msgid "PL/Perl functions cannot accept type %s"
+msgstr "Funktioner i PL/Perl kan inte hantera typ \"%s\"."
+
+#: plperl.c:2049
+#, c-format
+msgid "didn't get a CODE reference from compiling function \"%s\""
+msgstr "Fick inte en CODE-referens vid kompilering av funktionen \"%s\"."
+
+#: plperl.c:2304
+#, c-format
+msgid "set-valued function called in context that cannot accept a set"
+msgstr "En funktion som returnerar en mängd anropades i sammanhang som inte godtar en mängd."
+
+#: plperl.c:2348
+#, c-format
+msgid "set-returning PL/Perl function must return reference to array or use return_next"
+msgstr "En mängd-returnerande funktion i PL/Perl måste göra det som referens eller med return_next."
+
+#: plperl.c:2462
+#, c-format
+msgid "ignoring modified row in DELETE trigger"
+msgstr "Lämnar ändrad rad orörd i en DELETE-triggning"
+
+#: plperl.c:2470
+#, c-format
+msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
+msgstr "Resultat av en triggningsfunktion i PL/Perl måste vara undef, \"SKIP\" eller \"MODIFY\"."
+
+#: plperl.c:2647 plperl.c:2657
+#, c-format
+msgid "out of memory"
+msgstr "slut på minne"
+
+#: plperl.c:2710
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr "Triggningsfunktioner kan bara anropas vid triggning."
+
+#: plperl.c:3083
+#, c-format
+msgid "cannot use return_next in a non-SETOF function"
+msgstr "Får inte nyttja return_next i funktion som ej är SETOF"
+
+#: plperl.c:3139
+#, c-format
+msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
+msgstr "En funktion i PL/Perl med värderetur som SETOF måste anropa return_next med en hashreferens"
+
+#: plperl.c:3873
+#, c-format
+msgid "PL/Perl function \"%s\""
+msgstr "PL/Perl-funktion \"%s\"."
+
+#: plperl.c:3885
+#, c-format
+msgid "compilation of PL/Perl function \"%s\""
+msgstr "Kompilering av PL/Perl-funktion \"%s\"."
+
+#: plperl.c:3894
+#, c-format
+msgid "PL/Perl anonymous code block"
+msgstr "Anonymt kodblock i PL/Perl."
diff --git a/src/pl/plpgsql/src/po/fr.po b/src/pl/plpgsql/src/po/fr.po
index cad22d9aa4..c5e994e313 100644
--- a/src/pl/plpgsql/src/po/fr.po
+++ b/src/pl/plpgsql/src/po/fr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:07+0000\n"
-"PO-Revision-Date: 2014-05-17 15:34+0100\n"
+"POT-Creation-Date: 2014-12-04 22:37+0000\n"
+"PO-Revision-Date: 2014-12-05 10:12+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -597,7 +597,6 @@ msgstr "d�claration dupliqu�e"
 
 #: pl_gram.y:740 pl_gram.y:768
 #, c-format
-#| msgid "variable \"%s\" is hidden by a local variable"
 msgid "variable \"%s\" shadows a previously defined variable"
 msgstr "la variable � %s � cache une variable d�finie pr�c�demment"
 
@@ -846,21 +845,26 @@ msgstr ""
 "les noms des colonnes des tables."
 
 #: pl_handler.c:156
+#| msgid ""
+#| "Print information about parameters in the DETAIL part of the error "
+#| "messages generated on INTO .. STRICT failures."
 msgid ""
 "Print information about parameters in the DETAIL part of the error messages "
-"generated on INTO .. STRICT failures."
+"generated on INTO ... STRICT failures."
 msgstr ""
 "Affiche des informations sur les param�tres dans la partie DETAIL des "
 "messages d'erreur g�n�r�s pour des �checs INTO .. STRICT."
 
 #: pl_handler.c:164
-msgid "List of programming constructs which should produce a warning."
+#| msgid "List of programming constructs which should produce a warning."
+msgid "List of programming constructs that should produce a warning."
 msgstr ""
 "Liste des constructions de programmation qui devraient produire un message "
 "d'avertissement."
 
 #: pl_handler.c:174
-msgid "List of programming constructs which should produce an error."
+#| msgid "List of programming constructs which should produce an error."
+msgid "List of programming constructs that should produce an error."
 msgstr ""
 "Liste des constructions de programmation qui devraient produire une erreur."
 
@@ -876,128 +880,128 @@ msgstr "%s � la fin de l'entr�e"
 msgid "%s at or near \"%s\""
 msgstr "%s sur ou pr�s de � %s �"
 
-#~ 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"
-
-#~ 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"
-
-#~ msgid "unterminated dollar-quoted string"
-#~ msgstr "cha�ne entre dollars non termin�e"
-
-#~ msgid "unterminated quoted string"
-#~ msgstr "cha�ne entre guillemets non termin�e"
-
-#~ msgid "unterminated /* comment"
-#~ msgstr "commentaire /* non termin�"
-
-#~ msgid "unterminated quoted identifier"
-#~ msgstr "identifiant entre guillemets non termin�"
+#~ msgid "relation \"%s.%s\" does not exist"
+#~ msgstr "la relation � %s.%s � n'existe pas"
 
-#~ msgid "qualified identifier cannot be used here: %s"
-#~ msgstr "l'identifiant qualifi� ne peut pas �tre utilis� ici : %s"
+#~ msgid "cursor \"%s\" closed unexpectedly"
+#~ msgstr "le curseur � %s � a �t� ferm� de fa�on inattendu"
 
-#~ msgid "unterminated \" in identifier: %s"
-#~ msgstr "\" non termin� dans l'identifiant : %s"
+#~ msgid "row \"%s\" has no field \"%s\""
+#~ msgstr "la ligne � %s � n'a aucun champ � %s �"
 
-#~ msgid "variable \"%s\" does not exist in the current block"
-#~ msgstr "la variable � %s � n'existe pas dans le bloc actuel"
+#~ msgid "row \"%s.%s\" has no field \"%s\""
+#~ msgstr "la ligne � %s.%s � n'a aucun champ � %s �"
 
-#~ msgid "expected \")\""
-#~ msgstr "� ) � attendu"
+#~ msgid "expected \"[\""
+#~ msgstr "� [ � attendu"
 
-#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
+#~ msgid "type of \"%s\" does not match that when preparing the plan"
 #~ msgstr ""
-#~ "cha�ne litt�rale dans la fonction PL/pgsql � %s � pr�s de la ligne %d"
+#~ "le type de � %s � ne correspond pas � ce qui est pr�par� dans le plan"
 
-#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
 #~ msgstr ""
-#~ "instruction SQL dans la fonction PL/pgsql � %s � pr�s de la ligne %d"
+#~ "le type de � %s.%s � ne correspond pas � ce qui est pr�par� dans le plan"
 
-#~ msgid ""
-#~ "Expected record variable, row variable, or list of scalar variables "
-#~ "following INTO."
+#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
 #~ msgstr ""
-#~ "Attendait une variable RECORD, ROW ou une liste de variables scalaires\n"
-#~ "suivant INTO."
+#~ "le type de tg_argv[%d] ne correspond pas � ce qui est pr�par� dans le plan"
 
-#~ msgid "cannot assign to tg_argv"
-#~ msgstr "ne peut pas affecter � tg_argv"
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/A (colonne supprim�e)"
 
 #~ msgid ""
-#~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
-#~ "or RETURN QUERY"
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
 #~ msgstr ""
-#~ "RETURN ne peut pas avoir un param�tre dans une fonction renvoyant des\n"
-#~ "lignes ; utilisez RETURN NEXT ou RETURN QUERY"
-
-#~ msgid "too many variables specified in SQL statement"
-#~ msgstr "trop de variables sp�cifi�es dans l'instruction SQL"
-
-#~ msgid "expected a cursor or refcursor variable"
-#~ msgstr "attendait une variable de type cursor ou refcursor"
+#~ "Le nombre de colonnes renvoy�es (%d) ne correspond pas au nombre de "
+#~ "colonnes\n"
+#~ "attendues (%d)."
 
-#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
+#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
 #~ msgstr ""
-#~ "Attendait � FOR � pour ouvrir un curseur pour une variable sans limite."
-
-#~ msgid "syntax error at \"%s\""
-#~ msgstr "erreur de syntaxe � � %s �"
+#~ "Le type %s renvoy� ne correspond pas au type %s attendu dans la colonne � "
+#~ "%s �."
 
-#~ msgid "expected an integer variable"
-#~ msgstr "attend une variable enti�re"
+#~ 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 "only positional parameters can be aliased"
-#~ msgstr "seuls les param�tres de position peuvent avoir un alias"
+#~ msgid "expected an integer variable"
+#~ msgstr "attend une variable enti�re"
 
-#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "erreur de syntaxe � � %s �"
+
+#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
 #~ msgstr ""
-#~ "Le type %s renvoy� ne correspond pas au type %s attendu dans la colonne � "
-#~ "%s �."
+#~ "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 ""
-#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
+#~ "or RETURN QUERY"
 #~ msgstr ""
-#~ "Le nombre de colonnes renvoy�es (%d) ne correspond pas au nombre de "
-#~ "colonnes\n"
-#~ "attendues (%d)."
+#~ "RETURN ne peut pas avoir un param�tre dans une fonction renvoyant des\n"
+#~ "lignes ; utilisez RETURN NEXT ou RETURN QUERY"
 
-#~ msgid "N/A (dropped column)"
-#~ msgstr "N/A (colonne supprim�e)"
+#~ msgid "cannot assign to tg_argv"
+#~ msgstr "ne peut pas affecter � tg_argv"
 
-#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
+#~ msgid ""
+#~ "Expected record variable, row variable, or list of scalar variables "
+#~ "following INTO."
 #~ msgstr ""
-#~ "le type de tg_argv[%d] ne correspond pas � ce qui est pr�par� dans le plan"
+#~ "Attendait une variable RECORD, ROW ou une liste de variables scalaires\n"
+#~ "suivant INTO."
 
-#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
+#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
 #~ msgstr ""
-#~ "le type de � %s.%s � ne correspond pas � ce qui est pr�par� dans le plan"
+#~ "instruction SQL dans la fonction PL/pgsql � %s � pr�s de la ligne %d"
 
-#~ msgid "type of \"%s\" does not match that when preparing the plan"
+#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
 #~ msgstr ""
-#~ "le type de � %s � ne correspond pas � ce qui est pr�par� dans le plan"
+#~ "cha�ne litt�rale dans la fonction PL/pgsql � %s � pr�s de la ligne %d"
 
-#~ msgid "expected \"[\""
-#~ msgstr "� [ � attendu"
+#~ msgid "expected \")\""
+#~ msgstr "� ) � attendu"
 
-#~ msgid "row \"%s.%s\" has no field \"%s\""
-#~ msgstr "la ligne � %s.%s � n'a aucun champ � %s �"
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "la variable � %s � n'existe pas dans le bloc actuel"
 
-#~ msgid "row \"%s\" has no field \"%s\""
-#~ msgstr "la ligne � %s � n'a aucun champ � %s �"
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "\" non termin� dans l'identifiant : %s"
 
-#~ msgid "cursor \"%s\" closed unexpectedly"
-#~ msgstr "le curseur � %s � a �t� ferm� de fa�on inattendu"
+#~ msgid "qualified identifier cannot be used here: %s"
+#~ msgstr "l'identifiant qualifi� ne peut pas �tre utilis� ici : %s"
 
-#~ msgid "relation \"%s.%s\" does not exist"
-#~ msgstr "la relation � %s.%s � n'existe pas"
+#~ 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"
+
+#~ 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"
+
+#~ 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"
diff --git a/src/pl/plpgsql/src/po/zh_CN.po b/src/pl/plpgsql/src/po/zh_CN.po
index 14e6dcfd1f..61d4d39176 100644
--- a/src/pl/plpgsql/src/po/zh_CN.po
+++ b/src/pl/plpgsql/src/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:15+0000\n"
-"PO-Revision-Date: 2013-09-02 16:31+0800\n"
+"POT-Creation-Date: 2014-11-22 21:07+0000\n"
+"PO-Revision-Date: 2014-11-28 15:50+0800\n"
 "Last-Translator: Xiong He <iihero@qq.com>\n"
 "Language-Team: Weibin <ssmei_2000@yahoo.com>\n"
 "Language: zh_CN\n"
@@ -18,469 +18,467 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: pl_comp.c:432 pl_handler.c:276
+#: pl_comp.c:436 pl_handler.c:438
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "PL/pgSQL函数不使用类型%s"
 
-#: pl_comp.c:513
+#: pl_comp.c:517
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "无法确定多态函数\"%s\"的实际返回类型"
 
-#: pl_comp.c:543
+#: pl_comp.c:547
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "触发器函数只能以触发器的形式调用"
 
-#: pl_comp.c:547 pl_handler.c:261
+#: pl_comp.c:551 pl_handler.c:423
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "PL/pgSQL函数不能返回类型%s"
 
-#: pl_comp.c:590
+#: pl_comp.c:594
 #, c-format
 msgid "trigger functions cannot have declared arguments"
 msgstr "触发器函数不能有已声明的参数"
 
-#: pl_comp.c:591
+#: pl_comp.c:595
 #, c-format
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
 msgstr "触发器的参数可以通过TG_NARGS和TG_ARGV进行访问."
 
-#: pl_comp.c:693
+#: pl_comp.c:697
 #, c-format
-#| msgid "trigger functions cannot have declared arguments"
 msgid "event trigger functions cannot have declared arguments"
 msgstr "事件触发器函数不能有已声明的参数"
 
-#: pl_comp.c:950
+#: pl_comp.c:962
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "在第%2$d行附件编译PL/pgSQL函数\"%1$s\""
 
-#: pl_comp.c:973
+#: pl_comp.c:985
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "多次使用参数名称 \"%s\""
 
-#: pl_comp.c:1083
+#: pl_comp.c:1095
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "字段关联 \"%s\" 是不明确的"
 
-#: pl_comp.c:1085
+#: pl_comp.c:1097
 #, c-format
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "可以指向一个PL/pgSQL变量或表中的列"
 
-#: pl_comp.c:1265 pl_comp.c:1293 pl_exec.c:4097 pl_exec.c:4452 pl_exec.c:4538
-#: pl_exec.c:4629
+#: pl_comp.c:1277 pl_comp.c:1305 pl_exec.c:4179 pl_exec.c:4524 pl_exec.c:4609
+#: pl_exec.c:4700
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "记录\"%s\"没有字段\"%s\""
 
-#: pl_comp.c:1824
+#: pl_comp.c:1836
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "关系 \"%s\" 不存在"
 
-#: pl_comp.c:1933
+#: pl_comp.c:1945
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "变量\"%s\"具有伪类型%s"
 
-#: pl_comp.c:1999
+#: pl_comp.c:2011
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "关系 \"%s\"不是一张表"
 
-#: pl_comp.c:2159
+#: pl_comp.c:2171
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "类型 \"%s\" 只是一个 shell"
 
-#: pl_comp.c:2233 pl_comp.c:2286
+#: pl_comp.c:2245 pl_comp.c:2298
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "不可识别的异常条件\"%s\""
 
-#: pl_comp.c:2444
+#: pl_comp.c:2456
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "无法确定多态函数\"%s\"的实际参数类型"
 
-#: pl_exec.c:254 pl_exec.c:514 pl_exec.c:793
+#: pl_exec.c:277 pl_exec.c:537 pl_exec.c:816
 msgid "during initialization of execution state"
 msgstr "在执行状态的初始化期间"
 
-#: pl_exec.c:261
+#: pl_exec.c:284
 msgid "while storing call arguments into local variables"
 msgstr "在将调用的参数存储到本地变量时"
 
-#: pl_exec.c:303 pl_exec.c:671
+#: pl_exec.c:326 pl_exec.c:694
 msgid "during function entry"
 msgstr "在进入函数期间"
 
-#: pl_exec.c:334 pl_exec.c:702 pl_exec.c:834
+#: pl_exec.c:357 pl_exec.c:725 pl_exec.c:857
 #, c-format
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "在循环的外部不能使用CONTINUE"
 
-#: pl_exec.c:338
+#: pl_exec.c:361
 #, c-format
 msgid "control reached end of function without RETURN"
 msgstr "控制流程到达函数的结束部分，但是没有看到RETURN"
 
-#: pl_exec.c:345
+#: pl_exec.c:368
 msgid "while casting return value to function's return type"
 msgstr "正在将返回值强行指派为函数的返回类型"
 
-#: pl_exec.c:358 pl_exec.c:2810
+#: pl_exec.c:381 pl_exec.c:2843
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "集值函数在不接受使用集合的环境中调用"
 
-#: pl_exec.c:396 pl_exec.c:2653
+#: pl_exec.c:419 pl_exec.c:2686
 msgid "returned record type does not match expected record type"
 msgstr "所返回的记录类型与所期待的记录类型不匹配"
 
-#: pl_exec.c:456 pl_exec.c:710 pl_exec.c:842
+#: pl_exec.c:479 pl_exec.c:733 pl_exec.c:865
 msgid "during function exit"
 msgstr "在函数退出期间"
 
-#: pl_exec.c:706 pl_exec.c:838
+#: pl_exec.c:729 pl_exec.c:861
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "控制流程到达触发器/存储过程的结束部分，但是没有看到RETURN"
 
-#: pl_exec.c:715
+#: pl_exec.c:738
 #, c-format
 msgid "trigger procedure cannot return a set"
 msgstr "触发器存储过程无法返回集合"
 
-#: pl_exec.c:737
+#: pl_exec.c:760
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr "所返回的记录结构与触发表的结构不匹配"
 
-#: pl_exec.c:893
+#: pl_exec.c:916
 #, c-format
 msgid "PL/pgSQL function %s line %d %s"
 msgstr "PL/pgSQL 函数%s在第%d行%s"
 
-#: pl_exec.c:904
+#: pl_exec.c:927
 #, 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:912
+#: pl_exec.c:935
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
 msgstr "在%3$s的第%2$d行的PL/pgSQL函数%1$s"
 
-#: pl_exec.c:918
+#: pl_exec.c:941
 #, c-format
 msgid "PL/pgSQL function %s"
 msgstr "PL/pgSQL函数 %s"
 
-#: pl_exec.c:1027
+#: pl_exec.c:1050
 msgid "during statement block local variable initialization"
 msgstr "在初始化语句块的局部变量期间"
 
-#: pl_exec.c:1069
+#: pl_exec.c:1092
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "声明为NOT NULL的变量\"%s\"无法将缺省值设为NULL"
 
-#: pl_exec.c:1119
+#: pl_exec.c:1142
 msgid "during statement block entry"
 msgstr "在进入语句块期间"
 
-#: pl_exec.c:1140
+#: pl_exec.c:1163
 msgid "during statement block exit"
 msgstr "在退出语句块期间"
 
-#: pl_exec.c:1183
+#: pl_exec.c:1206
 msgid "during exception cleanup"
 msgstr "在清理异常期间"
 
-#: pl_exec.c:1536
+#: pl_exec.c:1559
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr "GET STACKED DIAGNOSTICS不能用于异常处理之外"
 
-#: pl_exec.c:1727
+#: pl_exec.c:1760
 #, c-format
 msgid "case not found"
 msgstr "没有找到CASE"
 
-#: pl_exec.c:1728
+#: pl_exec.c:1761
 #, c-format
 msgid "CASE statement is missing ELSE part."
 msgstr "在CASE语句结构中丢失ELSE部分"
 
-#: pl_exec.c:1880
+#: pl_exec.c:1913
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
 msgstr "FOR循环的低位边界不能为空"
 
-#: pl_exec.c:1895
+#: pl_exec.c:1928
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
 msgstr "FOR循环的高位边界不能为空"
 
-#: pl_exec.c:1912
+#: pl_exec.c:1945
 #, c-format
 msgid "BY value of FOR loop cannot be null"
 msgstr "FOR循环的BY值不能为空"
 
-#: pl_exec.c:1918
+#: pl_exec.c:1951
 #, c-format
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "FOR循环的BY值必须大于0"
 
-#: pl_exec.c:2088 pl_exec.c:3648
+#: pl_exec.c:2121 pl_exec.c:3730
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "游标\"%s\"已经在使用"
 
-#: pl_exec.c:2111 pl_exec.c:3710
+#: pl_exec.c:2144 pl_exec.c:3792
 #, c-format
 msgid "arguments given for cursor without arguments"
 msgstr "给不带有参数的游标指定参数"
 
-#: pl_exec.c:2130 pl_exec.c:3729
+#: pl_exec.c:2163 pl_exec.c:3811
 #, c-format
 msgid "arguments required for cursor"
 msgstr "游标需要参数"
 
-#: pl_exec.c:2217
+#: pl_exec.c:2250
 #, c-format
 msgid "FOREACH expression must not be null"
 msgstr "FOREACH表达式不能为空"
 
-#: pl_exec.c:2223
+#: pl_exec.c:2256
 #, c-format
 msgid "FOREACH expression must yield an array, not type %s"
 msgstr "FOREACH表达式的结果必须是数组, 而不是类型 %s"
 
-#: pl_exec.c:2240
+#: pl_exec.c:2273
 #, c-format
 msgid "slice dimension (%d) is out of the valid range 0..%d"
 msgstr "索引维数(%d)超出有效范围: 0..%d"
 
-#: pl_exec.c:2267
+#: pl_exec.c:2300
 #, c-format
 msgid "FOREACH ... SLICE loop variable must be of an array type"
 msgstr "FOREACH ... SLICE循环变量必须属于数组类型"
 
-#: pl_exec.c:2271
+#: pl_exec.c:2304
 #, c-format
 msgid "FOREACH loop variable must not be of an array type"
 msgstr "FOREACH循环变量不能为数组类型"
 
-#: pl_exec.c:2492 pl_exec.c:2645
+#: pl_exec.c:2525 pl_exec.c:2678
 #, c-format
-#| msgid "while casting return value to function's return type"
 msgid ""
 "cannot return non-composite value from function returning composite type"
 msgstr "返回值为组合类型的函数不能返回非组合型的值"
 
-#: pl_exec.c:2536 pl_gram.y:3012
+#: pl_exec.c:2569 pl_gram.y:3075
 #, c-format
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "无法在非SETOF函数中使用RETURN NEXT"
 
-#: pl_exec.c:2564 pl_exec.c:2687
+#: pl_exec.c:2597 pl_exec.c:2720
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "在RETURN NEXT中提供了错误的结果类型"
 
-#: pl_exec.c:2587 pl_exec.c:4084 pl_exec.c:4410 pl_exec.c:4445 pl_exec.c:4512
-#: pl_exec.c:4531 pl_exec.c:4599 pl_exec.c:4622
+#: pl_exec.c:2620 pl_exec.c:4166 pl_exec.c:4491 pl_exec.c:4517 pl_exec.c:4583
+#: pl_exec.c:4602 pl_exec.c:4670 pl_exec.c:4693
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "记录 \"%s\"还没有分配"
 
-#: pl_exec.c:2589 pl_exec.c:4086 pl_exec.c:4412 pl_exec.c:4447 pl_exec.c:4514
-#: pl_exec.c:4533 pl_exec.c:4601 pl_exec.c:4624
+#: pl_exec.c:2622 pl_exec.c:4168 pl_exec.c:4493 pl_exec.c:4519 pl_exec.c:4585
+#: pl_exec.c:4604 pl_exec.c:4672 pl_exec.c:4695
 #, c-format
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "未分配记录的元组结构未确定."
 
-#: pl_exec.c:2593 pl_exec.c:2613
+#: pl_exec.c:2626 pl_exec.c:2646
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "在RETURN NEXT中提供了错误的记录类型"
 
-#: pl_exec.c:2705
+#: pl_exec.c:2738
 #, c-format
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT必须有一个参数"
 
-#: pl_exec.c:2738 pl_gram.y:3070
+#: pl_exec.c:2771 pl_gram.y:3133
 #, c-format
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "无法在非SETOF函数中使用RETURN QUERY"
 
-#: pl_exec.c:2758
+#: pl_exec.c:2791
 msgid "structure of query does not match function result type"
 msgstr "查询的结构与函数的返回类型不匹配"
 
-#: pl_exec.c:2838 pl_exec.c:2970
+#: pl_exec.c:2871 pl_exec.c:3003
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "已经指定了RAISE选项：%s"
 
-#: pl_exec.c:2871
+#: pl_exec.c:2904
 #, c-format
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "不带有参数的RAISE不能在异常处理的外部使用"
 
-#: pl_exec.c:2912
+#: pl_exec.c:2945
 #, c-format
 msgid "too few parameters specified for RAISE"
 msgstr "为RAISE子句指定参数过少"
 
-#: pl_exec.c:2940
+#: pl_exec.c:2973
 #, c-format
 msgid "too many parameters specified for RAISE"
 msgstr "为RAISE子句指定参数过多"
 
-#: pl_exec.c:2960
+#: pl_exec.c:2993
 #, c-format
 msgid "RAISE statement option cannot be null"
 msgstr "RAISE语句选项不能为空"
 
-#: pl_exec.c:3031
+#: pl_exec.c:3064
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:3201 pl_exec.c:3338 pl_exec.c:3511
+#: pl_exec.c:3241 pl_exec.c:3378 pl_exec.c:3569
 #, c-format
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "无法在PL/pgSQL中从客户端或向客户端使用COPY命令"
 
-#: pl_exec.c:3205 pl_exec.c:3342 pl_exec.c:3515
+#: pl_exec.c:3245 pl_exec.c:3382 pl_exec.c:3573
 #, c-format
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "无法在PL/pgSQL中无法使用begin/end事务"
 
-#: pl_exec.c:3206 pl_exec.c:3343 pl_exec.c:3516
+#: pl_exec.c:3246 pl_exec.c:3383 pl_exec.c:3574
 #, c-format
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "使用带有一个EXCEPTION子句的BEGIN代码块."
 
-#: pl_exec.c:3366 pl_exec.c:3540
+#: pl_exec.c:3406 pl_exec.c:3598
 #, c-format
 msgid "INTO used with a command that cannot return data"
 msgstr "使用了带有无法返回数据的命令的INTO"
 
-#: pl_exec.c:3386 pl_exec.c:3560
+#: pl_exec.c:3434 pl_exec.c:3626
 #, c-format
 msgid "query returned no rows"
 msgstr "查询没有返回记录"
 
-#: pl_exec.c:3395 pl_exec.c:3569
+#: pl_exec.c:3453 pl_exec.c:3645
 #, c-format
 msgid "query returned more than one row"
 msgstr "查询返回多条记录"
 
-#: pl_exec.c:3410
+#: pl_exec.c:3470
 #, c-format
 msgid "query has no destination for result data"
 msgstr "对于结果数据，查询没有目标"
 
-#: pl_exec.c:3411
+#: pl_exec.c:3471
 #, c-format
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "如果您想要放弃SELECT语句的结果，请使用PERFORM."
 
-#: pl_exec.c:3444 pl_exec.c:6407
+#: pl_exec.c:3505 pl_exec.c:6480
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "EXECUTE的查询字符串参数是空值"
 
-#: pl_exec.c:3503
+#: pl_exec.c:3561
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "没有执行EXECUTE of SELECT ... INTO "
 
-#: pl_exec.c:3504
+#: pl_exec.c:3562
 #, c-format
 msgid ""
 "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
 "instead."
 msgstr "您可以使用EXECUTE ... INTO或者EXECUTE CREATE TABLE ... AS语句来替代"
 
-#: pl_exec.c:3792 pl_exec.c:3884
+#: pl_exec.c:3874 pl_exec.c:3966
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "游标变量\"%s\"是空的"
 
-#: pl_exec.c:3799 pl_exec.c:3891
+#: pl_exec.c:3881 pl_exec.c:3973
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "游标 \"%s\" 不存在"
 
-#: pl_exec.c:3813
+#: pl_exec.c:3895
 #, c-format
 msgid "relative or absolute cursor position is null"
 msgstr "游标的相对或绝对位置是空的"
 
-#: pl_exec.c:3980
+#: pl_exec.c:4062
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "不能将声明为NOT NULL的变量\"%s\" 分配空值"
 
-#: pl_exec.c:4027
+#: pl_exec.c:4109
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
 msgstr "无法将非组合值分配给记录变量"
 
-#: pl_exec.c:4051
+#: pl_exec.c:4133
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
 msgstr "无法将非组合值分配给记录类型变量"
 
-#: pl_exec.c:4196
+#: pl_exec.c:4278
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "数组维数(%d)超过了最大允许值(%d)"
 
-#: pl_exec.c:4228
+#: pl_exec.c:4310
 #, c-format
 msgid "subscripted object is not an array"
 msgstr "下标对象不是一个数组"
 
-#: pl_exec.c:4265
+#: pl_exec.c:4347
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "在赋值中数组下标不能为空"
 
-#: pl_exec.c:4737
+#: pl_exec.c:4806
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "查询\"%s\"没有返回数据"
 
-#: pl_exec.c:4745
+#: pl_exec.c:4814
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "查询\"%s\"返回%d列"
 
-#: pl_exec.c:4771
+#: pl_exec.c:4840
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "查询\"%s\"返回多条数据"
 
-#: pl_exec.c:4828
+#: pl_exec.c:4897
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "查询 \"%s\"不是SELECT语句"
@@ -521,378 +519,398 @@ msgstr "EXECUTE 语句"
 msgid "FOR over EXECUTE statement"
 msgstr "在EXECUTE语句上的FOR语句"
 
-#: pl_gram.y:449
+#: pl_gram.y:469
 #, c-format
 msgid "block label must be placed before DECLARE, not after"
 msgstr "代码块标签必须放在DECLARE的前面，而不是后面"
 
-#: pl_gram.y:469
+#: pl_gram.y:489
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "类型 %s不支持校对函数"
 
-#: pl_gram.y:484
+#: pl_gram.y:504
 #, c-format
 msgid "row or record variable cannot be CONSTANT"
 msgstr "记录或者记录类型变量不能是CONSTANT类型"
 
-#: pl_gram.y:494
+#: pl_gram.y:514
 #, c-format
 msgid "row or record variable cannot be NOT NULL"
 msgstr "记录或者记录类型变量不能是NOT NULL"
 
-#: pl_gram.y:505
+#: pl_gram.y:525
 #, c-format
 msgid "default value for row or record variable is not supported"
 msgstr "不支持为记录或记录类型变量设置缺省值"
 
-#: pl_gram.y:650 pl_gram.y:665 pl_gram.y:691
+#: pl_gram.y:670 pl_gram.y:685 pl_gram.y:711
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "变量 \"%s\" 不存在"
 
-#: pl_gram.y:709 pl_gram.y:722
+#: pl_gram.y:729 pl_gram.y:757
 msgid "duplicate declaration"
 msgstr "重复声明"
 
-#: pl_gram.y:900
+#: pl_gram.y:740 pl_gram.y:768
+#, c-format
+#| msgid "variable \"%s\" is hidden by a local variable"
+msgid "variable \"%s\" shadows a previously defined variable"
+msgstr "变量\"%s\"隐藏了前一个已定义的变量"
+
+#: pl_gram.y:955
 #, c-format
 msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
 msgstr "诊断项 %s 不允许出现在GET STACKED DIAGNOSTICS的结果中"
 
-#: pl_gram.y:918
+#: pl_gram.y:973
 #, c-format
 msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
 msgstr "诊断项 %s 不允许出现在GET CURRENT DIAGNOSTICS的结果中"
 
-#: pl_gram.y:1010
+#: pl_gram.y:1071
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "无法识别的项GET DIAGNOSTICS"
 
-#: pl_gram.y:1021 pl_gram.y:3257
+#: pl_gram.y:1082 pl_gram.y:3320
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" 不是一个标量变量"
 
-#: pl_gram.y:1273 pl_gram.y:1467
+#: pl_gram.y:1334 pl_gram.y:1528
 #, c-format
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
 msgstr "在记录集上进行循环的循环变量必须是记录或记录类型变量或标量变量的列表"
 
-#: pl_gram.y:1307
+#: pl_gram.y:1368
 #, c-format
 msgid "cursor FOR loop must have only one target variable"
 msgstr "游标的FOR循环只能有一个目标变量"
 
-#: pl_gram.y:1314
+#: pl_gram.y:1375
 #, c-format
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "游标的FOR循环必须使用有界游标变量"
 
-#: pl_gram.y:1398
+#: pl_gram.y:1459
 #, c-format
 msgid "integer FOR loop must have only one target variable"
 msgstr "整数FOR循环必须只能有一个目标变量"
 
-#: pl_gram.y:1434
+#: pl_gram.y:1495
 #, c-format
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "无法在查询FOR循环中指定REVERSE "
 
-#: pl_gram.y:1581
+#: pl_gram.y:1642
 #, c-format
 msgid "loop variable of FOREACH must be a known variable or list of variables"
 msgstr "FOREACH的循环变量必须是已知类型或者是变量列表"
 
-#: pl_gram.y:1633 pl_gram.y:1670 pl_gram.y:1718 pl_gram.y:2713 pl_gram.y:2794
-#: pl_gram.y:2905 pl_gram.y:3658
+#: pl_gram.y:1694 pl_gram.y:1731 pl_gram.y:1779 pl_gram.y:2776 pl_gram.y:2857
+#: pl_gram.y:2968 pl_gram.y:3721
 msgid "unexpected end of function definition"
 msgstr "在函数定义中意外出现的结束标志"
 
-#: pl_gram.y:1738 pl_gram.y:1762 pl_gram.y:1778 pl_gram.y:1784 pl_gram.y:1873
-#: pl_gram.y:1881 pl_gram.y:1895 pl_gram.y:1990 pl_gram.y:2171 pl_gram.y:2254
-#: pl_gram.y:2386 pl_gram.y:3500 pl_gram.y:3561 pl_gram.y:3639
+#: pl_gram.y:1799 pl_gram.y:1823 pl_gram.y:1839 pl_gram.y:1845 pl_gram.y:1934
+#: pl_gram.y:1942 pl_gram.y:1956 pl_gram.y:2051 pl_gram.y:2232 pl_gram.y:2315
+#: pl_gram.y:2449 pl_gram.y:3563 pl_gram.y:3624 pl_gram.y:3702
 msgid "syntax error"
 msgstr "语法错误"
 
-#: pl_gram.y:1766 pl_gram.y:1768 pl_gram.y:2175 pl_gram.y:2177
+#: pl_gram.y:1827 pl_gram.y:1829 pl_gram.y:2236 pl_gram.y:2238
 msgid "invalid SQLSTATE code"
 msgstr "无效的SQLSTATE代码"
 
-#: pl_gram.y:1937
+#: pl_gram.y:1998
 msgid "syntax error, expected \"FOR\""
 msgstr "语法错误，期望\"FOR\""
 
-#: pl_gram.y:1999
+#: pl_gram.y:2060
 #, c-format
 msgid "FETCH statement cannot return multiple rows"
 msgstr "FETCH语句无法返回多条记录"
 
-#: pl_gram.y:2055
+#: pl_gram.y:2116
 #, c-format
 msgid "cursor variable must be a simple variable"
 msgstr "游标变量必须是一个简单变量"
 
-#: pl_gram.y:2061
+#: pl_gram.y:2122
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "变量\"%s\" 必须属于游标类型或refcursor类型"
 
-#: pl_gram.y:2229
+#: pl_gram.y:2290
 msgid "label does not exist"
 msgstr "标签不存在"
 
-#: pl_gram.y:2357 pl_gram.y:2368
+#: pl_gram.y:2420 pl_gram.y:2431
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\" 不是一个已知变量"
 
-#: pl_gram.y:2472 pl_gram.y:2482 pl_gram.y:2637
+#: pl_gram.y:2535 pl_gram.y:2545 pl_gram.y:2700
 msgid "mismatched parentheses"
 msgstr "括号不匹配"
 
-#: pl_gram.y:2486
+#: pl_gram.y:2549
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "在SQL表达式的结尾处丢失\"%s\""
 
-#: pl_gram.y:2492
+#: pl_gram.y:2555
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "在SQL语句的结尾处丢失\"%s\""
 
-#: pl_gram.y:2509
+#: pl_gram.y:2572
 msgid "missing expression"
 msgstr "缺少表达式"
 
-#: pl_gram.y:2511
+#: pl_gram.y:2574
 msgid "missing SQL statement"
 msgstr "缺少SQL语句"
 
-#: pl_gram.y:2639
+#: pl_gram.y:2702
 msgid "incomplete data type declaration"
 msgstr "未完成的数据类型声明"
 
-#: pl_gram.y:2662
+#: pl_gram.y:2725
 msgid "missing data type declaration"
 msgstr "丢失数据类型声明"
 
-#: pl_gram.y:2718
+#: pl_gram.y:2781
 msgid "INTO specified more than once"
 msgstr "多次指定INTO"
 
-#: pl_gram.y:2886
+#: pl_gram.y:2949
 msgid "expected FROM or IN"
 msgstr "期望关键字FROM或IN"
 
-#: pl_gram.y:2946
+#: pl_gram.y:3009
 #, c-format
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "在返回为集合的函数中RETURN不能带有参数"
 
-#: pl_gram.y:2947
+#: pl_gram.y:3010
 #, c-format
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "使用RETURN NEXT或RETURN QUERY."
 
-#: pl_gram.y:2955
+#: pl_gram.y:3018
 #, c-format
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "在带有输出参数的函数中RETURN不能有参数"
 
-#: pl_gram.y:2964
+#: pl_gram.y:3027
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "在返回为空的函数中RETURN不能有参数"
 
-#: pl_gram.y:3026
+#: pl_gram.y:3089
 #, c-format
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "在带有输出参数的函数中RETURN NEXT不能有参数"
 
-#: pl_gram.y:3126
+#: pl_gram.y:3189
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\"被声明为常量"
 
-#: pl_gram.y:3188 pl_gram.y:3200
+#: pl_gram.y:3251 pl_gram.y:3263
 #, c-format
 msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr "记录或行类型变量不能作为带有多个项的INTO列表中的一部分"
 
-#: pl_gram.y:3245
+#: pl_gram.y:3308
 #, c-format
 msgid "too many INTO variables specified"
 msgstr "在INTO后面指定了太多的变量"
 
-#: pl_gram.y:3453
+#: pl_gram.y:3516
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "为没有标签的代码块指定结束标签\"%s\" "
 
-#: pl_gram.y:3460
+#: pl_gram.y:3523
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "结束标签\"%s\" 与代码块标签\"%s\"不同"
 
-#: pl_gram.y:3495
+#: pl_gram.y:3558
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "游标\"%s\" 没有参数"
 
-#: pl_gram.y:3509
+#: pl_gram.y:3572
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "游标\"%s\"有参数"
 
-#: pl_gram.y:3551
+#: pl_gram.y:3614
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
 msgstr "游标\"%s\" 没有名为 \"%s\"的参数"
 
-#: pl_gram.y:3571
+#: pl_gram.y:3634
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
 msgstr "游标\"%2$s\"中的参数值\"%1$s\"指定了多次"
 
-#: pl_gram.y:3596
+#: pl_gram.y:3659
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
 msgstr "游标 \"%s\"没有足够的参数"
 
-#: pl_gram.y:3603
+#: pl_gram.y:3666
 #, c-format
 msgid "too many arguments for cursor \"%s\""
 msgstr "游标 \"%s\"给定的参数太多"
 
-#: pl_gram.y:3690
+#: pl_gram.y:3753
 msgid "unrecognized RAISE statement option"
 msgstr "无法识别的RAISE语句选项"
 
-#: pl_gram.y:3694
+#: pl_gram.y:3757
 msgid "syntax error, expected \"=\""
 msgstr "语法错误，期望\"=\""
 
-#: pl_handler.c:61
+#: pl_handler.c:147
 msgid ""
 "Sets handling of conflicts between PL/pgSQL variable names and table column "
 "names."
 msgstr "设置在PL/pgSQL变量名称和表中列名冲突时的处理原则"
 
+#: pl_handler.c:156
+msgid ""
+"Print information about parameters in the DETAIL part of the error messages "
+"generated on INTO ... STRICT failures."
+msgstr "打印产生于INTO...STRICT失败时的详细的错误消息里的参数信息"
+
+#: pl_handler.c:164
+msgid "List of programming constructs that should produce a warning."
+msgstr "程序构造列表必须输出警告."
+
+#: pl_handler.c:174
+msgid "List of programming constructs that should produce an error."
+msgstr "程序构造列表必须输出一个错误信息提示."
+
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:552
+#: pl_scanner.c:554
 #, c-format
 msgid "%s at end of input"
 msgstr "%s 在输入的末尾"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:568
+#: pl_scanner.c:570
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s 在 \"%s\" 或附近的"
 
-#~ msgid "relation \"%s.%s\" does not exist"
-#~ msgstr "关系 \"%s.%s\" 不存在"
-
-#~ msgid "expected \"[\""
-#~ msgstr "期望 \"[\""
-
-#~ msgid "row \"%s\" has no field \"%s\""
-#~ msgstr "记录\"%s\"没有字段\"%s\""
-
-#~ msgid "row \"%s.%s\" has no field \"%s\""
-#~ msgstr "记录\"%s.%s\"没有字段\"%s\""
+#~ msgid ""
+#~ "RETURN must specify a record or row variable in function returning row"
+#~ msgstr "在返回记录的函数中RETURN必须制定一个记录或记录类型变量"
 
-#~ msgid "type of \"%s\" does not match that when preparing the plan"
-#~ msgstr " \"%s\"类型与正在准备计划时的类型不匹配"
+#~ msgid ""
+#~ "RETURN NEXT must specify a record or row variable in function returning "
+#~ "row"
+#~ msgstr "在返回记录的函数中RETURN NEXT必须指定记录或记录类型变量"
 
-#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
-#~ msgstr " \"%s.%s\"类型与正在准备计划时的类型不匹配"
+#~ msgid "unterminated dollar-quoted string"
+#~ msgstr "未结束的$引用字符串"
 
-#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
-#~ msgstr "tg_argv[%d]的类型与正在准备计划时的类型不匹配"
+#~ msgid "unterminated quoted string"
+#~ msgstr "未结束的引用字符串"
 
-#~ msgid "N/A (dropped column)"
-#~ msgstr "N/A (已删除的列)"
+#~ msgid "unterminated /* comment"
+#~ msgstr "/* 注释没有结束"
 
-#~ msgid ""
-#~ "Number of returned columns (%d) does not match expected column count (%d)."
-#~ msgstr "所返回列的数量（%d列）与所期望列的数量(%d)不匹配."
+#~ msgid "unterminated quoted identifier"
+#~ msgstr "未结束的引用标识符"
 
-#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
-#~ msgstr "所返回的类型%1$s与列\"%3$s\"中期待的类型%2$s不匹配."
+#~ msgid "qualified identifier cannot be used here: %s"
+#~ msgstr "在这里不能使用限定标识符：%s"
 
-#~ msgid "only positional parameters can be aliased"
-#~ msgstr "只有已定位的参数能使用化名"
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "在标识符中未结束的\"：%s"
 
-#~ msgid "function has no parameter \"%s\""
-#~ msgstr "函数中没有参数\"%s\""
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "在当前代码块中不存在变量 \"%s\""
 
-#~ msgid "expected an integer variable"
-#~ msgstr "期望一个整型变量"
+#~ msgid "expected \")\""
+#~ msgstr "期望\")\""
 
-#~ msgid "syntax error at \"%s\""
-#~ msgstr "在\"%s\"上出现语法错误"
+#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的字符串常量"
 
-#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
-#~ msgstr "期望\"FOR\"来为无界游标变量打开游标"
+#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的SQL语句"
 
-#~ msgid "expected a cursor or refcursor variable"
-#~ msgstr "期望游标或refcursor类型变量"
+#~ msgid ""
+#~ "Expected record variable, row variable, or list of scalar variables "
+#~ "following INTO."
+#~ msgstr "在INTO后期望记录类型变量，记录变量或标量变量的列表."
 
-#~ msgid "too many variables specified in SQL statement"
-#~ msgstr "在SQL语句中指定了太多的变量"
+#~ msgid "cannot assign to tg_argv"
+#~ msgstr "无法分配到tg_argv"
 
 #~ msgid ""
 #~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
 #~ "or RETURN QUERY"
 #~ msgstr "在返回集合的函数中RETURN不能有参数;使用RETURN NEXT或RETURN QUERY"
 
-#~ msgid "cannot assign to tg_argv"
-#~ msgstr "无法分配到tg_argv"
+#~ msgid "too many variables specified in SQL statement"
+#~ msgstr "在SQL语句中指定了太多的变量"
 
-#~ msgid ""
-#~ "Expected record variable, row variable, or list of scalar variables "
-#~ "following INTO."
-#~ msgstr "在INTO后期望记录类型变量，记录变量或标量变量的列表."
+#~ msgid "expected a cursor or refcursor variable"
+#~ msgstr "期望游标或refcursor类型变量"
 
-#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的SQL语句"
+#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
+#~ msgstr "期望\"FOR\"来为无界游标变量打开游标"
 
-#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
-#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的字符串常量"
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "在\"%s\"上出现语法错误"
 
-#~ msgid "expected \")\""
-#~ msgstr "期望\")\""
+#~ msgid "expected an integer variable"
+#~ msgstr "期望一个整型变量"
 
-#~ msgid "variable \"%s\" does not exist in the current block"
-#~ msgstr "在当前代码块中不存在变量 \"%s\""
+#~ msgid "function has no parameter \"%s\""
+#~ msgstr "函数中没有参数\"%s\""
 
-#~ msgid "unterminated \" in identifier: %s"
-#~ msgstr "在标识符中未结束的\"：%s"
+#~ msgid "only positional parameters can be aliased"
+#~ msgstr "只有已定位的参数能使用化名"
 
-#~ msgid "qualified identifier cannot be used here: %s"
-#~ msgstr "在这里不能使用限定标识符：%s"
+#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
+#~ msgstr "所返回的类型%1$s与列\"%3$s\"中期待的类型%2$s不匹配."
 
-#~ msgid "unterminated quoted identifier"
-#~ msgstr "未结束的引用标识符"
+#~ msgid ""
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ msgstr "所返回列的数量（%d列）与所期望列的数量(%d)不匹配."
 
-#~ msgid "unterminated /* comment"
-#~ msgstr "/* 注释没有结束"
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/A (已删除的列)"
 
-#~ msgid "unterminated quoted string"
-#~ msgstr "未结束的引用字符串"
+#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
+#~ msgstr "tg_argv[%d]的类型与正在准备计划时的类型不匹配"
 
-#~ msgid "unterminated dollar-quoted string"
-#~ msgstr "未结束的$引用字符串"
+#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
+#~ msgstr " \"%s.%s\"类型与正在准备计划时的类型不匹配"
 
-#~ msgid ""
-#~ "RETURN NEXT must specify a record or row variable in function returning "
-#~ "row"
-#~ msgstr "在返回记录的函数中RETURN NEXT必须指定记录或记录类型变量"
+#~ msgid "type of \"%s\" does not match that when preparing the plan"
+#~ msgstr " \"%s\"类型与正在准备计划时的类型不匹配"
 
-#~ msgid ""
-#~ "RETURN must specify a record or row variable in function returning row"
-#~ msgstr "在返回记录的函数中RETURN必须制定一个记录或记录类型变量"
+#~ msgid "row \"%s.%s\" has no field \"%s\""
+#~ msgstr "记录\"%s.%s\"没有字段\"%s\""
+
+#~ msgid "row \"%s\" has no field \"%s\""
+#~ msgstr "记录\"%s\"没有字段\"%s\""
+
+#~ msgid "expected \"[\""
+#~ msgstr "期望 \"[\""
+
+#~ msgid "relation \"%s.%s\" does not exist"
+#~ msgstr "关系 \"%s.%s\" 不存在"
diff --git a/src/pl/plpython/nls.mk b/src/pl/plpython/nls.mk
index 61c7a9033e..c739e67e77 100644
--- a/src/pl/plpython/nls.mk
+++ b/src/pl/plpython/nls.mk
@@ -1,6 +1,6 @@
 # src/pl/plpython/nls.mk
 CATALOG_NAME     = plpython
-AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ro ru zh_CN
+AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru zh_CN
 GETTEXT_FILES    = plpy_cursorobject.c plpy_elog.c plpy_exec.c plpy_main.c plpy_planobject.c plpy_plpymodule.c \
                    plpy_procedure.c plpy_resultobject.c plpy_spi.c plpy_subxactobject.c plpy_typeio.c plpy_util.c
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
diff --git a/src/pl/plpython/po/ro.po b/src/pl/plpython/po/ro.po
deleted file mode 100644
index ec9bb7b805..0000000000
--- a/src/pl/plpython/po/ro.po
+++ /dev/null
@@ -1,336 +0,0 @@
-# LANGUAGE message translation file for plpython
-# Copyright (C) 2010 PostgreSQL Global Development Group
-# This file is distributed under the same license as the PostgreSQL package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 9.1\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-11-09 20:40+0000\n"
-"PO-Revision-Date: 2013-09-05 23:03-0400\n"
-"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
-"Language-Team: Română <xsoftware.consultancy@gmail.com>\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Poedit-Language: Romanian\n"
-"X-Poedit-Country: ROMANIA\n"
-
-#: plpython.c:475
-#, c-format
-msgid "PL/Python function \"%s\""
-msgstr "funcție PL/Python \"%s\""
-
-#: plpython.c:482
-msgid "PL/Python anonymous code block"
-msgstr "bloc de cod PL/Python anonim"
-
-#: plpython.c:489
-msgid "while modifying trigger row"
-msgstr "în timpul modificării triggerului de rând"
-
-#: plpython.c:496
-msgid "while creating return value"
-msgstr "în timpul creării valorii rezultat"
-
-#: plpython.c:707
-#: plpython.c:733
-msgid "unexpected return value from trigger procedure"
-msgstr "procedura trigger a rezultat o valoare neașteptată"
-
-#: plpython.c:708
-msgid "Expected None or a string."
-msgstr "așteptam None sau un șir String"
-
-#: plpython.c:723
-msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
-msgstr "funcția trigger PL/Python a rezultat \"MODIFY\" întro funcție trigger de tip DELETE  -- ignor"
-
-#: plpython.c:734
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "Așteptam None, \"OK\", \"SKIP\", sau \"MODIFY\"."
-
-#: plpython.c:786
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] șters, nu poate modifica rândul "
-
-#: plpython.c:789
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] nu este un dicționar"
-
-#: plpython.c:813
-#, c-format
-msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
-msgstr "TD[\"new\"] cheia dicționarului la poziția %d nu este un șir String"
-
-#: plpython.c:819
-#, c-format
-msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
-msgstr "cheia \"%s\" găsită în TD[\"new\"] nu există ca și coloană în rândul care a activat triggerul"
-
-#: plpython.c:915
-msgid "could not create new dictionary while building trigger arguments"
-msgstr "nu pot crea un nou dicționar în timp ce construiesc argumentele triggerului"
-
-#: plpython.c:1122
-msgid "unsupported set function return mode"
-msgstr "mod de returnare a funcției set nesuportat"
-
-#: plpython.c:1123
-msgid "PL/Python set-returning functions only support returning only value per call."
-msgstr "funcțiile PL/Python ce returnează doar seturi suportă doar o singură valoare returnată la fiecare apel."
-
-#: plpython.c:1135
-msgid "returned object cannot be iterated"
-msgstr "obiectul returnat nu poate fi iterat"
-
-#: plpython.c:1136
-msgid "PL/Python set-returning functions must return an iterable object."
-msgstr "funcțiile PL/Python ce returnează seturi trebuie să aibă ca rezultat un obiect iterabil."
-
-#: plpython.c:1161
-msgid "error fetching next item from iterator"
-msgstr "eroare la obținerea următorului element din iterator"
-
-#: plpython.c:1196
-msgid "PL/Python function with return type \"void\" did not return None"
-msgstr "funcția PL/Python cu rezultatul de tip \"void\" nu a returbat None"
-
-#: plpython.c:1287
-msgid "forcibly aborting a subtransaction that has not been exited"
-msgstr "intrerupere forţată a unei subtranzacţii din care nu s-a ieşit"
-
-#: plpython.c:1403
-msgid "PyList_SetItem() failed, while setting up arguments"
-msgstr "PyList_SetItem() a eșuat, în timpul creării argumentelor"
-
-#: plpython.c:1407
-msgid "PyDict_SetItemString() failed, while setting up arguments"
-msgstr "PyDict_SetItemString() a eșuat, în timpul creării argumentelor"
-
-#: plpython.c:1419
-msgid "function returning record called in context that cannot accept type record"
-msgstr "apel de funcție care are rezultat de tip rând într-un context care nu acceptă tipul rând"
-
-#: plpython.c:1653
-msgid "trigger functions can only be called as triggers"
-msgstr "funcţiile trigger pot fi apelate doar ca triggere"
-
-#: plpython.c:1658
-#: plpython.c:2131
-#, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "funcțiile PL/Python nu pot returna tipul %s"
-
-#: plpython.c:1740
-#, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "funcțiile PL/Python nu pot accepta tipul %s"
-
-#: plpython.c:1836
-#, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "nu pot compila funcția PL/Python \"%s\""
-
-#: plpython.c:1839
-msgid "could not compile anonymous PL/Python code block"
-msgstr "nu pot compila codul bloc anonim PL/Python"
-
-#: plpython.c:2133
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr "PL/Python nu suportă conversia în array-uri de tip rând."
-
-#: plpython.c:2342
-msgid "cannot convert multidimensional array to Python list"
-msgstr "nu pot converti un array-ul  mai multe dimensiuni într-o listă Python"
-
-#: plpython.c:2343
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr "PL/Python suportă doar array-uri cu o dimensiune."
-
-#: plpython.c:2382
-msgid "could not create new dictionary"
-msgstr "nu pot crea un nou dicționar"
-
-#: plpython.c:2477
-msgid "could not create bytes representation of Python object"
-msgstr "nu pot crea reprezentarea octet a obiectului Python"
-
-#: plpython.c:2575
-msgid "could not create string representation of Python object"
-msgstr "nu pot crea reprezentarea șir String a obiectului Python"
-
-#: plpython.c:2586
-msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
-msgstr "nu pot converti obiectul Python într-un cstring: reprezentarea string a obiectului Python pare să conțină octeți nuli"
-
-#: plpython.c:2620
-msgid "return value of function with array return type is not a Python sequence"
-msgstr "return value of function with array return type is not a Python sequence"
-
-#: plpython.c:2700
-#, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "cheia \"%s\" nu e gasită în mapare"
-
-#: plpython.c:2701
-msgid "To return null in a column, add the value None to the mapping with the key named after the column."
-msgstr "Pentru a obșine null într-o coloană, adăugați valoarea None la mapare cu cheia numită cu numele coloanei."
-
-#: plpython.c:2749
-msgid "length of returned sequence did not match number of columns in row"
-msgstr "lungimea secvenței returnate nu se potrivește cu numărul de coloane din rând"
-
-#: plpython.c:2857
-#, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "atributul \"%s\" nu există în obiectul Python"
-
-#: plpython.c:2858
-msgid "To return null in a column, let the returned object have an attribute named after column with value None."
-msgstr "Pentru a abține null într-o coloană, obiectul returnat trebuie să aibă un atribut cu numele coloanei și cu valoarea None."
-
-#: plpython.c:3177
-msgid "plan.status takes no arguments"
-msgstr "plan.status nu acceptă argumente"
-
-#: plpython.c:3301
-msgid "second argument of plpy.prepare must be a sequence"
-msgstr "al doilea argument al plpy.prepare trebuie să fie o secvență"
-
-#: plpython.c:3351
-#, c-format
-msgid "plpy.prepare: type name at ordinal position %d is not a string"
-msgstr "plpy.prepare: numele tipului la poziția %d nu este un șir"
-
-#: plpython.c:3383
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare nu suportă tipul compozit"
-
-#: plpython.c:3473
-msgid "plpy.execute expected a query or a plan"
-msgstr "plpy.execute aștepta o interogare sau un plan"
-
-#: plpython.c:3492
-msgid "plpy.execute takes a sequence as its second argument"
-msgstr "plpy.execute acceptă o secvență ca al doilea argument"
-
-#: plpython.c:3508
-msgid "could not execute plan"
-msgstr "nu pot executa planul"
-
-#: plpython.c:3511
-#, c-format
-msgid "Expected sequence of %d argument, got %d: %s"
-msgid_plural "Expected sequence of %d arguments, got %d: %s"
-msgstr[0] "Secvența așteptată a argumentului %d, a obținut %d: %s"
-msgstr[1] "Secvența așteptată a argumentelor %d, a obținut %d: %s"
-msgstr[2] "Secvența așteptată a argumentelor %d, a obținut %d: %s"
-
-#: plpython.c:3653
-#, c-format
-msgid "SPI_execute_plan failed: %s"
-msgstr "SPI_execute_plan a eșuat: %s"
-
-#: plpython.c:3731
-#, c-format
-msgid "SPI_execute failed: %s"
-msgstr "SPI_execute a eșuat: %s"
-
-#: plpython.c:3786
-msgid "unrecognized error in PLy_spi_execute_fetch_result"
-msgstr "eroare necunoscută în PLy_spi_execute_fetch_result"
-
-#: plpython.c:3848
-msgid "this subtransaction has already been entered"
-msgstr "am intrat deja în acestă subtranzacţie"
-
-#: plpython.c:3854
-#: plpython.c:3906
-msgid "this subtransaction has already been exited"
-msgstr "am ieşit deja din această subtranzacţie"
-
-#: plpython.c:3900
-msgid "this subtransaction has not been entered"
-msgstr "nu s-a intrat în această subtranzacţie"
-
-#: plpython.c:3912
-msgid "there is no subtransaction to exit from"
-msgstr "nu există nici o subtranzacţie din care să ieşim"
-
-#: plpython.c:3994
-msgid "could not add the spiexceptions module"
-msgstr "nu pot adăuga modulul spiexceptions "
-
-#: plpython.c:4077
-msgid "Python major version mismatch in session"
-msgstr "nepotrivire în sesiune de versiune majoră Python"
-
-#: plpython.c:4078
-#, c-format
-msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
-msgstr "Această sesiune a folosit versiunea majoră de Python %d și acum încearcă să folosească versiunea majoră de Python %d."
-
-#: plpython.c:4080
-msgid "Start a new session to use a different Python major version."
-msgstr "Începe o nouă sesiune pentru a folosi o versiune majoră de Python diferită"
-
-#: plpython.c:4095
-msgid "untrapped error in initialization"
-msgstr "eroare netratată la inițializare"
-
-#: plpython.c:4123
-msgid "could not import \"__main__\" module"
-msgstr "nu pot importa modulul \"__main__\""
-
-#: plpython.c:4130
-msgid "could not initialize globals"
-msgstr "nu pot inițializa globals"
-
-#: plpython.c:4243
-msgid "could not parse error message in plpy.elog"
-msgstr "nu pot analiza mesajul de eroare în plpy.elog"
-
-#: plpython.c:4267
-#: plpython.c:4499
-#: plpython.c:4500
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: plpython.c:4854
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr "nu pot converti obiectul Unicode Python Unicode în codificarea folosită de serverul PostgreSQL"
-
-#~ msgid "PyCObject_AsVoidPtr() failed"
-#~ msgstr "PyCObject_AsVoidPtr() a eșuat"
-
-#~ msgid "PyCObject_FromVoidPtr() failed"
-#~ msgstr "PyCObject_FromVoidPtr() a eșuat"
-
-#~ msgid "transaction aborted"
-#~ msgstr "tranzacție anulată"
-
-#~ msgid "invalid arguments for plpy.prepare"
-#~ msgstr "argumente invalide pentru plpy.prepare"
-
-#~ msgid "unrecognized error in PLy_spi_prepare"
-#~ msgstr "eroare necunoscută în PLy_spi_prepare"
-
-#~ msgid "unrecognized error in PLy_spi_execute_plan"
-#~ msgstr "eroare necunoscută în PLy_spi_execute_plan"
-
-#~ msgid "unrecognized error in PLy_spi_execute_query"
-#~ msgstr "eroare necunoscută în PLy_spi_execute_query"
-
-#~ msgid "could not create procedure cache"
-#~ msgstr "nu pot crea procedura cache"
-
-#~ msgid "PL/Python: %s"
-#~ msgstr "PL/Python: %s"
-
-#~ msgid "out of memory"
-#~ msgstr "memorie insuficientă"
diff --git a/src/pl/plpython/po/zh_CN.po b/src/pl/plpython/po/zh_CN.po
index b21c34d242..e626ac2e31 100644
--- a/src/pl/plpython/po/zh_CN.po
+++ b/src/pl/plpython/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:39+0000\n"
-"PO-Revision-Date: 2012-10-19 20:50+0800\n"
+"POT-Creation-Date: 2014-11-22 21:07+0000\n"
+"PO-Revision-Date: 2014-11-28 15:52+0800\n"
 "Last-Translator: Xiong He <iihero@qq.com>\n"
 "Language-Team: Weibin <ssmei_2000@yahoo.com>\n"
 "Language: zh_CN\n"
@@ -28,12 +28,12 @@ msgstr "plpy.cursor期望一个查询或一个计划"
 msgid "plpy.cursor takes a sequence as its second argument"
 msgstr "plpy.cursor将一个序列作为它的第二个参数"
 
-#: plpy_cursorobject.c:187 plpy_spi.c:222
+#: plpy_cursorobject.c:187 plpy_spi.c:223
 #, c-format
 msgid "could not execute plan"
 msgstr "无法执行计划"
 
-#: plpy_cursorobject.c:190 plpy_spi.c:225
+#: plpy_cursorobject.c:190 plpy_spi.c:226
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -45,18 +45,18 @@ msgstr[0] "期望%d序列参数,但是得到%d: %s"
 msgid "iterating a closed cursor"
 msgstr "遍历一个关闭的游标"
 
-#: plpy_cursorobject.c:348 plpy_cursorobject.c:415
+#: plpy_cursorobject.c:348 plpy_cursorobject.c:413
 #, c-format
 msgid "iterating a cursor in an aborted subtransaction"
 msgstr "在终止的子事务里遍历一个游标"
 
 # sql_help.h:109
-#: plpy_cursorobject.c:407
+#: plpy_cursorobject.c:405
 #, c-format
 msgid "fetch from a closed cursor"
 msgstr "从关闭的游标里获取结果"
 
-#: plpy_cursorobject.c:486
+#: plpy_cursorobject.c:482
 #, c-format
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "在终止的子事务里关闭一个游标"
@@ -66,85 +66,85 @@ msgstr "在终止的子事务里关闭一个游标"
 msgid "%s"
 msgstr "%s"
 
-#: plpy_exec.c:90
+#: plpy_exec.c:91
 #, c-format
 msgid "unsupported set function return mode"
 msgstr "不支持集合函数返回模式"
 
-#: plpy_exec.c:91
+#: plpy_exec.c:92
 #, c-format
 msgid ""
 "PL/Python set-returning functions only support returning only value per call."
 msgstr "PL/Python集合返回函数只支持在每次调用时返回值."
 
-#: plpy_exec.c:103
+#: plpy_exec.c:104
 #, c-format
 msgid "returned object cannot be iterated"
 msgstr "所返回的对象无法迭代"
 
-#: plpy_exec.c:104
+#: plpy_exec.c:105
 #, c-format
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "PL/Python集合返回函数必须返回一个可迭代的对象."
 
-#: plpy_exec.c:129
+#: plpy_exec.c:130
 #, c-format
 msgid "error fetching next item from iterator"
 msgstr "当从迭代器中取回下一个成员时出现错误"
 
-#: plpy_exec.c:164
+#: plpy_exec.c:165
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "返回类型为\"void\"的PL/Python函数不返回None"
 
-#: plpy_exec.c:288 plpy_exec.c:314
+#: plpy_exec.c:289 plpy_exec.c:315
 #, c-format
 msgid "unexpected return value from trigger procedure"
 msgstr "在触发器存储过程出现非期望的返回值"
 
-#: plpy_exec.c:289
+#: plpy_exec.c:290
 #, c-format
 msgid "Expected None or a string."
 msgstr "期望空值或一个字符串"
 
-#: plpy_exec.c:304
+#: plpy_exec.c:305
 #, c-format
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "在DELETE触发器中的PL/Python 触发器函数返回 \"MODIFY\"  -- 忽略"
 
-#: plpy_exec.c:315
+#: plpy_exec.c:316
 #, c-format
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "期望None, \"OK\", \"SKIP\", 或\"MODIFY\""
 
-#: plpy_exec.c:396
+#: plpy_exec.c:397
 #, c-format
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "当设置参数的同时, 执行PyList_SetItem()失败"
 
-#: plpy_exec.c:400
+#: plpy_exec.c:401
 #, c-format
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "当设置参数的同时, 执行PyDict_SetItemString()失败"
 
-#: plpy_exec.c:412
+#: plpy_exec.c:413
 #, c-format
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr "返回值类型是记录的函数在不接受使用记录类型的环境中调用"
 
-#: plpy_exec.c:450
+#: plpy_exec.c:451
 #, c-format
 msgid "while creating return value"
 msgstr "同时在创建返回值"
 
-#: plpy_exec.c:474
+#: plpy_exec.c:475
 #, c-format
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "在构建触发器参数的同时无法创建新的字典."
 
-#: plpy_exec.c:664
+#: plpy_exec.c:663
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] 已删除，无法修改记录"
@@ -166,22 +166,22 @@ msgid ""
 "row"
 msgstr "在 TD[\"new\"]中找到的键 \"%s\"在正在触发的记录中不是作为列而存在."
 
-#: plpy_exec.c:778
+#: plpy_exec.c:777
 #, c-format
 msgid "while modifying trigger row"
 msgstr "同时正在修改触发器记录"
 
-#: plpy_exec.c:839
+#: plpy_exec.c:838
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "强行终止一个还未退出的子事务"
 
-#: plpy_main.c:101
+#: plpy_main.c:93
 #, c-format
 msgid "Python major version mismatch in session"
 msgstr "在会话中Python的主版本不匹配"
 
-#: plpy_main.c:102
+#: plpy_main.c:94
 #, c-format
 msgid ""
 "This session has previously used Python major version %d, and it is now "
@@ -189,37 +189,37 @@ msgid ""
 msgstr ""
 "这个会话先前已经使用的Python主版本是%d，现在它试图使用的Python主版本是%d "
 
-#: plpy_main.c:104
+#: plpy_main.c:96
 #, c-format
 msgid "Start a new session to use a different Python major version."
 msgstr "启动一个新的会话来使用一个不同的Python的主要版本"
 
-#: plpy_main.c:119
+#: plpy_main.c:111
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "在初始化过程中出现无法捕获的错误"
 
-#: plpy_main.c:142
+#: plpy_main.c:134
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "无法导入模块\"__main__\" "
 
-#: plpy_main.c:147
+#: plpy_main.c:139
 #, c-format
 msgid "could not create globals"
 msgstr "无法创建全局变量"
 
-#: plpy_main.c:151
+#: plpy_main.c:143
 #, c-format
 msgid "could not initialize globals"
 msgstr "无法初始化全局变量"
 
-#: plpy_main.c:351
+#: plpy_main.c:347
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "PL/Python函数\"%s\""
 
-#: plpy_main.c:358
+#: plpy_main.c:354
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "PL/Python匿名代码块"
@@ -259,27 +259,27 @@ msgstr "无法解析plpy.elog中的参数"
 msgid "could not parse error message in plpy.elog"
 msgstr "无法解析在plpy.elog中的错误消息"
 
-#: plpy_procedure.c:199
+#: plpy_procedure.c:200
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "触发器函数只能以触发器的形式调用"
 
-#: plpy_procedure.c:204 plpy_typeio.c:406
+#: plpy_procedure.c:205 plpy_typeio.c:409
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python函数不能返回类型%s"
 
-#: plpy_procedure.c:286
+#: plpy_procedure.c:287
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python函数不能接受类型%s"
 
-#: plpy_procedure.c:382
+#: plpy_procedure.c:383
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "无法编译PL/Python函数\"%s\""
 
-#: plpy_procedure.c:385
+#: plpy_procedure.c:386
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "无法编译PL/Python中的匿名代码块"
@@ -289,46 +289,41 @@ msgstr "无法编译PL/Python中的匿名代码块"
 msgid "command did not produce a result set"
 msgstr "命令没有产生结果集"
 
-#: plpy_spi.c:56
+#: plpy_spi.c:57
 #, c-format
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "plpy.prepare的第二个参数必须是一个序列"
 
-#: plpy_spi.c:105
+#: plpy_spi.c:106
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: 在顺序位置%d的类型名称不是string"
 
-#: plpy_spi.c:137
+#: plpy_spi.c:138
 #, c-format
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare不支持使用组合类型"
 
-#: plpy_spi.c:187
+#: plpy_spi.c:188
 #, c-format
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute期望一个查询或一个计划"
 
-#: plpy_spi.c:206
+#: plpy_spi.c:207
 #, c-format
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute将一个序列作为它的第二个参数"
 
-#: plpy_spi.c:330
+#: plpy_spi.c:331
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "执行SPI_execute_plan失败: %s"
 
-#: plpy_spi.c:372
+#: plpy_spi.c:373
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute执行失败: %s"
 
-#: plpy_spi.c:439
-#, c-format
-msgid "unrecognized error in PLy_spi_execute_fetch_result"
-msgstr "在PLy_spi_execute_fetch_result中出现无法识别的错误"
-
 #: plpy_subxactobject.c:122
 #, c-format
 msgid "this subtransaction has already been entered"
@@ -349,77 +344,94 @@ msgstr "该子事务仍没有进入"
 msgid "there is no subtransaction to exit from"
 msgstr "没有子事务可以退出"
 
-#: plpy_typeio.c:291
+#: plpy_typeio.c:294
 #, c-format
 msgid "could not create new dictionary"
 msgstr "无法创建新的字典"
 
-#: plpy_typeio.c:408
+#: plpy_typeio.c:411
 #, c-format
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python不支持对行类型数组的转换。"
 
-#: plpy_typeio.c:584
+#: plpy_typeio.c:540
+#, c-format
+#| msgid "could not import \"plpy\" module"
+msgid "could not import a module for Decimal constructor"
+msgstr "无法为十进制构造函数导入模块"
+
+#: plpy_typeio.c:544
+#, c-format
+msgid "no Decimal attribute in module"
+msgstr "模块中没有小数位属性"
+
+#: plpy_typeio.c:550
+#, c-format
+#| msgid "conversion from wchar_t to server encoding failed: %m"
+msgid "conversion from numeric to Decimal failed"
+msgstr "由numeric数值到Decimal小数转换失败"
+
+#: plpy_typeio.c:619
 #, c-format
 msgid "cannot convert multidimensional array to Python list"
 msgstr "无法将多维数组转换为Python列表"
 
-#: plpy_typeio.c:585
+#: plpy_typeio.c:620
 #, c-format
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python只支持使用一维数组"
 
-#: plpy_typeio.c:591
+#: plpy_typeio.c:626
 #, c-format
 msgid "could not create new Python list"
 msgstr "无法创建新的Python列表"
 
-#: plpy_typeio.c:650
+#: plpy_typeio.c:685
 #, c-format
 msgid "could not create bytes representation of Python object"
 msgstr "无法创建Python对象的字节表达式"
 
-#: plpy_typeio.c:742
+#: plpy_typeio.c:777
 #, c-format
 msgid "could not create string representation of Python object"
 msgstr "无法创建Python对象的字符串表达式"
 
-#: plpy_typeio.c:753
+#: plpy_typeio.c:788
 #, c-format
 msgid ""
 "could not convert Python object into cstring: Python string representation "
 "appears to contain null bytes"
 msgstr "无法将Python对象转换为cstring: Python字符串表达式可能包含空字节"
 
-#: plpy_typeio.c:787
+#: plpy_typeio.c:823
 #, c-format
 msgid ""
 "return value of function with array return type is not a Python sequence"
 msgstr "带有数组返回类型的函数返回值不是一个Python序列"
 
-#: plpy_typeio.c:886
+#: plpy_typeio.c:930
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "在映射中没有找到键\"%s\""
 
-#: plpy_typeio.c:887
+#: plpy_typeio.c:931
 #, c-format
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
 msgstr "为了在一列中返回空值, 需要在列的后面对带有已命名键的映射添加值None"
 
-#: plpy_typeio.c:935
+#: plpy_typeio.c:979
 #, c-format
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "所返回序列的长度与在记录中列的数量不匹配"
 
-#: plpy_typeio.c:1043
+#: plpy_typeio.c:1087
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "在Python对象中不存在属性\"%s\""
 
-#: plpy_typeio.c:1044
+#: plpy_typeio.c:1088
 #, c-format
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
@@ -427,58 +439,61 @@ msgid ""
 msgstr ""
 "为了在一列中返回空值, 需要让返回的对象在带有值None的列后面的带有已命名属性"
 
-#: plpy_util.c:70
+#: plpy_util.c:72
 #, c-format
 msgid "could not convert Python Unicode object to bytes"
 msgstr "无法将Python中以Unicode编码的对象转换为PostgreSQL服务器字节码"
 
-#: plpy_util.c:75
+#: plpy_util.c:78
 #, c-format
 msgid "could not extract bytes from encoded string"
 msgstr "无法从已编码字符串里提取相应字节码值"
 
-#~ msgid "PL/Python function \"%s\" failed"
-#~ msgstr "PL/Python函数 \"%s\" 执行失败"
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "执行PyCObject_AsVoidPtr()失败"
 
-#~ msgid ""
-#~ "could not create string representation of Python object in PL/Python "
-#~ "function \"%s\" while creating return value"
-#~ msgstr ""
-#~ "在创建返回值时, 无法计算在PL/Python函数\"%s\"中Python对象的字符串表达式"
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "执行PyCObject_FromVoidPtr()失败"
 
-#~ msgid ""
-#~ "could not compute string representation of Python object in PL/Python "
-#~ "function \"%s\" while modifying trigger row"
-#~ msgstr ""
-#~ "在修改触发器记录的同时无法计算在PL/Python函数\"%s\"中Python对象的字符串表"
-#~ "达式"
+#~ msgid "transaction aborted"
+#~ msgstr "事务终止"
 
-#~ msgid "out of memory"
-#~ msgstr "内存用尽"
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr " plpy.prepare的无效参数"
 
-#~ msgid "PL/Python: %s"
-#~ msgstr "PL/Python: %s"
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "在PLy_spi_prepare中无法识别的错误"
 
-#~ msgid "could not create procedure cache"
-#~ msgstr "无法创建存储过程缓存"
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "在PLy_spi_execute_plan中出现无法识别的错误"
 
 #~ msgid "unrecognized error in PLy_spi_execute_query"
 #~ msgstr "在PLy_spi_execute_query中出现无法识别的错误"
 
-#~ msgid "unrecognized error in PLy_spi_execute_plan"
-#~ msgstr "在PLy_spi_execute_plan中出现无法识别的错误"
+#~ msgid "could not create procedure cache"
+#~ msgstr "无法创建存储过程缓存"
 
-#~ msgid "unrecognized error in PLy_spi_prepare"
-#~ msgstr "在PLy_spi_prepare中无法识别的错误"
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
 
-#~ msgid "invalid arguments for plpy.prepare"
-#~ msgstr " plpy.prepare的无效参数"
+#~ msgid "out of memory"
+#~ msgstr "内存用尽"
 
-#~ msgid "transaction aborted"
-#~ msgstr "事务终止"
+#~ msgid ""
+#~ "could not compute string representation of Python object in PL/Python "
+#~ "function \"%s\" while modifying trigger row"
+#~ msgstr ""
+#~ "在修改触发器记录的同时无法计算在PL/Python函数\"%s\"中Python对象的字符串表"
+#~ "达式"
 
-#~ msgid "PyCObject_FromVoidPtr() failed"
-#~ msgstr "执行PyCObject_FromVoidPtr()失败"
+#~ msgid ""
+#~ "could not create string representation of Python object in PL/Python "
+#~ "function \"%s\" while creating return value"
+#~ msgstr ""
+#~ "在创建返回值时, 无法计算在PL/Python函数\"%s\"中Python对象的字符串表达式"
 
-#~ msgid "PyCObject_AsVoidPtr() failed"
-#~ msgstr "执行PyCObject_AsVoidPtr()失败"
+#~ msgid "PL/Python function \"%s\" failed"
+#~ msgstr "PL/Python函数 \"%s\" 执行失败"
+
+#~ msgid "unrecognized error in PLy_spi_execute_fetch_result"
+#~ msgstr "在PLy_spi_execute_fetch_result中出现无法识别的错误"