Translation updates for 9.1beta2

10 files changed, 3900 insertions, 918 deletions

diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
index 8643e981e63..bbf2a447917 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 ro
+AVAIL_LANGUAGES	:= de es fr it ja ko 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:= _ errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext yyerror plpgsql_yyerror
 
diff --git a/src/pl/plpgsql/src/po/de.po b/src/pl/plpgsql/src/po/de.po
index 669eea055fc..b2716354b7d 100644
--- a/src/pl/plpgsql/src/po/de.po
+++ b/src/pl/plpgsql/src/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for plpgsql
-# Copyright (C) 2009 - 2010 PostgreSQL Global Development Group
+# Copyright (C) 2009 - 2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Peter Eisentraut <peter_e@gmx.net>, 2009 - 2010.
+# Peter Eisentraut <peter_e@gmx.net>, 2009 - 2011.
 #
 # pgtranslation Id: plpgsql.po,v 1.5 2009/03/24 07:40:13 petere Exp $
 #
@@ -9,43 +9,44 @@
 #
 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-06-29 01:15+0000\n"
-"PO-Revision-Date: 2010-06-28 23:15-0400\n"
+"POT-Creation-Date: 2011-05-25 20:38+0000\n"
+"PO-Revision-Date: 2011-05-21 13:31+0300\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: 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-Funktionen können Typ %s nicht annehmen"
 
-#: pl_comp.c:501
+#: pl_comp.c:506
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "konnte den tatsächlichen Rückgabetyp der polymorphischen Funktion »%s« nicht "
 "ermitteln"
 
-#: pl_comp.c:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr "Triggerfunktionen können nur als Trigger aufgerufen werden"
 
-#: 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-Funktionen können keinen Rückgabetyp %s haben"
 
-#: pl_comp.c:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "Triggerfunktionen können keine deklarierten Argumente haben"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
@@ -53,53 +54,64 @@ msgstr ""
 "Auf die Argumente des Triggers kann stattdessen über TG_NARGS und TG_ARGV "
 "zugegriffen werden."
 
-#: pl_comp.c:880
+#: pl_comp.c:912
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "Kompilierung der PL/pgSQL-Funktion »%s« nahe Zeile %d"
 
-#: pl_comp.c:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "Parametername »%s« mehrmals angegeben"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "Spaltenverweis »%s« ist nicht eindeutig"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr ""
 "Er könnte sich entweder auf eine PL/pgSQL-Variable oder eine Tabellenspalte "
 "beziehen."
 
-#: 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 "Record »%s« hat kein Feld »%s«"
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "Relation »%s« existiert nicht"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "Relation »%s.%s« existiert nicht"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "Variable »%s« hat Pseudotyp %s"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "Relation »%s« ist keine Tabelle"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "Typ »%s« ist nur eine Hülle"
 
-#: pl_comp.c:2087 pl_comp.c:2140
+#: pl_comp.c:2190 pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "unbekannte Ausnahmebedingung »%s«"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
@@ -107,368 +119,389 @@ msgstr ""
 "konnte den tatsächlichen Argumenttyp der polymorphischen Funktion »%s« nicht "
 "ermitteln"
 
-#: pl_exec.c:236 pl_exec.c:511
+#: pl_exec.c:239 pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "bei der Initialisierung des Ausführungszustandes"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr "beim Abspeichern der Aufrufargumente in lokale Variablen"
 
-#: pl_exec.c:298 pl_exec.c:666
+#: pl_exec.c:301 pl_exec.c:667
 msgid "during function entry"
 msgstr "beim Eintritts in die Funktion"
 
-#: 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 kann nicht außerhalb einer Schleife verwendet werden"
 
-#: pl_exec.c:333 pl_exec.c:701
-msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr ""
-"RAISE ohne Parameter kann nicht außerhalb einer Ausnahmebehandlung verwendet "
-"werden"
-
-#: pl_exec.c:337
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "Kontrollfluss erreichte das Ende der Funktion ohne RETURN"
 
-#: pl_exec.c:344
+#: pl_exec.c:343
 msgid "while casting return value to function's return type"
 msgstr "bei der Umwandlung des Rückgabewerts in den Rückgabetyp der Funktion"
 
-#: 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 ""
 "Funktion mit Mengenergebnis in einem Zusammenhang aufgerufen, der keine "
 "Mengenergebnisse verarbeiten kann"
 
-#: pl_exec.c:395
+#: pl_exec.c:394
 msgid "returned record type does not match expected record type"
 msgstr ""
 "zurückgegebener Record-Typ stimmt nicht mit erwartetem Record-Typ überein"
 
-#: pl_exec.c:453 pl_exec.c:709
+#: pl_exec.c:452 pl_exec.c:706
 msgid "during function exit"
 msgstr "beim Verlassen der Funktion"
 
-#: pl_exec.c:705
+#: pl_exec.c:702
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "Kontrollfluss erreichte das Ende der Triggerprozedur ohne RETURN"
 
-#: pl_exec.c:714
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "Triggerprozedur kann keine Ergebnismenge zurückgeben"
 
-#: pl_exec.c:736
+#: pl_exec.c:733
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr ""
 "zurückgegebene Zeilenstruktur stimmt nicht mit der Struktur der Tabelle, die "
 "den Trigger ausgelöst hat, überein"
 
-#: pl_exec.c:799
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "PL/pgSQL-Funktion »%s« Zeile %d %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:807
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "PL/pgSQL-Funktion »%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-Funktion »%s« Zeile %d bei %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "PL/pgSQL-Funktion »%s«"
 
-#: pl_exec.c:932
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "bei der Initialisierung der lokalen Variablen des Anweisungsblocks"
 
-#: pl_exec.c:974
+#: pl_exec.c:971
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr ""
 "Variable »%s« ist als NOT NULL deklariert und kann daher nicht den "
 "Ausgangswert NULL haben"
 
-#: pl_exec.c:1023
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "beim Eintreten in den Anweisungsblock"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "beim Verlassen des Anweisungsblocks"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "beim Aufräumen der Ausnahme"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "Fall nicht gefunden"
 
-#: pl_exec.c:1554
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "Der CASE-Anweisung fehlt ein ELSE-Teil."
 
-#: pl_exec.c:1710
+#: pl_exec.c:1725
 msgid "lower bound of FOR loop cannot be null"
 msgstr "Untergrenze einer FOR-Schleife darf nicht NULL sein"
 
-#: pl_exec.c:1725
+#: pl_exec.c:1740
 msgid "upper bound of FOR loop cannot be null"
 msgstr "Obergrenze einer FOR-Schleife darf nicht NULL sein"
 
-#: pl_exec.c:1742
+#: pl_exec.c:1757
 msgid "BY value of FOR loop cannot be null"
 msgstr "BY-Wert einer FOR-Schleife darf nicht NULL sein"
 
-#: pl_exec.c:1748
+#: pl_exec.c:1763
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "BY-Wert einer FOR-Schleife muss größer als null sein"
 
-#: 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 "Cursor »%s« ist bereits in Verwendung"
 
-#: pl_exec.c:1943 pl_exec.c:3253
+#: pl_exec.c:1956 pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "einem Cursor ohne Argumente wurden Argumente übergeben"
 
-#: pl_exec.c:1962 pl_exec.c:3272
+#: pl_exec.c:1975 pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "Cursor benötigt Argumente"
 
-#: pl_exec.c:2014 pl_exec.c:4423
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "FOREACH-Ausdruck darf nicht NULL sein"
+
+#: pl_exec.c:2069
 #, c-format
-msgid "cursor \"%s\" closed unexpectedly"
-msgstr "Cursor »%s« unerwartet geschlossen"
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "FOREACH-Ausdruck muss ein Array ergeben, nicht Typ %s"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "Slice-Dimension (%d) ist außerhalb des gültigen Bereichs 0..%d"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "FOREACH ... SLICE Schleifenvariable muss einen Arraytyp haben"
 
-#: pl_exec.c:2193 gram.y:2729
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "FOREACH-Schleifenvariable darf keinen Array-Typ haben"
+
+#: pl_exec.c:2375 gram.y:2844
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr ""
 "RETURN NEXT kann nur in einer Funktion mit SETOF-Rückgabetyp verwendet werden"
 
-#: 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 "falscher Ergebnistyp angegeben in 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 "Record »%s« hat noch keinen Wert"
 
-#: 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 "Die Tupelstruktur eines Records ohne Wert ist unbestimmt."
 
-#: 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 "falscher Record-Typ angegeben in RETURN NEXT"
 
-#: pl_exec.c:2306
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT muss einen Parameter haben"
 
-#: 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 ""
 "RETURN QUERY kann nur in einer Funktion mit SETOF-Rückgabetyp verwendet "
 "werden"
 
-#: pl_exec.c:2357
+#: pl_exec.c:2539
 msgid "structure of query does not match function result type"
 msgstr "Struktur der Anfrage stimmt nicht mit Rückgabetyp der Funktion überein"
 
-#: pl_exec.c:2489
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr ""
+"RAISE ohne Parameter kann nicht außerhalb einer Ausnahmebehandlung verwendet "
+"werden"
+
+#: pl_exec.c:2678
 msgid "too few parameters specified for RAISE"
 msgstr "zu wenige Parameter für RAISE angegeben"
 
-#: pl_exec.c:2515
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "zu viele Parameter für RAISE angegeben"
 
-#: pl_exec.c:2535
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "Option einer RAISE-Anweisung darf nicht NULL sein"
 
-#: 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 "RAISE-Option bereits angegeben: %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 "COPY vom/zum Client funktioniert in PL/pgSQL nicht"
 
-#: 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 "Transaktionen können in PL/pgSQL nicht begonnen/beendet werden"
 
-#: 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 ""
 "Verwenden Sie stattdessen einen BEGIN-Block mit einer EXCEPTION-Klausel."
 
-#: 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 mit einem Befehl verwendet, der keine Daten zurückgeben kann"
 
-#: pl_exec.c:2925 pl_exec.c:3105
+#: pl_exec.c:3129 pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "Anfrage gab keine Zeilen zurück"
 
-#: pl_exec.c:2934 pl_exec.c:3114
+#: pl_exec.c:3138 pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "Anfrage gab mehr als eine Zeile zurück"
 
-#: pl_exec.c:2948
+#: pl_exec.c:3152
 msgid "query has no destination for result data"
 msgstr "Anfrage hat keinen Bestimmungsort für die Ergebnisdaten"
 
-#: pl_exec.c:2949
+#: pl_exec.c:3153
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr ""
 "Wenn Sie die Ergebnisse eines SELECT verwerfen wollen, verwenden Sie "
 "stattdessen PERFORM."
 
-#: 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 "Anfrageargument von EXECUTE ist NULL"
 
-#: pl_exec.c:3047
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE von SELECT ... INTO ist nicht implementiert"
 
-#: pl_exec.c:3048
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "Sie könnten stattdessen EXECUTE ... INTO verwenden."
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr ""
+"Sie könnten stattdessen EXECUTE ... INTO oder EXECUTE CREATE TABLE ... AS "
+"verwenden."
 
-#: 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 "Cursor-Variable »%s« ist 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 "Cursor »%s« existiert nicht"
 
-#: pl_exec.c:3357
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "relative oder absolute Cursorposition ist NULL"
 
-#: pl_exec.c:3494
+#: pl_exec.c:3702
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr ""
 "NULL-Wert kann der Variable »%s« nicht zugewiesen werden, weil sie als NOT "
 "NULL deklariert ist"
 
-#: pl_exec.c:3552
+#: pl_exec.c:3760
 msgid "cannot assign non-composite value to a row variable"
 msgstr ""
 "nicht zusammengesetzter Wert kann nicht einer Zeilenvariable zugewiesen "
 "werden"
 
-#: pl_exec.c:3594
+#: pl_exec.c:3802
 msgid "cannot assign non-composite value to a record variable"
 msgstr ""
 "nicht zusammengesetzter Wert kann nicht einer Record-Variable zugewiesen "
 "werden"
 
-#: 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 "Record »%s« hat kein Feld »%s«"
-
-#: pl_exec.c:3752
+#: pl_exec.c:3973
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "Anzahl der Arraydimensionen (%d) überschreitet erlaubtes Maximum (%d)"
 
-#: pl_exec.c:3766
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "Objekt mit Arrayindex ist kein Array"
 
-#: pl_exec.c:3789
+#: pl_exec.c:4015
 msgid "array subscript in assignment must not be null"
 msgstr "Arrayindex in Zuweisung darf nicht NULL sein"
 
-#: pl_exec.c:4170
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "Anfrage »%s« hat keine Daten zurückgegeben"
 
-#: 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] "Anfrage »%s« hat %d Spalte zurückgegeben"
 msgstr[1] "Anfrage »%s« hat %d Spalten zurückgegeben"
 
-#: pl_exec.c:4204
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "Anfrage »%s« hat mehr als eine Zeile zurückgegeben"
 
-#: pl_exec.c:4262
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "Anfrage »%s« ist kein SELECT"
 
-#: gram.y:423
+#: gram.y:430
 msgid "block label must be placed before DECLARE, not after"
 msgstr "Blocklabel muss vor DECLARE stehen, nicht danach"
 
-#: gram.y:441
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "Sortierfolgen werden von Typ %s nicht unterstützt"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
 msgstr "Zeilen- oder Record-Variable kann nicht CONSTANT sein"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "Zeilen- oder Record-Variable kann nicht NOT NULL sein"
 
-#: gram.y:462
+#: gram.y:486
 msgid "default value for row or record variable is not supported"
 msgstr ""
 "Vorgabewerte werden für Zeilen- oder Record-Variablen nicht unterstützt"
 
-#: gram.y:606 gram.y:632
+#: gram.y:631 gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "Variable »%s« existiert nicht"
 
-#: gram.y:650 gram.y:663
+#: gram.y:675 gram.y:688
 msgid "duplicate declaration"
 msgstr "doppelte Deklaration"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "unbekanntes Element in 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« ist keine skalare Variable"
 
-#: 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"
@@ -476,210 +509,220 @@ msgstr ""
 "Schleifenvariable einer Schleife über Zeilen muss eine Record-Variable oder "
 "Zeilenvariable oder eine Liste von skalaren Variablen sein"
 
-#: gram.y:1148
+#: gram.y:1188
 msgid "cursor FOR loop must have only one target variable"
 msgstr "Cursor-FOR-Schleife darf nur eine Zielvariable haben"
 
-#: gram.y:1155
+#: gram.y:1195
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "Cursor-FOR-Schleife muss eine gebundene Cursor-Variable verwenden"
 
-#: gram.y:1238
+#: gram.y:1278
 msgid "integer FOR loop must have only one target variable"
 msgstr "ganzzahlige FOR-Schleife darf nur eine Zielvariable haben"
 
-#: gram.y:1273
+#: gram.y:1314
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "REVERSE kann nicht in einer Anfrage-FOR-Schleife verwendet werden"
 
-#: 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 ""
+"Schleifenvariable von FOREACH muss eine bekannte Variable oder Liste von "
+"Variablen sein"
+
+#: 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 "unerwartetes Ende der Funktionsdefinition"
 
-#: 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 "Syntaxfehler"
 
-#: 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 "ungültiger SQLSTATE-Code"
 
-#: gram.y:1706
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "Syntaxfehler, »FOR« erwartet"
 
-#: gram.y:1768
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "FETCH-Anweisung kann nicht mehrere Zeilen zurückgeben"
 
-#: gram.y:1824
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "Cursor-Variable muss eine einfache Variable sein"
 
-#: gram.y:1830
+#: gram.y:1938
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "Variable »%s« muss Typ cursor oder refcursor haben"
 
-#: gram.y:1994
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "Label existiert nicht"
 
-#: gram.y:2099 gram.y:2110
+#: gram.y:2213 gram.y:2224
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "»%s« ist keine bekannte Variable"
 
-#: gram.y:2212 gram.y:2222 gram.y:2350
+#: gram.y:2326 gram.y:2336 gram.y:2464
 msgid "mismatched parentheses"
 msgstr "Klammern passen nicht"
 
-#: gram.y:2226
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "»%s« fehlt am Ende des SQL-Ausdrucks"
 
-#: gram.y:2232
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "»%s« fehlt am Ende der SQL-Anweisung"
 
-#: gram.y:2249
+#: gram.y:2363
 msgid "missing expression"
 msgstr "Ausdruck fehlt"
 
-#: gram.y:2251
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "SQL-Anweisung fehlt"
 
-#: gram.y:2352
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "unvollständige Datentypdeklaration"
 
-#: gram.y:2374
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "fehlende Datentypdeklaration"
 
-#: gram.y:2430
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO mehr als einmal angegeben"
 
-#: gram.y:2598
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "FROM oder IN erwartet"
 
-#: gram.y:2658
+#: gram.y:2773
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr ""
 "RETURN kann keinen Parameter haben in einer Funktion mit Mengenergebnis"
 
-#: gram.y:2659
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Verwenden Sie RETURN NEXT oder RETURN QUERY."
 
-#: gram.y:2667
+#: gram.y:2782
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr ""
 "RETURN kann keinen Parameter haben in einer Funktion mit OUT-Parametern"
 
-#: gram.y:2676
+#: gram.y:2791
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr ""
 "RETURN kann keinen Parameter haben in einer Funktion, die »void« zurückgibt"
 
-#: gram.y: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 muss eine Record- oder Zeilenvariable angegeben in einer Funktion, "
 "die eine Zeile zurückgibt"
 
-#: gram.y:2743
+#: gram.y:2858
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "RETURN NEXT kann keinen Parameter haben in einer Funktion mit OUT-Parametern"
 
-#: gram.y: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 muss eine Record- oder Zeilenvariable angegeben in einer "
 "Funktion, die eine Zeile zurückgibt"
 
-#: gram.y:2844
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "»%s« wurde als CONSTANT deklariert"
 
-#: 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 ""
 "Record- oder Zeilenvariable kann nicht Teil einer INTO-Liste mit mehreren "
 "Elementen sein"
 
-#: gram.y:2963
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "zu viele INTO-Variablen angegeben"
 
-#: gram.y:3170
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "Endlabel »%s« für ungelabelten Block angegeben"
 
-#: gram.y:3177
+#: gram.y:3293
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "Endlabel »%s« unterscheidet sich vom Label des Blocks »%s«"
 
-#: gram.y:3204
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "Cursor »%s« hat keine Argumente"
 
-#: gram.y:3218
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "Cursor »%s« hat Argumente"
 
-#: gram.y:3266
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "unbekannte Option für RAISE-Anweisung"
 
-#: gram.y:3270
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "Syntaxfehler, »=« erwartet"
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "Anweisungsblock"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "Zuweisung"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "FOR mit ganzzahliger Schleifenvariable"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "FOR über SELECT-Zeilen"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "FOR über Cursor"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH über Array"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "SQL-Anweisung"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "EXECUTE-Anweisung"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "FOR-über-EXECUTE-Anweisung"
 
@@ -692,13 +735,13 @@ msgstr ""
 "und Tabellenspaltennamen."
 
 #. 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 am Ende der Eingabe"
 
 #. 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 bei »%s«"
diff --git a/src/pl/plpgsql/src/po/es.po b/src/pl/plpgsql/src/po/es.po
index ff13c166a62..e25341b9812 100644
--- a/src/pl/plpgsql/src/po/es.po
+++ b/src/pl/plpgsql/src/po/es.po
@@ -8,21 +8,20 @@
 # Emanuel Calvo Franco <postgres.arg@gmail.com> 2008
 # Jaime Casanova <jcasanov@systemguards.com.ec> 2010
 #
-# pgtranslation Id: plpgsql.po,v 1.10 2010/04/26 20:08:34 alvherre Exp $
+# pgtranslation Id: plpgsql.po,v 1.11 2010/08/31 18:16:00 alvherre Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: plpgsql (PostgreSQL 9.0)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-03-20 01:15+0000\n"
-"PO-Revision-Date: 2010-04-23 18:33-0500\n"
+"POT-Creation-Date: 2010-08-31 07:15+0000\n"
+"PO-Revision-Date: 2010-08-31 14:15-0400\n"
 "Last-Translator: \n"
 "Language-Team:  PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: pl_comp.c:422 pl_handler.c:256
 #, c-format
@@ -38,7 +37,8 @@ msgstr ""
 
 #: pl_comp.c:531
 msgid "trigger functions can only be called as triggers"
-msgstr "las funciones de disparador sólo pueden ser invocadas como disparadores"
+msgstr ""
+"las funciones de disparador sólo pueden ser invocadas como disparadores"
 
 #: pl_comp.c:535 pl_handler.c:241
 #, c-format
@@ -53,7 +53,8 @@ msgstr "las funciones de disparador no pueden tener argumentos declarados"
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
-msgstr "Los argumentos del disparador pueden accederse usando TG_NARGS y TG_ARGV."
+msgstr ""
+"Los argumentos del disparador pueden accederse usando TG_NARGS y TG_ARGV."
 
 #: pl_comp.c:880
 #, c-format
@@ -67,7 +68,9 @@ msgstr "la referencia a la columna «%s» es ambigua"
 
 #: pl_comp.c:980
 msgid "It could refer to either a PL/pgSQL variable or a table column."
-msgstr "Podría referirse tanto a una variable PL/pgSQL como a una columna de una tabla."
+msgstr ""
+"Podría referirse tanto a una variable PL/pgSQL como a una columna de una "
+"tabla."
 
 #: pl_comp.c:1690
 #, c-format
@@ -101,310 +104,326 @@ msgstr "no se reconoce la condición de excepción «%s»"
 
 #: pl_comp.c:2295
 #, c-format
-msgid "could not determine actual argument type for polymorphic function \"%s\""
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
 msgstr ""
 "no se pudo determinar el verdadero tipo de argumento para la función "
 "polimórfica «%s»"
 
-#: pl_exec.c:236 pl_exec.c:511
+#: pl_exec.c:236 pl_exec.c:507
 msgid "during initialization of execution state"
 msgstr "durante la inicialización del estado de ejecución"
 
 #: pl_exec.c:243
 msgid "while storing call arguments into local variables"
-msgstr "mientras se almacenaban los argumentos de invocación en variables locales"
+msgstr ""
+"mientras se almacenaban los argumentos de invocación en variables locales"
 
-#: pl_exec.c:298 pl_exec.c:666
+#: pl_exec.c:298 pl_exec.c:662
 msgid "during function entry"
 msgstr "durante el ingreso a la función"
 
-#: pl_exec.c:329 pl_exec.c:697
+#: pl_exec.c:329 pl_exec.c:693
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE no puede usarse fuera de un bucle"
 
-#: pl_exec.c:333 pl_exec.c:701
-msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr "RAISE sin parámetros no puede ser usado fuera de un manejador de excepción"
-
-#: pl_exec.c:337
+#: pl_exec.c:333
 msgid "control reached end of function without RETURN"
 msgstr "la ejecución alcanzó el fin de la función sin encontrar RETURN"
 
-#: pl_exec.c:344
+#: pl_exec.c:340
 msgid "while casting return value to function's return type"
 msgstr ""
-"mientras se hacía la conversión del valor de retorno al tipo de retorno de la "
-"función"
+"mientras se hacía la conversión del valor de retorno al tipo de retorno de "
+"la función"
 
-#: pl_exec.c:357 pl_exec.c:2398
+#: pl_exec.c:353 pl_exec.c:2403
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "se llamó una función que retorna un conjunto en un contexto que no puede "
 "aceptarlo"
 
-#: pl_exec.c:395
+#: pl_exec.c:391
 msgid "returned record type does not match expected record type"
-msgstr "el tipo de registro retornado no coincide con el tipo de registro esperado"
+msgstr ""
+"el tipo de registro retornado no coincide con el tipo de registro esperado"
 
-#: pl_exec.c:453 pl_exec.c:709
+#: pl_exec.c:449 pl_exec.c:701
 msgid "during function exit"
 msgstr "durante la salida de la función"
 
-#: pl_exec.c:705
+#: pl_exec.c:697
 msgid "control reached end of trigger procedure without RETURN"
-msgstr "la ejecución alcanzó el fin del procedimiento disparador sin encontrar RETURN"
+msgstr ""
+"la ejecución alcanzó el fin del procedimiento disparador sin encontrar RETURN"
 
-#: pl_exec.c:714
+#: pl_exec.c:706
 msgid "trigger procedure cannot return a set"
 msgstr "los procedimientos disparadores no pueden retornar conjuntos"
 
-#: pl_exec.c:736
-msgid "returned row structure does not match the structure of the triggering table"
+#: pl_exec.c:728
+msgid ""
+"returned row structure does not match the structure of the triggering table"
 msgstr ""
 "la estructura de fila retornada no coincide con la estructura de la tabla "
 "que generó el evento de disparador"
 
-#: pl_exec.c:799
+#: pl_exec.c:791
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "función PL/pgSQL «%s» en la línea %d %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:802
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "función PL/pgSQL «%s» %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:818
+#: pl_exec.c:810
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "función PL/pgSQL «%s» en la línea %d en %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:816
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "función PL/pgSQL «%s»"
 
-#: pl_exec.c:932
+#: pl_exec.c:924
 msgid "during statement block local variable initialization"
 msgstr "durante inicialización de variables locales en el bloque de sentencias"
 
-#: pl_exec.c:974
+#: pl_exec.c:966
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
-msgstr "la variable «%s» declarada NOT NULL no puede tener un valor por omisión NULL"
+msgstr ""
+"la variable «%s» declarada NOT NULL no puede tener un valor por omisión NULL"
 
-#: pl_exec.c:1023
+#: pl_exec.c:1016
 msgid "during statement block entry"
 msgstr "durante la entrada al bloque de sentencias"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1037
 msgid "during statement block exit"
 msgstr "durante la salida del bloque de sentencias"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1080
 msgid "during exception cleanup"
 msgstr "durante la finalización por excepción"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1559
 msgid "case not found"
 msgstr "caso no encontrado"
 
-#: pl_exec.c:1554
+#: pl_exec.c:1560
 msgid "CASE statement is missing ELSE part."
 msgstr "A la sentencia CASE le falta la parte ELSE."
 
-#: pl_exec.c:1710
+#: pl_exec.c:1714
 msgid "lower bound of FOR loop cannot be null"
 msgstr "el límite inferior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1725
+#: pl_exec.c:1729
 msgid "upper bound of FOR loop cannot be null"
 msgstr "el límite superior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1742
+#: pl_exec.c:1746
 msgid "BY value of FOR loop cannot be null"
 msgstr "el valor BY de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1748
+#: pl_exec.c:1752
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "el valor BY de un ciclo FOR debe ser mayor que cero"
 
-#: pl_exec.c:1919 pl_exec.c:3179
+#: pl_exec.c:1923 pl_exec.c:3196
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "el cursor «%s» ya está en uso"
 
-#: pl_exec.c:1942 pl_exec.c:3241
+#: pl_exec.c:1946 pl_exec.c:3258
 msgid "arguments given for cursor without arguments"
 msgstr "se dieron argumentos a un cursor sin argumentos"
 
-#: pl_exec.c:1961 pl_exec.c:3260
+#: pl_exec.c:1965 pl_exec.c:3277
 msgid "arguments required for cursor"
 msgstr "se requieren argumentos para el cursor"
 
-#: pl_exec.c:2182 gram.y:2729
+#: pl_exec.c:2187 gram.y:2744
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "no se puede usar RETURN NEXT en una función que no es SETOF"
 
-#: pl_exec.c:2206 pl_exec.c:2272
+#: pl_exec.c:2211 pl_exec.c:2277
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "se pasó un tipo incorrecto de resultado a RETURN NEXT"
 
-#: pl_exec.c:2228 pl_exec.c:3629 pl_exec.c:3908 pl_exec.c:3942 pl_exec.c:4004
-#: pl_exec.c:4023 pl_exec.c:4060
+#: pl_exec.c:2233 pl_exec.c:3650 pl_exec.c:3956 pl_exec.c:3990 pl_exec.c:4052
+#: pl_exec.c:4071 pl_exec.c:4108
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "el registro «%s» no ha sido asignado aún"
 
-#: pl_exec.c:2230 pl_exec.c:3631 pl_exec.c:3910 pl_exec.c:3944 pl_exec.c:4006
-#: pl_exec.c:4025 pl_exec.c:4062
+#: pl_exec.c:2235 pl_exec.c:3652 pl_exec.c:3958 pl_exec.c:3992 pl_exec.c:4054
+#: pl_exec.c:4073 pl_exec.c:4110
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
-msgstr "La estructura de fila de un registro aún no asignado no está determinado."
+msgstr ""
+"La estructura de fila de un registro aún no asignado no está determinado."
 
-#: pl_exec.c:2234 pl_exec.c:2253
+#: pl_exec.c:2239 pl_exec.c:2258
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "se pasó un tipo de registro incorrecto a RETURN NEXT"
 
-#: pl_exec.c:2295
+#: pl_exec.c:2300
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT debe tener un parámetro"
 
-#: pl_exec.c:2326 gram.y:2788
+#: pl_exec.c:2331 gram.y:2803
 msgid "cannot use RETURN QUERY in a non-SETOF function"
-msgstr "no se puede usar RETURN QUERY en una función que no ha sido declarada SETOF"
+msgstr ""
+"no se puede usar RETURN QUERY en una función que no ha sido declarada SETOF"
 
-#: pl_exec.c:2346
+#: pl_exec.c:2351
 msgid "structure of query does not match function result type"
-msgstr "la estructura de la consulta no coincide con el tipo del resultado de la función"
+msgstr ""
+"la estructura de la consulta no coincide con el tipo del resultado de la "
+"función"
+
+#: pl_exec.c:2449
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr ""
+"RAISE sin parámetros no puede ser usado fuera de un manejador de excepción"
 
-#: pl_exec.c:2478
+#: pl_exec.c:2490
 msgid "too few parameters specified for RAISE"
 msgstr "se especificaron muy pocos parámetros a RAISE"
 
-#: pl_exec.c:2504
+#: pl_exec.c:2516
 msgid "too many parameters specified for RAISE"
 msgstr "se especificaron demasiados parámetros a RAISE"
 
-#: pl_exec.c:2524
+#: pl_exec.c:2536
 msgid "RAISE statement option cannot be null"
 msgstr "la opción de sentencia en RAISE no puede ser null"
 
-#: pl_exec.c:2534 pl_exec.c:2543 pl_exec.c:2551 pl_exec.c:2559
+#: pl_exec.c:2546 pl_exec.c:2555 pl_exec.c:2563 pl_exec.c:2571
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "la opción de RAISE ya se especificó: %s"
 
-#: pl_exec.c:2594 pl_exec.c:2595
+#: pl_exec.c:2606 pl_exec.c:2607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2741 pl_exec.c:3044
+#: pl_exec.c:2757 pl_exec.c:3061
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "no se puede ejecutar COPY desde/a un cliente en PL/pgSQL"
 
-#: pl_exec.c:2745 pl_exec.c:3048
+#: pl_exec.c:2761 pl_exec.c:3065
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "no se pueden iniciar o terminar transacciones en PL/pgSQL"
 
-#: pl_exec.c:2746 pl_exec.c:3049
+#: pl_exec.c:2762 pl_exec.c:3066
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utilice un bloque BEGIN con una cláusula EXCEPTION."
 
-#: pl_exec.c:2894 pl_exec.c:3073
+#: pl_exec.c:2910 pl_exec.c:3090
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO es utilizado con una orden que no puede retornar datos"
 
-#: pl_exec.c:2914 pl_exec.c:3093
+#: pl_exec.c:2930 pl_exec.c:3110
 msgid "query returned no rows"
 msgstr "la consulta no regresó filas"
 
-#: pl_exec.c:2923 pl_exec.c:3102
+#: pl_exec.c:2939 pl_exec.c:3119
 msgid "query returned more than one row"
 msgstr "la consulta regresó más de una fila"
 
-#: pl_exec.c:2937
+#: pl_exec.c:2953
 msgid "query has no destination for result data"
 msgstr "la consulta no tiene un destino para los datos de resultado"
 
-#: pl_exec.c:2938
+#: pl_exec.c:2954
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Si quiere descartar los resultados de un SELECT, utilice PERFORM."
 
-#: pl_exec.c:2971 pl_exec.c:5528
+#: pl_exec.c:2987 pl_exec.c:5610
 msgid "query string argument of EXECUTE is null"
 msgstr "el argumento de consulta a ejecutar en EXECUTE es null"
 
-#: pl_exec.c:3036
+#: pl_exec.c:3052
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "no está implementado EXECUTE de un SELECT ... INTO"
 
-#: pl_exec.c:3324 pl_exec.c:3415
+#: pl_exec.c:3053
+msgid "You might want to use EXECUTE ... INTO instead."
+msgstr "Puede desear usar EXECUTE ... INTO en su lugar."
+
+#: pl_exec.c:3341 pl_exec.c:3432
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "variable cursor «%s» es null"
 
-#: pl_exec.c:3331 pl_exec.c:3422
+#: pl_exec.c:3348 pl_exec.c:3439
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
 
-#: pl_exec.c:3345
+#: pl_exec.c:3362
 msgid "relative or absolute cursor position is null"
 msgstr "la posición relativa o absoluta del cursor es null"
 
-#: pl_exec.c:3482
+#: pl_exec.c:3503
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr ""
-"no puede asignarse un valor null a la variable «%s» que fue declarada NOT "
-"NULL"
+"no puede asignarse un valor null a la variable «%s» que fue declarada NOT NULL"
 
-#: pl_exec.c:3540
+#: pl_exec.c:3561
 msgid "cannot assign non-composite value to a row variable"
 msgstr "no se puede asignar un valor no compuesto a una variable de tipo row"
 
-#: pl_exec.c:3582
+#: pl_exec.c:3603
 msgid "cannot assign non-composite value to a record variable"
-msgstr "no se puede asignar un valor no compuesto a una variable de tipo record"
+msgstr ""
+"no se puede asignar un valor no compuesto a una variable de tipo record"
 
-#: pl_exec.c:3642 pl_exec.c:3949 pl_exec.c:4030 pl_exec.c:4067
+#: pl_exec.c:3663 pl_exec.c:3997 pl_exec.c:4078 pl_exec.c:4115
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "el registro «%s» no tiene un campo «%s»"
 
-#: pl_exec.c:3740
+#: pl_exec.c:3773
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
-msgstr "el número de dimensiones del array (%d) excede el máximo permitido (%d)"
+msgstr ""
+"el número de dimensiones del array (%d) excede el máximo permitido (%d)"
 
-#: pl_exec.c:3754
+#: pl_exec.c:3787
 msgid "subscripted object is not an array"
 msgstr "el objeto al que se le puso un subíndice no es un array"
 
-#: pl_exec.c:3777
+#: pl_exec.c:3810
 msgid "array subscript in assignment must not be null"
 msgstr "subíndice de array en asignación no puede ser null"
 
-#: pl_exec.c:4158
+#: pl_exec.c:4206
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la consulta «%s» no retornó datos"
 
-#: pl_exec.c:4175
-#, c-format
-msgid "query \"%s\" returned more than one row"
-msgstr "la consulta «%s» retornó más de una fila"
-
-#: pl_exec.c:4180
+#: pl_exec.c:4214
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "la consulta «%s» retornó %d columna"
 msgstr[1] "la consulta «%s» retornó %d columnas"
 
-#: pl_exec.c:4242
+#: pl_exec.c:4240
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "la consulta «%s» retornó más de una fila"
+
+#: pl_exec.c:4298
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la consulta «%s» no es una orden SELECT"
@@ -423,7 +442,8 @@ msgstr "variable de tipo row o record no puede ser NOT NULL"
 
 #: gram.y:462
 msgid "default value for row or record variable is not supported"
-msgstr "el valor por omisión de una variable de tipo row o record no está soportado"
+msgstr ""
+"el valor por omisión de una variable de tipo row o record no está soportado"
 
 #: gram.y:606 gram.y:632
 #, c-format
@@ -438,7 +458,7 @@ msgstr "declaración duplicada"
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "elemento de GET DIAGNOSTICS no reconocido"
 
-#: gram.y:852 gram.y:2975
+#: gram.y:852 gram.y:2990
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "«%s» no es una variable escalar"
@@ -448,8 +468,8 @@ msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
 msgstr ""
-"la variable de bucle de un bucle sobre filas debe ser una "
-"variable de tipo record o row o una lista de variables escalares"
+"la variable de bucle de un bucle sobre filas debe ser una variable de tipo "
+"record o row o una lista de variables escalares"
 
 #: gram.y:1148
 msgid "cursor FOR loop must have only one target variable"
@@ -461,161 +481,167 @@ msgstr "un bucle FOR en torno a un cursor debe usar un cursor enlazado (bound)"
 
 #: gram.y:1238
 msgid "integer FOR loop must have only one target variable"
-msgstr "un bucle FOR de un número entero debe tener sólo una variable de destino"
+msgstr ""
+"un bucle FOR de un número entero debe tener sólo una variable de destino"
 
 #: gram.y:1273
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "no se puede especificar REVERSE en un bucle FOR de una consulta"
 
-#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
-#: gram.y:3249
+#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2440 gram.y:2521 gram.y:2632
+#: gram.y:3264
 msgid "unexpected end of function definition"
 msgstr "fin inesperado de la definición de la función"
 
-#: 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:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1657 gram.y:1665
+#: gram.y:1679 gram.y:1774 gram.y:1951 gram.y:2030 gram.y:2143 gram.y:2721
+#: gram.y:2785 gram.y:3224 gram.y:3245
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
+#: gram.y:1553 gram.y:1555 gram.y:1955 gram.y:1957
 msgid "invalid SQLSTATE code"
 msgstr "código SQLSTATE no válido"
 
-#: gram.y:1706
+#: gram.y:1721
 msgid "syntax error, expected \"FOR\""
 msgstr "error de sintaxis, se esperaba «FOR»"
 
-#: gram.y:1768
+#: gram.y:1783
 msgid "FETCH statement cannot return multiple rows"
 msgstr "la sentencia FETCH no puede retornar múltiples filas"
 
-#: gram.y:1824
+#: gram.y:1839
 msgid "cursor variable must be a simple variable"
 msgstr "variable de cursor debe ser una variable simple"
 
-#: gram.y:1830
+#: gram.y:1845
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "la variable «%s» debe ser de tipo cursor o refcursor"
 
-#: gram.y:1994
+#: gram.y:2009
 msgid "label does not exist"
 msgstr "la etiqueta no existe"
 
-#: gram.y:2099 gram.y:2110
+#: gram.y:2114 gram.y:2125
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "«%s» no es una variable conocida"
 
-#: gram.y:2212 gram.y:2222 gram.y:2350
+#: gram.y:2227 gram.y:2237 gram.y:2365
 msgid "mismatched parentheses"
 msgstr "no coinciden los paréntesis"
 
-#: gram.y:2226
+#: gram.y:2241
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "falta «%s» al final de la expresión SQL"
 
-#: gram.y:2232
+#: gram.y:2247
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "falta «%s» al final de la sentencia SQL"
 
-#: gram.y:2249
+#: gram.y:2264
 msgid "missing expression"
 msgstr "expresión faltante"
 
-#: gram.y:2251
+#: gram.y:2266
 msgid "missing SQL statement"
 msgstr "sentencia SQL faltante"
 
-#: gram.y:2352
+#: gram.y:2367
 msgid "incomplete data type declaration"
 msgstr "declaración de tipo de dato incompleta"
 
-#: gram.y:2374
+#: gram.y:2389
 msgid "missing data type declaration"
 msgstr "declaración de tipo de dato faltante"
 
-#: gram.y:2430
+#: gram.y:2445
 msgid "INTO specified more than once"
 msgstr "INTO fue especificado más de una vez"
 
-#: gram.y:2598
+#: gram.y:2613
 msgid "expected FROM or IN"
 msgstr "se espera FROM o IN"
 
-#: gram.y:2658
+#: gram.y:2673
 msgid "RETURN cannot have a parameter in function returning set"
-msgstr "RETURN no puede tener un parámetro en una función que retorna un conjunto"
+msgstr ""
+"RETURN no puede tener un parámetro en una función que retorna un conjunto"
 
-#: gram.y:2659
+#: gram.y:2674
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Use RETURN NEXT o RETURN QUERY."
 
-#: gram.y:2667
+#: gram.y:2682
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN no puede tener parámetros en una función con parámetros OUT"
 
-#: gram.y:2676
+#: gram.y:2691
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN no puede tener parámetro en una función que retorna void"
 
-#: gram.y:2694 gram.y:2701
+#: gram.y:2709 gram.y:2716
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
-"RETURN debe especificar una variable de tipo record o row en una "
-"función que retorna una fila"
+"RETURN debe especificar una variable de tipo record o row en una función que "
+"retorna una fila"
 
-#: gram.y:2743
+#: gram.y:2758
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
-msgstr "RETURN NEXT no puede tener parámetros en una función con parámetros OUT"
+msgstr ""
+"RETURN NEXT no puede tener parámetros en una función con parámetros OUT"
 
-#: gram.y:2758 gram.y:2765
-msgid "RETURN NEXT must specify a record or row variable in function returning row"
+#: gram.y:2773 gram.y:2780
+msgid ""
+"RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
-"RETURN NEXT debe especificar una variable tipo record o row en una "
-"función que retorna una fila"
+"RETURN NEXT debe especificar una variable tipo record o row en una función "
+"que retorna una fila"
 
-#: gram.y:2844
+#: gram.y:2859
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "«%s» esta declarada como CONSTANT"
 
-#: gram.y:2906 gram.y:2918
+#: gram.y:2921 gram.y:2933
 msgid "record or row variable cannot be part of multiple-item INTO list"
-msgstr "una variable de tipo record o row no puede ser parte de una lista INTO de múltiples elementos"
+msgstr ""
+"una variable de tipo record o row no puede ser parte de una lista INTO de "
+"múltiples elementos"
 
-#: gram.y:2963
+#: gram.y:2978
 msgid "too many INTO variables specified"
 msgstr "se especificaron demasiadas variables INTO"
 
-#: gram.y:3170
+#: gram.y:3185
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "etiqueta de término «%s» especificada para un bloque sin etiqueta"
 
-#: gram.y:3177
+#: gram.y:3192
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "etiqueta de término «%s» difiere de la etiqueta de bloque «%s»"
 
-#: gram.y:3204
+#: gram.y:3219
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "el cursor «%s» no tiene argumentos"
 
-#: gram.y:3218
+#: gram.y:3233
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "el cursor «%s» tiene argumentos"
 
-#: gram.y:3266
+#: gram.y:3281
 msgid "unrecognized RAISE statement option"
 msgstr "no se reconoce la opción de sentencia RAISE"
 
-#: gram.y:3270
+#: gram.y:3285
 msgid "syntax error, expected \"=\""
 msgstr "error de sintaxis, se esperaba «=»"
 
@@ -655,7 +681,9 @@ msgstr "bucle FOR en torno a una sentencia EXECUTE"
 msgid ""
 "Sets handling of conflicts between PL/pgSQL variable names and table column "
 "names."
-msgstr "Determina el manejo de conflictos entre nombres de variables PL/pgSQL y nombres de columnas de tablas."
+msgstr ""
+"Determina el manejo de conflictos entre nombres de variables PL/pgSQL y "
+"nombres de columnas de tablas."
 
 #. translator: %s is typically the translation of "syntax error"
 #: pl_scanner.c:463
@@ -668,4 +696,3 @@ msgstr "%s al final de la entrada"
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
-
diff --git a/src/pl/plpgsql/src/po/fr.po b/src/pl/plpgsql/src/po/fr.po
index 0ae06193496..8336dd787b9 100644
--- a/src/pl/plpgsql/src/po/fr.po
+++ b/src/pl/plpgsql/src/po/fr.po
@@ -1,7 +1,7 @@
 # translation of plpgsql.po to fr_fr
 # french message translation file for plpgsql
 #
-# src/pl/plpgsql/src/po/fr.po
+# $PostgreSQL$
 #
 # Use these quotes: � %s �
 # Guillaume Lelarge <guillaume@lelarge.info>, 2009.
diff --git a/src/pl/plpgsql/src/po/ja.po b/src/pl/plpgsql/src/po/ja.po
index b1d38f9f29a..d622bffd4ee 100644
--- a/src/pl/plpgsql/src/po/ja.po
+++ b/src/pl/plpgsql/src/po/ja.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: plpgsql\n"
+"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-25 20:48+0900\n"
-"PO-Revision-Date: 2009-06-25 20:54+0900\n"
+"POT-Creation-Date: 2010-07-20 12:57+0900\n"
+"PO-Revision-Date: 2010-07-21 18:46+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"
@@ -11,9 +11,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Country: JAPAN\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pl_comp.c:418 pl_handler.c:177
+#: pl_comp.c:422 pl_handler.c:256
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "PL/pgSQL 関数では %s 型は指定できません"
@@ -24,20 +24,20 @@ msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "関数 \"%s\" が多様な形を持つため、実際の戻り値の型を特定できませんでした"
 
-#: pl_comp.c:533
+#: pl_comp.c:531
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数はトリガーとしてのみコールできます"
 
-#: pl_comp.c:537 pl_handler.c:162
+#: pl_comp.c:535 pl_handler.c:241
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "PL/pgSQL 関数は %s 型を返せません"
 
-#: pl_comp.c:578
+#: pl_comp.c:576
 msgid "trigger functions cannot have declared arguments"
 msgstr "トリガー関数には引数を宣言できません"
 
-#: pl_comp.c:579
+#: pl_comp.c:577
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
@@ -45,417 +45,398 @@ msgstr ""
 "その代わり、トリガーの引数には TG_NARGS と TG_ARGV を通してのみアクセスできま"
 "す"
 
-#: pl_comp.c:769
+#: pl_comp.c:880
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "PL/pgSQL 関数 \"%s\" の %d 行目付近でのコンパイル"
 
-#: pl_comp.c:804
-msgid "expected \"[\""
-msgstr "\"[\" を期待していました"
-
-#: pl_comp.c:942
+#: pl_comp.c:978
 #, c-format
-msgid "row \"%s\" has no field \"%s\""
-msgstr "行 \"%s\" には列 \"%s\" がありません"
+msgid "column reference \"%s\" is ambiguous"
+msgstr "列参照\"%s\"は曖昧です"
 
-#: pl_comp.c:1044
-#, c-format
-msgid "row \"%s.%s\" has no field \"%s\""
-msgstr "行 \"%s.%s\" には列 \"%s\" がありません"
+#: pl_comp.c:980
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr ""
+"PL/pgSQL変数もしくはテーブルのカラム名いずれかを参照していた可能性があります"
 
-#: pl_comp.c:1356
+#: pl_comp.c:1690
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "リレーション \"%s\" がありません"
 
-#: pl_comp.c:1401
+#: pl_comp.c:1722
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "リレーション \"%s.%s\" がありません"
 
-#: pl_comp.c:1484
+#: pl_comp.c:1804
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "変数 \"%s\" の型は擬似タイプ %s です"
 
-#: pl_comp.c:1545
+#: pl_comp.c:1865
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "リレーション \"%s\" はテーブルではありません"
 
-#: pl_comp.c:1718
+#: pl_comp.c:2017
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "型  \"%s\" はシェルでのみ使えます"
 
-#: pl_comp.c:1788 pl_comp.c:1841
+#: pl_comp.c:2087 pl_comp.c:2140
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "例外条件 \"%s\" が認識できません"
 
-#: pl_comp.c:1996
+#: pl_comp.c:2295
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "関数 \"%s\" が多様な形を持つため、実際の引数の型を特定できませんでした"
 
-#: pl_exec.c:235 pl_exec.c:505
+#: pl_exec.c:236 pl_exec.c:511
 msgid "during initialization of execution state"
 msgstr "実行状態の初期化中に"
 
-#: pl_exec.c:242 pl_exec.c:632
+#: pl_exec.c:243
 msgid "while storing call arguments into local variables"
 msgstr "引数をローカル変数に格納する際に"
 
-#: pl_exec.c:297 pl_exec.c:643
+#: pl_exec.c:298 pl_exec.c:666
 msgid "during function entry"
 msgstr "関数登録の際に"
 
-#: pl_exec.c:328 pl_exec.c:674
+#: pl_exec.c:329 pl_exec.c:697
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE はループの外では使えません"
 
-#: pl_exec.c:332 pl_exec.c:678
+#: pl_exec.c:333 pl_exec.c:701
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "引数の無い RAISE は、例外ハンドラの外では使えません"
 
-#: pl_exec.c:336
+#: pl_exec.c:337
 msgid "control reached end of function without RETURN"
 msgstr "RETURN が現れる前に、制御が関数の終わりに達しました"
 
-#: pl_exec.c:343
+#: pl_exec.c:344
 msgid "while casting return value to function's return type"
 msgstr "戻り値を関数の戻り値の型へキャストする際に"
 
-#: pl_exec.c:356 pl_exec.c:2357
+#: pl_exec.c:357 pl_exec.c:2400
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "値のセットを受け付けないような文脈で、セット値を返す関数が呼ばれました"
 
-#: pl_exec.c:391
+#: pl_exec.c:395
 msgid "returned record type does not match expected record type"
 msgstr "戻りレコードの型が期待するレコードの型と一致しません"
 
-#: pl_exec.c:447 pl_exec.c:686
+#: pl_exec.c:453 pl_exec.c:709
 msgid "during function exit"
 msgstr "関数を抜ける際に"
 
-#: pl_exec.c:682
+#: pl_exec.c:705
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "RETURN が現れる前に、制御がトリガー手続きの終わりに達しました"
 
-#: pl_exec.c:691
+#: pl_exec.c:714
 msgid "trigger procedure cannot return a set"
 msgstr "トリガー手続きはセットを返すことができません"
 
-#: pl_exec.c:709
+#: pl_exec.c:736
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr "返された行の構造が、トリガーしているテーブルの構造とマッチしません"
 
-#: pl_exec.c:771
+#: pl_exec.c:799
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "PL/pgSQL 関数 \"%s\" の %d 行目で %s"
 
-#: pl_exec.c:782
+#: pl_exec.c:810
 #, 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:790
+#: pl_exec.c:818
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "PL/pgSQL 関数 \"%s\" の %d 行目の型 %s"
 
-#: pl_exec.c:796
+#: pl_exec.c:824
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "PL/pgSQL 関数 \"%s\""
 
-#: pl_exec.c:905
+#: pl_exec.c:932
 msgid "during statement block local variable initialization"
 msgstr "ステートメントブロックでローカル変数を初期化する際に"
 
-#: pl_exec.c:947
+#: pl_exec.c:974
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr ""
 "変数 \"%s\" は NOT NULL として宣言されているため、初期値を NULL にすることは"
 "できません"
 
-#: pl_exec.c:993
+#: pl_exec.c:1023
 msgid "during statement block entry"
 msgstr "ステートメントブロックを登録する際に"
 
-#: pl_exec.c:1014
+#: pl_exec.c:1044
 msgid "during statement block exit"
 msgstr "ステートメントブロックを抜ける際に"
 
-#: pl_exec.c:1057
+#: pl_exec.c:1087
 msgid "during exception cleanup"
 msgstr "例外をクリーンアップする際に"
 
-#: pl_exec.c:1523
+#: pl_exec.c:1553
 msgid "case not found"
 msgstr "case が見つかりません"
 
-#: pl_exec.c:1524
+#: pl_exec.c:1554
 msgid "CASE statement is missing ELSE part."
 msgstr "CASE ステートメントに ELSE 部分がありません"
 
-#: pl_exec.c:1680
+#: pl_exec.c:1710
 msgid "lower bound of FOR loop cannot be null"
 msgstr "FOR ループの下限を NULL にすることはできません"
 
-#: pl_exec.c:1695
+#: pl_exec.c:1725
 msgid "upper bound of FOR loop cannot be null"
 msgstr "FOR ループの上限を NULL にすることはできません"
 
-#: pl_exec.c:1712
+#: pl_exec.c:1742
 msgid "BY value of FOR loop cannot be null"
 msgstr "FOR ループにおける BY の値を NULL にすることはできません"
 
-#: pl_exec.c:1718
+#: pl_exec.c:1748
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "FOR ループにおける BY の値はゼロより大きくなければなりません"
 
-#: pl_exec.c:1890 pl_exec.c:3129
+#: pl_exec.c:1920 pl_exec.c:3182
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "カーソル \"%s\" はすでに使われています"
 
-#: pl_exec.c:1913 pl_exec.c:3223
+#: pl_exec.c:1943 pl_exec.c:3244
 msgid "arguments given for cursor without arguments"
 msgstr "引数なしのカーソルに引数が与えられました"
 
-#: pl_exec.c:1932 pl_exec.c:3242
+#: pl_exec.c:1962 pl_exec.c:3263
 msgid "arguments required for cursor"
 msgstr "カーソルには引数が必要です"
 
-#: pl_exec.c:2150 gram.y:2419
+#: pl_exec.c:2184 gram.y:2729
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "SETOF でない関数では RETURN NEXT は使えません"
 
-#: pl_exec.c:2174 pl_exec.c:2234
+#: pl_exec.c:2208 pl_exec.c:2274
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "RETURN NEXT において誤った戻り値の型が指定されています"
 
-#: pl_exec.c:2197 pl_exec.c:3608 pl_exec.c:3900 pl_exec.c:3939
+#: 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
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "レコード \"%s\" には、まだ値が代入されていません"
 
-#: pl_exec.c:2199 pl_exec.c:3610 pl_exec.c:3902 pl_exec.c:3941
+#: 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
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "まだ代入されていないレコードのタプル構造は不定です"
 
-#: pl_exec.c:2202 pl_exec.c:2215
+#: pl_exec.c:2236 pl_exec.c:2255
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "RETURN NEXT において、誤ったレコード型が指定されています"
 
-#: pl_exec.c:2259
+#: pl_exec.c:2297
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT にはパラメーターが必要です"
 
-#: pl_exec.c:2291 gram.y:2466
+#: pl_exec.c:2328 gram.y:2788
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "SETOF でない関数では RETURN QUERY は使えません"
 
-#: pl_exec.c:2310
+#: pl_exec.c:2348
 msgid "structure of query does not match function result type"
 msgstr "クエリーの構造が関数の戻り値の型と一致しません"
 
-#: pl_exec.c:2427
+#: pl_exec.c:2480
 msgid "too few parameters specified for RAISE"
 msgstr "RAISE に指定されたパラメーターの数が足りません"
 
-#: pl_exec.c:2453
+#: pl_exec.c:2506
 msgid "too many parameters specified for RAISE"
 msgstr "RAISE に指定されたパラメーターの数が多すぎます"
 
-#: pl_exec.c:2473
+#: pl_exec.c:2526
 msgid "RAISE statement option cannot be null"
 msgstr "RAISE ステートメントのオプションには NULL は指定できません"
 
-#: pl_exec.c:2483 pl_exec.c:2492 pl_exec.c:2500 pl_exec.c:2508
+#: pl_exec.c:2536 pl_exec.c:2545 pl_exec.c:2553 pl_exec.c:2561
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "RAISE オプションは既に指定されています: %s"
 
-#: pl_exec.c:2543 pl_exec.c:2544 pl_exec.c:5135 pl_exec.c:5140 pl_exec.c:5149
+#: pl_exec.c:2596 pl_exec.c:2597
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2686 pl_exec.c:2993
+#: pl_exec.c:2743 pl_exec.c:3047
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "PL/pgSQL 内では COPY to/from は使えません"
 
-#: pl_exec.c:2690 pl_exec.c:2997
+#: pl_exec.c:2747 pl_exec.c:3051
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "PL/pgSQL 内ではトランザクションを開始／終了できません"
 
-#: pl_exec.c:2691 pl_exec.c:2998
+#: pl_exec.c:2748 pl_exec.c:3052
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
-msgstr "代わりに EXCEPTION 句を伴う BEGIN ブロックを使ってください"
+msgstr "代わりに EXCEPTION 句を伴う BEGIN ブロックを使用してください"
 
-#: pl_exec.c:2843 pl_exec.c:3022
+#: pl_exec.c:2896 pl_exec.c:3076
 msgid "INTO used with a command that cannot return data"
 msgstr "データを返せない命令で INTO が使われました"
 
-#: pl_exec.c:2863 pl_exec.c:3042
+#: pl_exec.c:2916 pl_exec.c:3096
 msgid "query returned no rows"
 msgstr "クエリーは行を返しませんでした"
 
-#: pl_exec.c:2872 pl_exec.c:3051
+#: pl_exec.c:2925 pl_exec.c:3105
 msgid "query returned more than one row"
 msgstr "クエリーが複数の行を返しました"
 
-#: pl_exec.c:2886
+#: pl_exec.c:2939
 msgid "query has no destination for result data"
 msgstr "クエリーに結果データの返却先が指定されていません"
 
-#: pl_exec.c:2887
+#: pl_exec.c:2940
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "SELECT の結果を破棄したい場合は、代わりに PERFORM を使ってください"
 
-#: pl_exec.c:2920 pl_exec.c:3170 pl_exec.c:5427
+#: pl_exec.c:2973 pl_exec.c:5547
 msgid "query string argument of EXECUTE is null"
 msgstr "EXECUTE のクエリー文字列の引数が NULL です"
 
-#: pl_exec.c:2985
+#: pl_exec.c:3038
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "SELECT ... INTO の EXECUTE は実装されていません"
 
-#: pl_exec.c:3304 pl_exec.c:3395
+#: pl_exec.c:3039
+msgid "You might want to use EXECUTE ... INTO instead."
+msgstr "代わりに EXECUTE ... INTO を使ってください"
+
+#: pl_exec.c:3327 pl_exec.c:3418
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "カーソル変数 \"%s\" が NULL です"
 
-#: pl_exec.c:3311 pl_exec.c:3402
+#: pl_exec.c:3334 pl_exec.c:3425
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "カーソル \"%s\" は存在しません"
 
-#: pl_exec.c:3325
+#: pl_exec.c:3348
 msgid "relative or absolute cursor position is null"
 msgstr "相対もしくは絶対カーソル位置が NULL です"
 
-#: pl_exec.c:3462
+#: pl_exec.c:3485
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "NOT NULL として宣言された変数 \"%s\" には NULL を代入できません"
 
-#: pl_exec.c:3507
+#: pl_exec.c:3543
 msgid "cannot assign non-composite value to a row variable"
 msgstr "複合値でない値を行変数に代入できません"
 
-#: pl_exec.c:3549
+#: pl_exec.c:3585
 msgid "cannot assign non-composite value to a record variable"
 msgstr "複合値でない値をレコード変数に代入できません"
 
-#: pl_exec.c:3621 pl_exec.c:3946
+#: 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:3719
+#: pl_exec.c:3743
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "配列の次元数(%d)が指定可能な最大値(%d)を超えています"
 
-#: pl_exec.c:3733
+#: pl_exec.c:3757
 msgid "subscripted object is not an array"
 msgstr "添字つきオブジェクトは配列ではありません"
 
-#: pl_exec.c:3756
+#: pl_exec.c:3780
 msgid "array subscript in assignment must not be null"
 msgstr "代入における配列の添字が NULL であってはなりません"
 
-#: pl_exec.c:3862 pl_exec.c:3887 pl_exec.c:3924
-#, c-format
-msgid "type of \"%s\" does not match that when preparing the plan"
-msgstr "\"%s\" の型が、実行計画を準備する際の型と一致しません"
-
-#: pl_exec.c:3953
-#, c-format
-msgid "type of \"%s.%s\" does not match that when preparing the plan"
-msgstr " \"%s.%s\" の型が、実行計画を準備する際の型と一致しません"
-
-#: pl_exec.c:3978
-#, c-format
-msgid "type of tg_argv[%d] does not match that when preparing the plan"
-msgstr "tg_argv[%d]の型が、実行計画を準備する際の型と一致しません"
-
-#: pl_exec.c:4071
+#: pl_exec.c:4161
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "クエリー \"%s\" がデータを返しませんでした"
 
-#: pl_exec.c:4088
-#, c-format
-msgid "query \"%s\" returned more than one row"
-msgstr "クエリー \"%s\" が複数の行を返しました"
-
-#: pl_exec.c:4093
+#: pl_exec.c:4169
 #, 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:4154
+#: pl_exec.c:4195
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "クエリー \"%s\" が複数の行を返しました"
+
+#: pl_exec.c:4253
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "クエリー \"%s\" が SELECT ではありません"
 
-#: pl_exec.c:5130
-msgid "N/A (dropped column)"
-msgstr "N/A （除外された列）"
+#: pl_gram.c:1091
+msgid "syntax error: cannot back up"
+msgstr "構文エラー: バックアップできません"
 
-#: pl_exec.c:5141
-#, c-format
-msgid ""
-"Number of returned columns (%d) does not match expected column count (%d)."
-msgstr "返された列数(%d)が期待する列数(%d)と一致しません"
-
-#: pl_exec.c:5150
-#, c-format
-msgid "Returned type %s does not match expected type %s in column \"%s\"."
-msgstr "列 \"%3$s\" において、返された型 %1$s が期待する型 %2$s と一致しません"
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr "ブロックラベルは DECLARE の後ではなく前に置かなければなりません"
 
-#: gram.y:355
+#: gram.y:441
 msgid "row or record variable cannot be CONSTANT"
 msgstr "行またはレコード変数を CONSTRAINT にはできません"
 
-#: gram.y:364
+#: gram.y:451
 msgid "row or record variable cannot be NOT NULL"
 msgstr "行またはレコード変数を NOT NULL にはできません"
 
-#: gram.y:373
+#: gram.y:462
 msgid "default value for row or record variable is not supported"
 msgstr "行またはレコード変数のデフォルト値指定はサポートされていません"
 
-#: gram.y:522
-msgid "only positional parameters can be aliased"
-msgstr "位置パラメータのみが別名指定可能です"
-
-#: gram.y:532
+#: gram.y:606 gram.y:632
 #, c-format
-msgid "function has no parameter \"%s\""
-msgstr "関数にパラメーター \"%s\" がありません"
+msgid "variable \"%s\" does not exist"
+msgstr "変数\"%s\"は存在しません"
 
-#: gram.y:560 gram.y:564 gram.y:568
+#: gram.y:650 gram.y:663
 msgid "duplicate declaration"
 msgstr "重複した宣言です。"
 
-#: gram.y:761 gram.y:765 gram.y:769
-msgid "expected an integer variable"
-msgstr "整数値を期待していました"
+#: gram.y:841
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "GET DIAGNOSTICS 項目が認識できません"
 
-#: gram.y:1024 gram.y:1213
+#: gram.y:852 gram.y:2975
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" はスカラー変数ではありません"
+
+#: gram.y:1114 gram.y:1306
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
@@ -463,271 +444,233 @@ msgstr ""
 "行をまたがるループにおけるループ変数は、レコード、行変数、スカラー変数並びの"
 "いずれかでなければなりません"
 
-#: gram.y:1061
+#: gram.y:1148
 msgid "cursor FOR loop must have only one target variable"
 msgstr "カーソルを使った FOR ループには、ターゲット変数が１個だけ必要です"
 
-#: gram.y:1073
+#: gram.y:1155
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr ""
 "カーソルを使った FOR ループでは、それに関連付けられたカーソル変数を使用しなけ"
 "ればなりません"
 
-#: gram.y:1149
+#: gram.y:1238
 msgid "integer FOR loop must have only one target variable"
 msgstr "整数を使った FOR ループには、ターゲット変数が１個だけ必要です"
 
-#: gram.y:1182
+#: gram.y:1273
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "クエリーを使った FOR ループの中では REVERSE は指定できません"
 
-#: gram.y:1273 gram.y:2631
-#, c-format
-msgid "\"%s\" is not a scalar variable"
-msgstr "\"%s\" はスカラー変数ではありません"
-
-#: gram.y:1326 gram.y:1366 gram.y:1410 gram.y:2187 gram.y:2278 gram.y:2938
+#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
+#: gram.y:3249
 msgid "unexpected end of function definition"
 msgstr "予期しない関数定義の終端に達しました"
 
-#: gram.y:1430 gram.y:1452 gram.y:1466 gram.y:1474 gram.y:1535 gram.y:1622
-#: gram.y:1787
+#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1652 gram.y:1759
+#: gram.y:1936 gram.y:2015 pl_gram.c:3644 gram.y:2128 gram.y:2706 gram.y:2770
+#: gram.y:3209 gram.y:3230
 msgid "syntax error"
 msgstr "構文エラー"
 
-#: gram.y:1456 gram.y:1458 gram.y:1791 gram.y:1793
+#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
 msgid "invalid SQLSTATE code"
 msgstr "無効な SQLSTATE コードです"
 
-#: gram.y:1586 gram.y:2580 gram.y:2867
-#, c-format
-msgid "syntax error at \"%s\""
-msgstr " \"%s\" で構文エラー"
+#: gram.y:1706
+msgid "syntax error, expected \"FOR\""
+msgstr "構文エラー。\"FOR\" を期待していました"
 
-#: gram.y:1588
-msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
-msgstr ""
-"束縛されないカーソル変数用のカーソルを開くために \"FOR\" を期待していました"
+#: gram.y:1768
+msgid "FETCH statement cannot return multiple rows"
+msgstr "FETCH ステートメントは複数行を返せません"
 
-#: gram.y:1675
+#: gram.y:1824
 msgid "cursor variable must be a simple variable"
 msgstr "カーソル変数は単純変数でなければなりません"
 
-#: gram.y:1682
+#: gram.y:1830
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "変数 \"%s\" は cursor 型または refcursor 型でなければなりません"
 
-#: gram.y:1689 gram.y:1693 gram.y:1697
-msgid "expected a cursor or refcursor variable"
-msgstr "cursor 型または refcursor 型変数を期待していました"
+#: gram.y:1994
+msgid "label does not exist"
+msgstr "ラベルが存在しません"
+
+#: pl_gram.c:3640
+msgid "syntax error; also virtual memory exhausted"
+msgstr "構文エラー: 仮想メモリも枯渇しました"
 
-#: gram.y:1922 gram.y:3035
-msgid "too many variables specified in SQL statement"
-msgstr "SQL ステートメントに指定された変数が多すぎます"
+#: pl_gram.c:3760
+msgid "parser stack overflow"
+msgstr "パーサのスタックがオーバーフローしました"
 
-#: gram.y:2007 gram.y:2017 gram.y:2110
+#: gram.y:2099 gram.y:2110
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\"は既知の変数ではありません"
+
+#: gram.y:2212 gram.y:2222 gram.y:2350
 msgid "mismatched parentheses"
 msgstr "カッコが対応していません"
 
-#: gram.y:2022
+#: gram.y:2226
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "SQL 表現式の終端に \"%s\" がありません"
 
-#: gram.y:2027
+#: gram.y:2232
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "SQL ステートメントの終端に \"%s\" がありません"
 
-#: gram.y:2112
+#: gram.y:2249
+msgid "missing expression"
+msgstr "表現式がありません"
+
+#: gram.y:2251
+msgid "missing SQL statement"
+msgstr "SQLステートメントがありません"
+
+#: gram.y:2352
 msgid "incomplete data type declaration"
 msgstr "データ型の定義が不完全です"
 
-#: gram.y:2137
+#: gram.y:2374
 msgid "missing data type declaration"
 msgstr "データ型の定義がありません"
 
-#: gram.y:2192
+#: gram.y:2430
 msgid "INTO specified more than once"
 msgstr "INTO が複数回指定されています"
 
-#: gram.y:2341
+#: gram.y:2598
 msgid "expected FROM or IN"
 msgstr "FROM もしくは IN を期待していました"
 
-#: gram.y:2362
-msgid ""
-"RETURN cannot have a parameter in function returning set; use RETURN NEXT or "
-"RETURN QUERY"
-msgstr ""
-"セットを返す関数では、RETURN にはパラメータを指定できません。RETURN NEXT か "
-"RETURN QUERY を使ってください。"
+#: gram.y:2658
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "値のセットを返す関数では、RETURNにパラメータを指定できません"
+
+#: gram.y:2659
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "RETURN NEXT もしくは RETURN QUERY を使用してください"
 
-#: gram.y:2368
+#: gram.y:2667
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "OUT パラメータのない関数では、RETURN にはパラメータを指定できません"
 
-#: gram.y:2374
+#: gram.y:2676
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "void を返す関数では、RETURN にはパラメータを指定できません"
 
-#: gram.y:2393 gram.y:2397
+#: gram.y:2694 gram.y:2701
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "行を返す関数では、RETURN にレコードまたは行変数を指定しなければなりません"
 
-#: gram.y:2430
+#: gram.y:2743
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "OUT パラメータのない関数では、RETURN NEXT にはパラメータを指定できません"
 
-#: gram.y:2446 gram.y:2450
+#: gram.y:2758 gram.y:2765
 msgid ""
 "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "行を返す関数では、RETURN NEXT にレコードまたは行変数を指定しなければなりませ"
 "ん"
 
-#: gram.y:2513
+#: gram.y:2844
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" は CONSTANT として宣言されています"
 
-#: gram.y:2530
-msgid "cannot assign to tg_argv"
-msgstr "tg_argv への代入はできません"
-
-#: gram.y:2581
-msgid ""
-"Expected record variable, row variable, or list of scalar variables "
-"following INTO."
+#: gram.y:2906 gram.y:2918
+msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr ""
-"INTO の直後には、レコード変数、行変数、スカラー変数並びのいずれかが来なければ"
-"なりません"
+"レコードもしくは行変数は、複数項目を持つ INTO リストの一部分としては指定でき"
+"ません"
 
-#: gram.y:2615
+#: gram.y:2963
 msgid "too many INTO variables specified"
 msgstr "INTO 変数の指定が多すぎます"
 
-#: gram.y:2749
-#, c-format
-msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-msgstr "PL/PgSQL 関数 \"%s\" の %d 行目周辺の SQL ステートメント"
-
-#: gram.y:2792
-#, c-format
-msgid "string literal in PL/PgSQL function \"%s\" near line %d"
-msgstr "PL/PgSQL 関数 \"%s\" の %d 行目周辺の文字列リテラル"
-
-#: gram.y:2805
-msgid "label does not exist"
-msgstr "ラベルが存在しません"
-
-#: gram.y:2819
+#: gram.y:3170
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "ラベル無しブロックで終端ラベル \"%s\" が指定されました"
 
-#: gram.y:2828
+#: gram.y:3177
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "終端ラベル \"%s\" がブロックのラベル \"%s\" と異なります"
 
-#: gram.y:2858
+#: gram.y:3204
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "カーソル \"%s\" に引数がありません"
 
-#: gram.y:2880
+#: gram.y:3218
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "カーソル \"%s\" に引数がついています"
 
-#: gram.y:2918
-msgid "expected \")\""
-msgstr " \")\" を期待していました"
+#: gram.y:3266
+msgid "unrecognized RAISE statement option"
+msgstr "RAISE ステートメントのオプションを認識できません"
 
-#: gram.y:2955
-#, c-format
-msgid "unrecognized RAISE statement option \"%s\""
-msgstr "RAISE ステートメントのオプション \"%s\" を認識できません"
-
-#: gram.y:2960
+#: gram.y:3270
 msgid "syntax error, expected \"=\""
 msgstr "構文エラー。\"=\" を期待していました"
 
-#: pl_funcs.c:359
-#, c-format
-msgid "variable \"%s\" does not exist in the current block"
-msgstr "変数 \"%s\" は現在のブロックにはありません"
-
-#: pl_funcs.c:415
-#, c-format
-msgid "unterminated \" in identifier: %s"
-msgstr "識別子 %s に終端されていない \" があります"
-
-#: pl_funcs.c:439
-#, c-format
-msgid "qualified identifier cannot be used here: %s"
-msgstr "限定識別子は、ここでは使えません：%s"
-
-#: pl_funcs.c:471
+#: pl_funcs.c:216
 msgid "statement block"
 msgstr "ステートメントブロック"
 
-#: pl_funcs.c:473
+#: pl_funcs.c:218
 msgid "assignment"
 msgstr "代入"
 
-#: pl_funcs.c:483
+#: pl_funcs.c:228
 msgid "FOR with integer loop variable"
 msgstr "整数のループ変数を伴う FOR"
 
-#: pl_funcs.c:485
+#: pl_funcs.c:230
 msgid "FOR over SELECT rows"
 msgstr "SELECT 行を制御する FOR"
 
-#: pl_funcs.c:487
+#: pl_funcs.c:232
 msgid "FOR over cursor"
 msgstr "カーソルを制御する FOR"
 
-#: pl_funcs.c:499
+#: pl_funcs.c:244
 msgid "SQL statement"
 msgstr "SQL ステートメント"
 
-#: pl_funcs.c:501
+#: pl_funcs.c:246
 msgid "EXECUTE statement"
 msgstr "EXECUTE ステートメント"
 
-#: pl_funcs.c:503
+#: pl_funcs.c:248
 msgid "FOR over EXECUTE statement"
 msgstr "EXECUTE ステートメントを制御する FOR"
 
-#: scan.l:263
-msgid "unterminated quoted identifier"
-msgstr "識別子を囲む引用符が閉じていません"
-
-#: scan.l:306
-msgid "unterminated /* comment"
-msgstr "/* コメントが閉じていません"
-
-#: scan.l:342
-msgid "unterminated quoted string"
-msgstr "文字列を囲む引用符が閉じていません"
-
-#: scan.l:382
-msgid "unterminated dollar-quoted string"
-msgstr "文字列を囲むドル記号が閉じていません"
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr "PL/pgSQL変数名とテーブルのカラム名の間の衝突処理を設定してください"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:445
+#: pl_scanner.c:463
 #, c-format
 msgid "%s at end of input"
 msgstr "入力の最後で %s"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:454
+#: pl_scanner.c:479
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "\"%2$s\" もしくはその近辺で %1$s"
diff --git a/src/pl/plpgsql/src/po/ko.po b/src/pl/plpgsql/src/po/ko.po
new file mode 100644
index 00000000000..3b858e88264
--- /dev/null
+++ b/src/pl/plpgsql/src/po/ko.po
@@ -0,0 +1,723 @@
+# Korean message translation file for plpgsql
+# Copyright (C) 2010 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-09 16:27+0000\n"
+"PO-Revision-Date: 2010-09-09 17:00+0000\n"
+"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\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"
+
+#: pl_comp.c:418 pl_handler.c:177
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "PL/pgSQL 함수에 %s 형식을 사용할 수 없음"
+
+#: pl_comp.c:501
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr "다형적 함수 \"%s\"의 실제 반환 형식을 확인할 수 없음"
+
+#: pl_comp.c:533
+msgid "trigger functions can only be called as triggers"
+msgstr "트리거 함수는 트리거로만 호출될 수 있음"
+
+#: pl_comp.c:537 pl_handler.c:162
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "PL/pgSQL 함수는 %s 형식을 반환할 수 없음"
+
+#: pl_comp.c:578
+msgid "trigger functions cannot have declared arguments"
+msgstr "트리거 함수는 선언된 인수를 포함할 수 없음"
+
+#: pl_comp.c:579
+msgid ""
+"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
+"instead."
+msgstr "대신 TG_NARGS 및 TG_ARGV를 통해 트리거의 인수에 액세스할 수 있습니다."
+
+#: pl_comp.c:769
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "PL/pgSQL 함수 \"%s\" 컴파일(%d번째 줄 근처)"
+
+#: pl_comp.c:804
+msgid "expected \"[\""
+msgstr "\"[\" 필요"
+
+#: pl_comp.c:942
+#, c-format
+msgid "row \"%s\" has no field \"%s\""
+msgstr "\"%s\" 행에 \"%s\" 필드가 없음"
+
+#: pl_comp.c:1044
+#, c-format
+msgid "row \"%s.%s\" has no field \"%s\""
+msgstr "\"%s.%s\" 행에 \"%s\" 필드가 없음"
+
+#: pl_comp.c:1356
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "\"%s\" 이름의 릴레이션(relation)이 없습니다"
+
+#: pl_comp.c:1401
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "\"%s.%s\" 이름의 릴레이션(relation)이 없습니다"
+
+#: pl_comp.c:1484
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "\"%s\" 변수에 의사 형식 %s이(가) 있음"
+
+#: pl_comp.c:1545
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "\"%s\" 관계가 테이블이 아님"
+
+#: pl_comp.c:1718
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "자료형 \"%s\" 는 오로지 shell 에만 있습니다. "
+
+#: pl_comp.c:1788 pl_comp.c:1841
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "인식할 수 없는 예외 조건 \"%s\""
+
+#: pl_comp.c:1996
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr "다형적 함수 \"%s\"의 실제 인수 형식을 확인할 수 없음"
+
+#: pl_exec.c:235 pl_exec.c:505
+msgid "during initialization of execution state"
+msgstr "실행 상태를 초기화하는 동안"
+
+#: pl_exec.c:242 pl_exec.c:632
+msgid "while storing call arguments into local variables"
+msgstr "호출 인수를 로컬 변수에 저장하는 동안"
+
+#: pl_exec.c:297 pl_exec.c:643
+msgid "during function entry"
+msgstr "함수를 시작하는 동안"
+
+#: pl_exec.c:328 pl_exec.c:674
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "CONTINUE를 루프 외부에 사용할 수 없음"
+
+#: pl_exec.c:332 pl_exec.c:678
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr "매개 변수 없는 RAISE를 예외 처리기 외부에 사용할 수 없음"
+
+#: pl_exec.c:336
+msgid "control reached end of function without RETURN"
+msgstr "컨트롤이 RETURN 없이 함수 끝에 도달함"
+
+#: pl_exec.c:343
+msgid "while casting return value to function's return type"
+msgstr "함수의 반환 형식으로 반환 값을 형변환하는 동안"
+
+#: pl_exec.c:356 pl_exec.c:2351
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"set-values 함수(테이블 리턴 함수)가 set 정의 없이 사용되었습니다 (테이블과 해"
+"당 열 alias 지정하세요)"
+
+#: pl_exec.c:391
+msgid "returned record type does not match expected record type"
+msgstr "반환된 레코드 형식이 필요한 레코드 형식과 일치하지 않음"
+
+#: pl_exec.c:447 pl_exec.c:686
+msgid "during function exit"
+msgstr "함수를 종료하는 동안"
+
+#: pl_exec.c:682
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "컨트롤이 RETURN 없이 트리거 프로시저 끝에 도달함"
+
+#: pl_exec.c:691
+msgid "trigger procedure cannot return a set"
+msgstr "트리거 프로시저는 집합을 반환할 수 없음"
+
+#: pl_exec.c:709
+msgid ""
+"returned row structure does not match the structure of the triggering table"
+msgstr "반환된 행 구조가 트리거하는 테이블의 구조와 일치하지 않음"
+
+#: pl_exec.c:771
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "PL/pgSQL 함수 \"%s\"의 %d번째 줄(%s)"
+
+#: pl_exec.c:782
+#, 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:790
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "PL/pgSQL 함수 \"%s\"의 %d번째 줄(%s)"
+
+#: pl_exec.c:796
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "PL/pgSQL 함수 \"%s\""
+
+#: pl_exec.c:905
+msgid "during statement block local variable initialization"
+msgstr "문 블록 로컬 변수를 초기화하는 동안"
+
+#: pl_exec.c:947
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr "NOT NULL이 선언된 \"%s\" 변수의 기본 값이 NULL로 설정될 수 없음"
+
+#: pl_exec.c:993
+msgid "during statement block entry"
+msgstr "문 블록을 시작하는 동안"
+
+#: pl_exec.c:1014
+msgid "during statement block exit"
+msgstr "문 블록을 종료하는 동안"
+
+#: pl_exec.c:1057
+msgid "during exception cleanup"
+msgstr "예외를 정리하는 동안"
+
+#: pl_exec.c:1526
+msgid "case not found"
+msgstr "사례를 찾지 못함"
+
+#: pl_exec.c:1527
+msgid "CASE statement is missing ELSE part."
+msgstr "CASE 문에 ELSE 부분이 누락되었습니다."
+
+#: pl_exec.c:1683
+msgid "lower bound of FOR loop cannot be null"
+msgstr "FOR 루프의 하한은 null일 수 없음"
+
+#: pl_exec.c:1698
+msgid "upper bound of FOR loop cannot be null"
+msgstr "FOR 루프의 상한은 null일 수 없음"
+
+#: pl_exec.c:1715
+msgid "BY value of FOR loop cannot be null"
+msgstr "FOR 루프의 BY 값은 null일 수 없음"
+
+#: pl_exec.c:1721
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "FOR 루프의 BY 값은 0보다 커야 함"
+
+#: pl_exec.c:1893 pl_exec.c:3145
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "\"%s\" 커서가 이미 사용 중임"
+
+#: pl_exec.c:1916 pl_exec.c:3239
+msgid "arguments given for cursor without arguments"
+msgstr "인수가 없는 커서에 인수가 제공됨"
+
+#: pl_exec.c:1935 pl_exec.c:3258
+msgid "arguments required for cursor"
+msgstr "커서에 인수 필요"
+
+#: pl_exec.c:2152 gram.y:2434
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr "SETOF 함수가 아닌 함수에서 RETURN NEXT를 사용할 수 없음"
+
+#: pl_exec.c:2176 pl_exec.c:2234
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "RETURN NEXT에 잘못된 결과 형식이 제공됨"
+
+#: pl_exec.c:2197 pl_exec.c:3629 pl_exec.c:3948 pl_exec.c:3987
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "\"%s\" 레코드가 아직 할당되지 않음"
+
+#: pl_exec.c:2199 pl_exec.c:3631 pl_exec.c:3950 pl_exec.c:3989
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr "아직 할당되지 않은 레코드의 튜플 구조는 미정입니다."
+
+#: pl_exec.c:2202 pl_exec.c:2215
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr "RETURN NEXT에 잘못된 레코드 형식이 제공됨"
+
+#: pl_exec.c:2257
+msgid "RETURN NEXT must have a parameter"
+msgstr "RETURN NEXT에 매개 변수 필요"
+
+#: pl_exec.c:2287 gram.y:2481
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr "SETOF 함수가 아닌 함수에서 RETURN QUERY를 사용할 수 없음"
+
+#: pl_exec.c:2306
+msgid "structure of query does not match function result type"
+msgstr "쿼리 구조가 함수 결과 형식과 일치하지 않음"
+
+#: pl_exec.c:2431
+msgid "too few parameters specified for RAISE"
+msgstr "RAISE에 지정된 매개 변수가 너무 적음"
+
+#: pl_exec.c:2457
+msgid "too many parameters specified for RAISE"
+msgstr "RAISE에 지정된 매개 변수가 너무 많음"
+
+#: pl_exec.c:2477
+msgid "RAISE statement option cannot be null"
+msgstr "RAISE 문 옵션이 null일 수 없음"
+
+#: pl_exec.c:2487 pl_exec.c:2496 pl_exec.c:2504 pl_exec.c:2512
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "RAISE 옵션이 이미 지정됨: %s"
+
+#: pl_exec.c:2547 pl_exec.c:2548 pl_exec.c:5205 pl_exec.c:5210 pl_exec.c:5219
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pl_exec.c:2702 pl_exec.c:3009
+msgid "cannot COPY to/from client in PL/pgSQL"
+msgstr "PL/pgSQL의 클라이언트와 상호 복사할 수 없음"
+
+#: pl_exec.c:2706 pl_exec.c:3013
+msgid "cannot begin/end transactions in PL/pgSQL"
+msgstr "PL/pgSQL의 트랜잭션을 시작/종료할 수 없음"
+
+#: pl_exec.c:2707 pl_exec.c:3014
+msgid "Use a BEGIN block with an EXCEPTION clause instead."
+msgstr "대신 BEGIN 블록을 EXCEPTION 절과 함께 사용하십시오."
+
+#: pl_exec.c:2859 pl_exec.c:3038
+msgid "INTO used with a command that cannot return data"
+msgstr "데이터를 반환할 수 없는 명령과 함께 INTO가 사용됨"
+
+#: pl_exec.c:2879 pl_exec.c:3058
+msgid "query returned no rows"
+msgstr "쿼리에서 행을 반환하지 않음"
+
+#: pl_exec.c:2888 pl_exec.c:3067
+msgid "query returned more than one row"
+msgstr "쿼리에서 두 개 이상의 행을 반환"
+
+#: pl_exec.c:2902
+msgid "query has no destination for result data"
+msgstr "쿼리에 결과 데이터의 대상이 없음"
+
+#: pl_exec.c:2903
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr "SELECT의 결과를 취소하려면 대신 PERFORM을 사용하십시오."
+
+#: pl_exec.c:2936 pl_exec.c:3186 pl_exec.c:5514
+msgid "query string argument of EXECUTE is null"
+msgstr "EXECUTE의 쿼리 문자열 인수가 null임"
+
+#: pl_exec.c:3001
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "SELECT의 EXECUTE... INTO가 구현되지 않음"
+
+#: pl_exec.c:3320 pl_exec.c:3411
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "커서 변수 \"%s\"이(가) null임"
+
+#: pl_exec.c:3327 pl_exec.c:3418
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "\"%s\" 이름의 커서가 없음"
+
+#: pl_exec.c:3341
+msgid "relative or absolute cursor position is null"
+msgstr "상대 또는 절대 커서 위치가 null임"
+
+#: pl_exec.c:3482
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr "NOT NULL이 선언된 \"%s\" 변수에 null 값을 할당할 수 없음"
+
+#: pl_exec.c:3540
+msgid "cannot assign non-composite value to a row variable"
+msgstr "행 변수에 비복합 값을 할당할 수 없음"
+
+#: pl_exec.c:3582
+msgid "cannot assign non-composite value to a record variable"
+msgstr "레코드 변수에 비복합 값을 할당할 수 없음"
+
+#: pl_exec.c:3642 pl_exec.c:3994
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "\"%s\" 레코드에 \"%s\" 필드가 없음"
+
+#: pl_exec.c:3752
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "지정한 배열 크기(%d)가 최대치(%d)를 초과했습니다"
+
+#: pl_exec.c:3766
+msgid "subscripted object is not an array"
+msgstr "하위 스크립트 개체는 배열이 아님"
+
+#: pl_exec.c:3789
+msgid "array subscript in assignment must not be null"
+msgstr "배열 하위 스크립트로 지정하는 값으로 null 값을 사용할 수 없습니다"
+
+#: pl_exec.c:3910 pl_exec.c:3935 pl_exec.c:3972
+#, c-format
+msgid "type of \"%s\" does not match that when preparing the plan"
+msgstr "\"%s\"의 형식이 계획을 준비할 때의 형식과 일치하지 않음"
+
+#: pl_exec.c:4001
+#, c-format
+msgid "type of \"%s.%s\" does not match that when preparing the plan"
+msgstr "\"%s.%s\"의 형식이 계획을 준비할 때의 형식과 일치하지 않음"
+
+#: pl_exec.c:4026
+#, c-format
+msgid "type of tg_argv[%d] does not match that when preparing the plan"
+msgstr "tg_argv[%d]의 형식이 계획을 준비할 때의 형식과 일치하지 않음"
+
+#: pl_exec.c:4119
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "\"%s\" 쿼리에서 데이터를 반환하지 않음"
+
+#: pl_exec.c:4127
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] ""
+
+#: pl_exec.c:4153
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "\"%s\" 쿼리에서 두 개 이상의 행을 반환함"
+
+#: pl_exec.c:4210
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "\"%s\" 쿼리가 SELECT가 아님"
+
+#: pl_exec.c:5200
+msgid "N/A (dropped column)"
+msgstr "해당 없음(삭제된 열)"
+
+#: pl_exec.c:5211
+#, c-format
+msgid ""
+"Number of returned columns (%d) does not match expected column count (%d)."
+msgstr "반환된 열 수(%d)가 필요한 열 수(%d)와 일치하지 않습니다."
+
+#: pl_exec.c:5220
+#, c-format
+msgid "Returned type %s does not match expected type %s in column \"%s\"."
+msgstr "반환된 형식 %s이(가) 필요한 %s 형식(\"%s\" 열)과 일치하지 않습니다."
+
+#: gram.y:355
+msgid "row or record variable cannot be CONSTANT"
+msgstr "행 또는 레코드 변수는 CONSTANT일 수 없음"
+
+#: gram.y:364
+msgid "row or record variable cannot be NOT NULL"
+msgstr "행 또는 레코드 변수는 NOT NULL일 수 없음"
+
+#: gram.y:373
+msgid "default value for row or record variable is not supported"
+msgstr "행 또는 레코드 변수의 기본 값이 지원되지 않음"
+
+#: gram.y:522
+msgid "only positional parameters can be aliased"
+msgstr "위치 매개 변수만 별칭이 될 수 있음"
+
+#: gram.y:532
+#, c-format
+msgid "function has no parameter \"%s\""
+msgstr "함수에 \"%s\" 매개 변수가 없음"
+
+#: gram.y:560 gram.y:564 gram.y:568
+msgid "duplicate declaration"
+msgstr "중복 선언"
+
+#: gram.y:761 gram.y:765 gram.y:769
+msgid "expected an integer variable"
+msgstr "정수 변수 필요"
+
+#: gram.y:1024 gram.y:1213
+msgid ""
+"loop variable of loop over rows must be a record or row variable or list of "
+"scalar variables"
+msgstr ""
+"행에 있는 루프의 루프 변수는 레코드 또는 행 변수이거나 스칼라 변수의 목록이어"
+"야 함"
+
+#: gram.y:1061
+msgid "cursor FOR loop must have only one target variable"
+msgstr "커서 FOR 루프에 대상 변수가 한 개만 있어야 함"
+
+#: gram.y:1073
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "커서 FOR 루프는 바인딩된 커서 변수를 한 개만 사용해야 함"
+
+#: gram.y:1149
+msgid "integer FOR loop must have only one target variable"
+msgstr "정수 FOR 루프에 대상 변수가 한 개만 있어야 함"
+
+#: gram.y:1182
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "쿼리 FOR 루프에 REVERSE를 지정할 수 없음"
+
+#: gram.y:1273 gram.y:2646
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\"은(는) 스칼라 변수가 아님"
+
+#: gram.y:1326 gram.y:1366 gram.y:1410 gram.y:2202 gram.y:2293 gram.y:2953
+msgid "unexpected end of function definition"
+msgstr "예기치 않은 함수 정의의 끝"
+
+#: gram.y:1430 gram.y:1452 gram.y:1466 gram.y:1474 gram.y:1540 gram.y:1548
+#: gram.y:1562 gram.y:1637 gram.y:1802
+msgid "syntax error"
+msgstr "구문 오류"
+
+#: gram.y:1456 gram.y:1458 gram.y:1806 gram.y:1808
+msgid "invalid SQLSTATE code"
+msgstr "잘못된 SQLSTATE 코드"
+
+#: gram.y:1601 gram.y:2595 gram.y:2882
+#, c-format
+msgid "syntax error at \"%s\""
+msgstr "\"%s\"에 구문 오류가 있음"
+
+#: gram.y:1603
+msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
+msgstr "바인딩되지 않은 커서 변수의 커서를 열려면 \"FOR\"가 필요합니다."
+
+#: gram.y:1690
+msgid "cursor variable must be a simple variable"
+msgstr "커서 변수는 단순 변수여야 함"
+
+#: gram.y:1697
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "\"%s\" 변수는 커서 또는 ref 커서 형식이어야 함"
+
+#: gram.y:1704 gram.y:1708 gram.y:1712
+msgid "expected a cursor or refcursor variable"
+msgstr "커서 또는 ref 커서 변수 필요"
+
+#: gram.y:1937 gram.y:3050
+msgid "too many variables specified in SQL statement"
+msgstr "SQL 문에 지정된 변수가 너무 많음"
+
+#: gram.y:2022 gram.y:2032 gram.y:2125
+msgid "mismatched parentheses"
+msgstr "괄호의 짝이 맞지 않음"
+
+#: gram.y:2037
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "SQL 식 끝에 \"%s\" 누락"
+
+#: gram.y:2042
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "SQL 문 끝에 \"%s\" 누락"
+
+#: gram.y:2127
+msgid "incomplete data type declaration"
+msgstr "불완전한 데이터 형식 선언"
+
+#: gram.y:2152
+msgid "missing data type declaration"
+msgstr "데이터 형식 선언 누락"
+
+#: gram.y:2207
+msgid "INTO specified more than once"
+msgstr "INTO가 여러 번 지정됨"
+
+#: gram.y:2356
+msgid "expected FROM or IN"
+msgstr "FROM 또는 IN 필요"
+
+#: gram.y:2377
+msgid ""
+"RETURN cannot have a parameter in function returning set; use RETURN NEXT or "
+"RETURN QUERY"
+msgstr ""
+"RETURN은 집합을 반환하는 함수에 매개 변수를 포함할 수 없습니다. RETURN NEXT "
+"또는 RETURN QUERY를 사용하십시오."
+
+#: gram.y:2383
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr "RETURN은 OUT 매개 변수가 있는 함수에 매개 변수를 포함할 수 없음"
+
+#: gram.y:2389
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr "RETURN은 void를 반환하는 함수에 매개 변수를 포함할 수 없음"
+
+#: gram.y:2408 gram.y:2412
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr "RETURN은 행을 반환하는 함수에 레코드 또는 행 변수를 지정해야 함"
+
+#: gram.y:2445
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr "RETURN NEXT는 OUT 매개 변수가 있는 함수에 매개 변수를 포함할 수 없음"
+
+#: gram.y:2461 gram.y:2465
+msgid ""
+"RETURN NEXT must specify a record or row variable in function returning row"
+msgstr "RETURN NEXT는 행을 반환하는 함수에 레코드 또는 행 변수를 지정해야 함"
+
+#: gram.y:2528
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\"이(가) CONSTANT로 선언됨"
+
+#: gram.y:2545
+msgid "cannot assign to tg_argv"
+msgstr "tg_argv에 할당할 수 없음"
+
+#: gram.y:2596
+msgid ""
+"Expected record variable, row variable, or list of scalar variables "
+"following INTO."
+msgstr "INTO 뒤에 레코드 변수, 행 변수 또는 스칼라 변수의 목록이 필요합니다."
+
+#: gram.y:2630
+msgid "too many INTO variables specified"
+msgstr "너무 많은 INTO 변수가 지정됨"
+
+#: gram.y:2764
+#, c-format
+msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+msgstr "PL/PgSQL 함수 \"%s\"의 SQL 문(%d번째 줄 근처)"
+
+#: gram.y:2807
+#, c-format
+msgid "string literal in PL/PgSQL function \"%s\" near line %d"
+msgstr "PL/PgSQL 함수 \"%s\"의 문자열 리터럴(%d번째 줄 근처)"
+
+#: gram.y:2820
+msgid "label does not exist"
+msgstr "레이블이 없음"
+
+#: gram.y:2834
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "레이블이 없는 블록에 끝 레이블 \"%s\"이(가) 지정됨"
+
+#: gram.y:2843
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "끝 레이블 \"%s\"이(가) 블록의 \"%s\" 레이블과 다름"
+
+#: gram.y:2873
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "\"%s\" 커서에 인수가 없음"
+
+#: gram.y:2895
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "\"%s\" 커서에 인수가 있음"
+
+#: gram.y:2933
+msgid "expected \")\""
+msgstr "\")\" 필요"
+
+#: gram.y:2970
+#, c-format
+msgid "unrecognized RAISE statement option \"%s\""
+msgstr "인식할 수 없는 RAISE 문 옵션 \"%s\""
+
+#: gram.y:2975
+msgid "syntax error, expected \"=\""
+msgstr "구문 오류, \"=\" 필요"
+
+#: pl_funcs.c:359
+#, c-format
+msgid "variable \"%s\" does not exist in the current block"
+msgstr "\"%s\" 변수가 현재 블록에 없음"
+
+#: pl_funcs.c:415
+#, c-format
+msgid "unterminated \" in identifier: %s"
+msgstr "식별자의 종료되지 않은 \": %s"
+
+#: pl_funcs.c:439
+#, c-format
+msgid "qualified identifier cannot be used here: %s"
+msgstr "정규화된 식별자를 여기에 사용할 수 없음: %s"
+
+#: pl_funcs.c:471
+msgid "statement block"
+msgstr "문 블록"
+
+#: pl_funcs.c:473
+msgid "assignment"
+msgstr "할당"
+
+#: pl_funcs.c:483
+msgid "FOR with integer loop variable"
+msgstr "정수 루프 변수를 포함하는 FOR"
+
+#: pl_funcs.c:485
+msgid "FOR over SELECT rows"
+msgstr "SELECT 행을 제어하는 FOR"
+
+#: pl_funcs.c:487
+msgid "FOR over cursor"
+msgstr "커서를 제어하는 FOR"
+
+#: pl_funcs.c:499
+msgid "SQL statement"
+msgstr "SQL 문"
+
+#: pl_funcs.c:501
+msgid "EXECUTE statement"
+msgstr "EXECUTE 문"
+
+#: pl_funcs.c:503
+msgid "FOR over EXECUTE statement"
+msgstr "EXECUTE 문을 제어하는 FOR"
+
+#: scan.l:263
+msgid "unterminated quoted identifier"
+msgstr "마무리 안된 따옴표 안의 식별자"
+
+# # advance 끝
+#: scan.l:306
+msgid "unterminated /* comment"
+msgstr "마무리 안된 /* 주석"
+
+#: scan.l:342
+msgid "unterminated quoted string"
+msgstr "마무리 안된 따옴표 안의 문자열"
+
+#: scan.l:382
+msgid "unterminated dollar-quoted string"
+msgstr "마무리 안된 달러-따옴표 안의 문자열"
+
+#. translator: %s is typically the translation of "syntax error"
+#: scan.l:446
+#, c-format
+msgid "%s at end of input"
+msgstr "%s, 입력 끝부분"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: scan.l:455
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s, \"%s\" 부근"
diff --git a/src/pl/plpgsql/src/po/pt_BR.po b/src/pl/plpgsql/src/po/pt_BR.po
new file mode 100644
index 00000000000..0c5930792fc
--- /dev/null
+++ b/src/pl/plpgsql/src/po/pt_BR.po
@@ -0,0 +1,669 @@
+# Brazilian Portuguese message translation file for plpgsql
+# Copyright (C) 2010 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.0\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-07-26 15:54-0300\n"
+"PO-Revision-Date: 2010-07-08 17:13-0300\n"
+"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
+"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n>1);\n"
+
+#: pl_comp.c:422 pl_handler.c:256
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "funções PL/pgSQL não podem aceitar tipo %s"
+
+#: pl_comp.c:501
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr ""
+"não pôde determinar tipo de retorno atual para função polimófica \"%s\""
+
+#: pl_comp.c:531
+msgid "trigger functions can only be called as triggers"
+msgstr "funções de gatilho só podem ser chamadas como gatilhos"
+
+#: pl_comp.c:535 pl_handler.c:241
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "funções PL/pgSQL não podem retornar tipo %s"
+
+#: pl_comp.c:576
+msgid "trigger functions cannot have declared arguments"
+msgstr "funções de gatilho não podem ter argumentos declarados"
+
+#: pl_comp.c:577
+msgid ""
+"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
+"instead."
+msgstr ""
+"Os argumentos de um gatilho podem ser acessados através de TG_NARGS e "
+"TG_ARGV."
+
+#: pl_comp.c:880
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "compilação da função PL/pgSQL \"%s\" próximo a linha %d"
+
+#: pl_comp.c:978
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "referência à coluna \"%s\" é ambígua"
+
+#: pl_comp.c:980
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr "Ela poderia referenciar uma variável PL/pgSQL ou uma coluna de tabela."
+
+#: pl_comp.c:1690
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "relação \"%s\" não existe"
+
+#: pl_comp.c:1722
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "relação \"%s.%s\" não existe"
+
+#: pl_comp.c:1804
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "variável \"%s\" tem pseudo-tipo %s"
+
+#: pl_comp.c:1865
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "relação \"%s\" não é uma tabela"
+
+#: pl_comp.c:2017
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "tipo \"%s\" é indefinido"
+
+#: pl_comp.c:2087 pl_comp.c:2140
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "condição de exceção \"%s\" é desconhecida"
+
+#: pl_comp.c:2295
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr ""
+"não pôde determinar tipo do argumento atual para função polimórfica \"%s\""
+
+#: pl_exec.c:236 pl_exec.c:511
+msgid "during initialization of execution state"
+msgstr "durante inicialização de estado de execução"
+
+#: pl_exec.c:243
+msgid "while storing call arguments into local variables"
+msgstr "ao armazenar argumentos em variáveis locais"
+
+#: pl_exec.c:298 pl_exec.c:666
+msgid "during function entry"
+msgstr "durante entrada da função"
+
+#: pl_exec.c:329 pl_exec.c:697
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "CONTINUE não pode ser utilizado fora de um laço"
+
+#: pl_exec.c:333 pl_exec.c:701
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr ""
+"RAISE sem parâmetros não pode ser utilizado fora de um manipulador de exceção"
+
+#: pl_exec.c:337
+msgid "control reached end of function without RETURN"
+msgstr "controle atingiu o fim da função sem RETURN"
+
+#: pl_exec.c:344
+msgid "while casting return value to function's return type"
+msgstr "ao converter valor de retorno para tipo de retorno da função"
+
+#: pl_exec.c:357 pl_exec.c:2400
+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"
+
+#: pl_exec.c:395
+msgid "returned record type does not match expected record type"
+msgstr "tipo record retornado não corresponde ao tipo record esperado"
+
+#: pl_exec.c:453 pl_exec.c:709
+msgid "during function exit"
+msgstr "durante saída da função"
+
+#: pl_exec.c:705
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "controle atingiu o fim da função de gatilho sem RETURN"
+
+#: pl_exec.c:714
+msgid "trigger procedure cannot return a set"
+msgstr "função de gatilho não pode retornar um conjunto"
+
+#: pl_exec.c:736
+msgid ""
+"returned row structure does not match the structure of the triggering table"
+msgstr ""
+"estrutura de registro retornada não corresponde a estrutura da tabela que "
+"disparou o evento"
+
+#: pl_exec.c:799
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "função PL/pgSQL \"%s\" linha %d %s"
+
+#: pl_exec.c:810
+#, c-format
+msgid "PL/pgSQL function \"%s\" %s"
+msgstr "função PL/pgSQL \"%s\" %s"
+
+#. translator: last %s is a plpgsql statement type name
+#: pl_exec.c:818
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "função PL/pgSQL \"%s\" linha %d em %s"
+
+#: pl_exec.c:824
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "função PL/pgSQL \"%s\""
+
+#: pl_exec.c:932
+msgid "during statement block local variable initialization"
+msgstr "durante inicialização de variável local em bloco de comandos"
+
+#: pl_exec.c:974
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr "variável \"%s\" declarada NOT NULL não pode ter valor padrão NULL"
+
+#: pl_exec.c:1023
+msgid "during statement block entry"
+msgstr "durante entrada em bloco de comandos"
+
+#: pl_exec.c:1044
+msgid "during statement block exit"
+msgstr "durante saída em bloco de comandos"
+
+#: pl_exec.c:1087
+msgid "during exception cleanup"
+msgstr "durante término de exceção"
+
+#: pl_exec.c:1553
+msgid "case not found"
+msgstr "case não foi encontrado"
+
+#: pl_exec.c:1554
+msgid "CASE statement is missing ELSE part."
+msgstr "comando CASE está faltando a parte ELSE."
+
+#: pl_exec.c:1710
+msgid "lower bound of FOR loop cannot be null"
+msgstr "limite inferior do laço FOR não pode ser nulo"
+
+#: pl_exec.c:1725
+msgid "upper bound of FOR loop cannot be null"
+msgstr "limite superior do laço FOR não pode ser nulo"
+
+#: pl_exec.c:1742
+msgid "BY value of FOR loop cannot be null"
+msgstr "valor BY do laço FOR não pode ser nulo"
+
+#: pl_exec.c:1748
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "valor BY do laço FOR deve ser maior do que zero"
+
+#: pl_exec.c:1920 pl_exec.c:3182
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "cursor \"%s\" já está em uso"
+
+#: pl_exec.c:1943 pl_exec.c:3244
+msgid "arguments given for cursor without arguments"
+msgstr "argumentos fornecidos a cursor sem argumentos"
+
+#: pl_exec.c:1962 pl_exec.c:3263
+msgid "arguments required for cursor"
+msgstr "argumentos requeridos pelo cursor"
+
+#: pl_exec.c:2184 gram.y:2729
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr ""
+"não pode utilizar RETURN NEXT em uma função que não foi declarada SETOF"
+
+#: pl_exec.c:2208 pl_exec.c:2274
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "tipo resultante incorreto foi fornecido em 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
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "registro \"%s\" não foi atribuído ainda"
+
+#: 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
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr "A estrutura da tupla de um registro não atribuído é indeterminada."
+
+#: pl_exec.c:2236 pl_exec.c:2255
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr "tipo registro incorreto foi fornecido em RETURN NEXT"
+
+#: pl_exec.c:2297
+msgid "RETURN NEXT must have a parameter"
+msgstr "RETURN NEXT deve ter um parâmetro"
+
+#: pl_exec.c:2328 gram.y:2788
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr ""
+"não pode utilizar RETURN QUERY em uma função que não foi declarada SETOF"
+
+#: pl_exec.c:2348
+msgid "structure of query does not match function result type"
+msgstr "estrutura da consulta não corresponde ao tipo resultante da função"
+
+#: pl_exec.c:2480
+msgid "too few parameters specified for RAISE"
+msgstr "poucos parâmetros especificados para RAISE"
+
+#: pl_exec.c:2506
+msgid "too many parameters specified for RAISE"
+msgstr "muitos parâmetros especificados para RAISE"
+
+#: pl_exec.c:2526
+msgid "RAISE statement option cannot be null"
+msgstr "opção do comando RAISE não pode ser nulo"
+
+#: pl_exec.c:2536 pl_exec.c:2545 pl_exec.c:2553 pl_exec.c:2561
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "opção RAISE já foi especificada: %s"
+
+#: pl_exec.c:2596 pl_exec.c:2597
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pl_exec.c:2743 pl_exec.c:3047
+msgid "cannot COPY to/from client in PL/pgSQL"
+msgstr "não pode executar COPY para/do cliente em PL/pgSQL"
+
+#: pl_exec.c:2747 pl_exec.c:3051
+msgid "cannot begin/end transactions in PL/pgSQL"
+msgstr "não pode iniciar/terminar transações em PL/pgSQL"
+
+#: pl_exec.c:2748 pl_exec.c:3052
+msgid "Use a BEGIN block with an EXCEPTION clause instead."
+msgstr "Ao invés disso utilize um bloco BEGIN com uma cláusula EXCEPTION."
+
+#: pl_exec.c:2896 pl_exec.c:3076
+msgid "INTO used with a command that cannot return data"
+msgstr "INTO utilizado com um comando que não pode retornar dados"
+
+#: pl_exec.c:2916 pl_exec.c:3096
+msgid "query returned no rows"
+msgstr "consulta não retornou registros"
+
+#: pl_exec.c:2925 pl_exec.c:3105
+msgid "query returned more than one row"
+msgstr "consulta retornou mais de um registro"
+
+#: pl_exec.c:2939
+msgid "query has no destination for result data"
+msgstr "consulta não tem destino para os dados resultantes"
+
+#: pl_exec.c:2940
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr "Se você quer descartar os resultados de um SELECT, utilize PERFORM."
+
+#: pl_exec.c:2973 pl_exec.c:5547
+msgid "query string argument of EXECUTE is null"
+msgstr "argumento da cadeia de caracteres do EXECUTE é nulo"
+
+#: pl_exec.c:3038
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "EXECUTE de SELECT ... INTO não está implementado"
+
+#: pl_exec.c:3039
+msgid "You might want to use EXECUTE ... INTO instead."
+msgstr "Ao invés disso, você pode querer utilizar EXECUTE ... INTO."
+
+#: pl_exec.c:3327 pl_exec.c:3418
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "variável do cursor \"%s\" é nula"
+
+#: pl_exec.c:3334 pl_exec.c:3425
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "cursor \"%s\" não existe"
+
+#: pl_exec.c:3348
+msgid "relative or absolute cursor position is null"
+msgstr "posição relativa ou absoluta do cursor é nula"
+
+#: pl_exec.c:3485
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr "valor nulo não pode ser atribuído a variável \"%s\" declarada NOT NULL"
+
+#: pl_exec.c:3543
+msgid "cannot assign non-composite value to a row variable"
+msgstr "não pode atribuir valor que não é composto a variável do tipo row"
+
+#: pl_exec.c:3585
+msgid "cannot assign non-composite value to a record variable"
+msgstr "não pode atribuir valor que não é composto a variável do tipo record"
+
+#: 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 "registro \"%s\" não tem campo \"%s\""
+
+#: pl_exec.c:3743
+#, 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)"
+
+#: pl_exec.c:3757
+msgid "subscripted object is not an array"
+msgstr "objeto com índice não é uma matriz"
+
+#: pl_exec.c:3780
+msgid "array subscript in assignment must not be null"
+msgstr "índice da matriz em atribuição não deve ser nulo"
+
+#: pl_exec.c:4161
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "consulta \"%s\" não retornou dados"
+
+#: pl_exec.c:4169
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "consulta \"%s\" retornou %d coluna"
+msgstr[1] "consulta \"%s\" retornou %d colunas"
+
+#: pl_exec.c:4195
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "consulta \"%s\" retornou mais do que um registro"
+
+#: pl_exec.c:4253
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "consulta \"%s\" não é um SELECT"
+
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr "rótulo de bloco deve estar localizado antes do DECLARE e não depois"
+
+#: gram.y:441
+msgid "row or record variable cannot be CONSTANT"
+msgstr "variável do tipo row ou record não pode ser CONSTANT"
+
+#: gram.y:451
+msgid "row or record variable cannot be NOT NULL"
+msgstr "variável do tipo row ou record não pode ser NOT NULL"
+
+#: gram.y:462
+msgid "default value for row or record variable is not supported"
+msgstr "valor padrão para variável do tipo row ou record não é suportado"
+
+#: gram.y:606 gram.y:632
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "variável \"%s\" não existe"
+
+#: gram.y:650 gram.y:663
+msgid "duplicate declaration"
+msgstr "declaração duplicada"
+
+#: gram.y:841
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "item de GET DIAGNOSTICS desconhecido"
+
+#: gram.y:852 gram.y:2975
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" não é uma variável escalar"
+
+#: gram.y:1114 gram.y:1306
+msgid ""
+"loop variable of loop over rows must be a record or row variable or list of "
+"scalar variables"
+msgstr ""
+"variável de laço sobre registros deve ser uma variável do tipo record ou row "
+"or lista de variáveis escalares"
+
+#: gram.y:1148
+msgid "cursor FOR loop must have only one target variable"
+msgstr "cursor do laço FOR deve ter somente uma variável alvo"
+
+#: gram.y:1155
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "cursor do laço FOR deve utilizar uma variável cursor limitado"
+
+#: gram.y:1238
+msgid "integer FOR loop must have only one target variable"
+msgstr "inteiro do laço FOR deve ter somente uma variável alvo"
+
+#: gram.y:1273
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "não pode especificar REVERSE na consulta do laço FOR"
+
+#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
+#: gram.y:3249
+msgid "unexpected end of function definition"
+msgstr "fim de definição da função inesperado"
+
+#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1652 gram.y:1759
+#: gram.y:1936 gram.y:2015 gram.y:2128 gram.y:2706 gram.y:2770 gram.y:3209
+#: gram.y:3230
+msgid "syntax error"
+msgstr "erro de sintaxe"
+
+#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
+msgid "invalid SQLSTATE code"
+msgstr "código SQLSTATE inválido"
+
+#: gram.y:1706
+msgid "syntax error, expected \"FOR\""
+msgstr "erro de sintaxe, \"FOR\" esperado"
+
+#: gram.y:1768
+msgid "FETCH statement cannot return multiple rows"
+msgstr "comando FETCH não pode retornar múltiplos registros"
+
+#: gram.y:1824
+msgid "cursor variable must be a simple variable"
+msgstr "variável do cursor deve ser uma variável simples"
+
+#: gram.y:1830
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "variável \"%s\" deve ser do tipo cursor ou refcursor"
+
+#: gram.y:1994
+msgid "label does not exist"
+msgstr "rótulo não existe"
+
+#: gram.y:2099 gram.y:2110
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" não é uma variável conhecida"
+
+#: gram.y:2212 gram.y:2222 gram.y:2350
+msgid "mismatched parentheses"
+msgstr "parênteses não correspondem"
+
+#: gram.y:2226
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "faltando \"%s\" ao fim da expressão SQL"
+
+#: gram.y:2232
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "faltando \"%s\" ao fim do comando SQL"
+
+#: gram.y:2249
+msgid "missing expression"
+msgstr "faltando expressão"
+
+#: gram.y:2251
+msgid "missing SQL statement"
+msgstr "faltando comando SQL"
+
+#: gram.y:2352
+msgid "incomplete data type declaration"
+msgstr "declaração de tipo de dado incompleta"
+
+#: gram.y:2374
+msgid "missing data type declaration"
+msgstr "faltando declaração de tipo de dado"
+
+#: gram.y:2430
+msgid "INTO specified more than once"
+msgstr "INTO especificado mais de uma vez"
+
+#: gram.y:2598
+msgid "expected FROM or IN"
+msgstr "FROM ou IN esperado"
+
+#: gram.y:2658
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "RETURN não pode ter um parâmetro na função que retorna conjunto"
+
+#: gram.y:2659
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "Utilize RETURN NEXT ou RETURN QUERY."
+
+#: gram.y:2667
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr "RETURN não pode ter um parâmetro na função com parâmetros OUT"
+
+#: gram.y:2676
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr "RETURN não pode ter um parâmetro na função que retorna void"
+
+#: gram.y:2694 gram.y:2701
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr ""
+"RETURN deve especificar uma variável do tipo record ou row na função que "
+"retorna registro"
+
+#: gram.y:2743
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr "RETURN NEXT não pode ter um parâmetro na função com parâmetros OUT"
+
+#: gram.y:2758 gram.y:2765
+msgid ""
+"RETURN NEXT must specify a record or row variable in function returning row"
+msgstr ""
+"RETURN NEXT deve especificar uma variável do tipo record ou row na função "
+"que retorna registro"
+
+#: gram.y:2844
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\" está declarado CONSTANT"
+
+#: gram.y:2906 gram.y:2918
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr "variável do tipo record ou row não pode ser parte de uma lista INTO de múltiplos itens"
+
+#: gram.y:2963
+msgid "too many INTO variables specified"
+msgstr "muitas variáveis INTO especificadas"
+
+#: gram.y:3170
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "rótulo de fim \"%s\" especificado para bloco sem rótulo"
+
+#: gram.y:3177
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "rótulo de fim \"%s\" difere de rótulo do bloco \"%s\""
+
+#: gram.y:3204
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "cursor \"%s\" não tem argumentos"
+
+#: gram.y:3218
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "cursor \"%s\" tem argumentos"
+
+#: gram.y:3266
+msgid "unrecognized RAISE statement option"
+msgstr "opção do comando RAISE desconhecida"
+
+#: gram.y:3270
+msgid "syntax error, expected \"=\""
+msgstr "erro de sintaxe, \"=\" esperado"
+
+#: pl_funcs.c:216
+msgid "statement block"
+msgstr "bloco de comandos"
+
+#: pl_funcs.c:218
+msgid "assignment"
+msgstr "atribuição"
+
+#: pl_funcs.c:228
+msgid "FOR with integer loop variable"
+msgstr "FOR com variável de laço inteira"
+
+#: pl_funcs.c:230
+msgid "FOR over SELECT rows"
+msgstr "FOR sobre registros de SELECT"
+
+#: pl_funcs.c:232
+msgid "FOR over cursor"
+msgstr "FOR sobre cursor"
+
+#: pl_funcs.c:244
+msgid "SQL statement"
+msgstr "comando SQL"
+
+#: pl_funcs.c:246
+msgid "EXECUTE statement"
+msgstr "comando EXECUTE"
+
+#: pl_funcs.c:248
+msgid "FOR over EXECUTE statement"
+msgstr "FOR sobre comando EXECUTE"
+
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr "Define resolução de conflitos entre nomes de variáveis PL/pgSQL e nomes de colunas de tabelas."
+
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:463
+#, c-format
+msgid "%s at end of input"
+msgstr "%s no fim da entrada"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:479
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s em ou próximo a \"%s\""
diff --git a/src/pl/plpgsql/src/po/ro.po b/src/pl/plpgsql/src/po/ro.po
index d3e97de7834..28367010621 100644
--- a/src/pl/plpgsql/src/po/ro.po
+++ b/src/pl/plpgsql/src/po/ro.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-02-19 09:23+0000\n"
-"PO-Revision-Date: 2009-02-19 22:16-0000\n"
-"Last-Translator: Gheorghe Rosca Codreanu <max@oceanline.co.uk>\n"
+"POT-Creation-Date: 2010-09-04 19:58+0000\n"
+"PO-Revision-Date: 2010-09-27 22:19-0000\n"
+"Last-Translator: Max <max@oceanline.co.uk>\n"
 "Language-Team: ROMÂNĂ <max@oceanline.co.uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,8 +17,8 @@ msgstr ""
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
 
-#: pl_comp.c:418
-#: pl_handler.c:177
+#: pl_comp.c:422
+#: pl_handler.c:256
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "funcţiile PL/pgSQL nu pot accepta tipul %s"
@@ -28,742 +28,787 @@ msgstr "funcţiile PL/pgSQL nu pot accepta tipul %s"
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "nu pot determina tipul de dată returnat pentru funcţia polimorfică  \"%s\""
 
-#: pl_comp.c:533
+#: pl_comp.c:531
 msgid "trigger functions can only be called as triggers"
 msgstr "funcţiile trigger pot fi apelate doar ca triggere"
 
-#: pl_comp.c:537
-#: pl_handler.c:162
+#: pl_comp.c:535
+#: pl_handler.c:241
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "funcţiile PL/pgSQL nu pot returna tipul %s"
 
-#: pl_comp.c:578
+#: pl_comp.c:576
 msgid "trigger functions cannot have declared arguments"
 msgstr "funcţiile trigger nu pot avea argumente declarate"
 
-#: pl_comp.c:579
+#: pl_comp.c:577
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr "Argumentele trigger-ului pot fi accesate cu ajutorul TG_NARGS și  TG_ARGV."
 
-#: pl_comp.c:769
+#: pl_comp.c:880
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilarea funcțiee PL/pgSQL \"%s\" aproape de linia %d"
 
-#: pl_comp.c:804
-msgid "expected \"[\""
-msgstr "este așteptat \"[\""
-
-#: pl_comp.c:942
+#: pl_comp.c:978
 #, c-format
-msgid "row \"%s\" has no field \"%s\""
-msgstr "rândul \"%s\" nu are nici un câmp \"%s\""
+msgid "column reference \"%s\" is ambiguous"
+msgstr "referința coloanei \"%s\" este ambiguă"
 
-#: pl_comp.c:1044
-#, c-format
-msgid "row \"%s.%s\" has no field \"%s\""
-msgstr "rândul \"%s.%s\" nu are nici un câmp \"%s\""
+#: pl_comp.c:980
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr "Se poate referi la o variabilă PL/pgSQL sau la o coloană a unei tabele."
 
-#: pl_comp.c:1356
+#: pl_comp.c:1690
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "relaţia \"%s\" nu există"
 
-#: pl_comp.c:1401
+#: pl_comp.c:1722
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "relaţia \"%s.%s\" nu există"
 
-#: pl_comp.c:1484
+#: pl_comp.c:1804
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "variabila  \"%s\" are pseudo-tipul %s"
 
-#: pl_comp.c:1545
+#: pl_comp.c:1865
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "relaţia \"%s\" nu este o tabelă"
 
-#: pl_comp.c:1718
+#: pl_comp.c:2017
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "tipul \"%s\" este doar un shell"
 
-#: pl_comp.c:1788
-#: pl_comp.c:1841
+#: pl_comp.c:2087
+#: pl_comp.c:2140
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condiţia excepției \"%s\" nu este recunoscută"
 
-#: pl_comp.c:1996
+#: pl_comp.c:2295
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "nu pot determina tipul de dată returnat pentru funcţia polimorfică  \"%s\""
 
-#: pl_exec.c:234
-#: pl_exec.c:505
+#: pl_exec.c:236
+#: pl_exec.c:511
 msgid "during initialization of execution state"
 msgstr "în timpul inițializării stării de execuție"
 
-#: pl_exec.c:241
-#: pl_exec.c:632
+#: pl_exec.c:243
 msgid "while storing call arguments into local variables"
 msgstr "în timpul stocării argumentelor de apelare în variabile locale"
 
-#: pl_exec.c:296
-#: pl_exec.c:643
+#: pl_exec.c:298
+#: pl_exec.c:666
 msgid "during function entry"
 msgstr "în timpul intrării în funcție"
 
-#: pl_exec.c:327
-#: pl_exec.c:674
+#: pl_exec.c:329
+#: pl_exec.c:697
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE nu poate fi folosit în afara unei bucle"
 
-#: pl_exec.c:331
-#: pl_exec.c:678
+#: pl_exec.c:333
+#: pl_exec.c:701
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "RAISE fără parametri nu poate fi folosit în afara unui gestionar de excepții - exception handler"
 
-#: pl_exec.c:335
+#: pl_exec.c:337
 msgid "control reached end of function without RETURN"
 msgstr "controlul a ajuns la sfârșitul funcției fără a întâlni comanda RETURN"
 
-#: pl_exec.c:342
+#: pl_exec.c:344
 msgid "while casting return value to function's return type"
 msgstr "în timpul transformării valorii returnate în tipul de dată returnat de funcție"
 
-#: pl_exec.c:355
-#: pl_exec.c:2351
+#: pl_exec.c:357
+#: pl_exec.c:2403
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "funcţie set-valoare apelată într-un context care nu acceptă set"
 
-#: pl_exec.c:390
+#: pl_exec.c:395
 msgid "returned record type does not match expected record type"
 msgstr "tipul înregistrării returnate nu se potrivește cu tipul înregistrării așteptat"
 
-#: pl_exec.c:446
-#: pl_exec.c:686
+#: pl_exec.c:453
+#: pl_exec.c:709
 msgid "during function exit"
 msgstr "în timpul ieșirii din fucție"
 
-#: pl_exec.c:682
+#: pl_exec.c:705
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "controlul a ajuns la sfârșitul trigger-ului fără a întâlni comanda RETURN"
 
-#: pl_exec.c:691
+#: pl_exec.c:714
 msgid "trigger procedure cannot return a set"
 msgstr "o procedură trigger nu poate returna un set"
 
-#: pl_exec.c:709
+#: pl_exec.c:736
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr "structura rândului nu se potrivește cu structura tabelei carea a activat triggerul"
 
-#. translator: last %s is a phrase such as "during statement block local variable initialization"
-#: pl_exec.c:769
+#: pl_exec.c:799
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "PL/pgSQL funcție  \"%s\" linie %d %s"
 
-#. translator: last %s is a phrase such as "while storing call arguments into local variables"
-#: pl_exec.c:777
+#: pl_exec.c:810
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "PL/pgSQL funcție \"%s\" %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:785
+#: pl_exec.c:818
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "PL/pgSQL funcție \"%s\" linie %d la %s"
 
-#: pl_exec.c:791
+#: pl_exec.c:824
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "PL/pgSQL funcție \"%s\""
 
-#: pl_exec.c:900
+#: pl_exec.c:932
 msgid "during statement block local variable initialization"
 msgstr "în timpul inițializării variabilei locale în blocul de comenzi"
 
-#: pl_exec.c:942
+#: pl_exec.c:974
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "variabila \"%s\" declarată NOT NULL nu poate fi avea valoare predefinită ca NULL"
 
-#: pl_exec.c:990
+#: pl_exec.c:1023
 msgid "during statement block entry"
 msgstr "în timpul intrării în blocul de comenzi"
 
-#: pl_exec.c:1011
+#: pl_exec.c:1044
 msgid "during statement block exit"
 msgstr "în timpul ieșirii din blocul de comenzi"
 
-#: pl_exec.c:1053
+#: pl_exec.c:1087
 msgid "during exception cleanup"
 msgstr "în timpul operaţiei de curăţare, a excepţiei "
 
-#: pl_exec.c:1517
+#: pl_exec.c:1556
 msgid "case not found"
 msgstr "caz negăsit"
 
-#: pl_exec.c:1518
+#: pl_exec.c:1557
 msgid "CASE statement is missing ELSE part."
 msgstr "comandă CASE fără partea ELSE."
 
-#: pl_exec.c:1674
+#: pl_exec.c:1713
 msgid "lower bound of FOR loop cannot be null"
 msgstr "limita de jos a unei bucle FOR nu poate fi NULL"
 
-#: pl_exec.c:1689
+#: pl_exec.c:1728
 msgid "upper bound of FOR loop cannot be null"
 msgstr "limita de sus a unei bucle FOR nu poate fi NULL"
 
-#: pl_exec.c:1706
+#: pl_exec.c:1745
 msgid "BY value of FOR loop cannot be null"
 msgstr "BY valoare într-o buclă FOR nu poate fi NULL"
 
-#: pl_exec.c:1712
+#: pl_exec.c:1751
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "BY valoare într-o buclă FOR trebuie să fie mai mare ca zero"
 
-#: pl_exec.c:1884
-#: pl_exec.c:3122
+#: pl_exec.c:1923
+#: pl_exec.c:3188
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "cursor \"%s\" deja în uz"
 
-#: pl_exec.c:1907
-#: pl_exec.c:3216
+#: pl_exec.c:1946
+#: pl_exec.c:3250
 msgid "arguments given for cursor without arguments"
 msgstr "argumente transmise unui cursor ce nu primeşte argumente"
 
-#: pl_exec.c:1926
-#: pl_exec.c:3235
+#: pl_exec.c:1965
+#: pl_exec.c:3269
 msgid "arguments required for cursor"
 msgstr "argumente necesare pentru cursor"
 
-#: pl_exec.c:2144
-#: gram.y:2404
+#: pl_exec.c:2187
+#: gram.y:2744
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "RETURN NEXT nu poate fi folosit într-o funcţie de tip non-SETOF"
 
-#: pl_exec.c:2168
-#: pl_exec.c:2228
+#: pl_exec.c:2211
+#: pl_exec.c:2277
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "rezultat cu tip de dată greșit, furnizat în RETURN NEXT"
 
-#: pl_exec.c:2191
-#: pl_exec.c:3606
-#: pl_exec.c:3898
-#: pl_exec.c:3937
+#: pl_exec.c:2233
+#: pl_exec.c:3642
+#: pl_exec.c:3948
+#: pl_exec.c:3982
+#: pl_exec.c:4044
+#: pl_exec.c:4063
+#: pl_exec.c:4100
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "înregistrarea \"%s\" nu este atribuită încă"
 
-#: pl_exec.c:2193
-#: pl_exec.c:3608
-#: pl_exec.c:3900
-#: pl_exec.c:3939
+#: pl_exec.c:2235
+#: pl_exec.c:3644
+#: pl_exec.c:3950
+#: pl_exec.c:3984
+#: pl_exec.c:4046
+#: pl_exec.c:4065
+#: pl_exec.c:4102
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "Structura tuplului unei înregistrări încă-ne-atribuită  nu poate fi determinată"
 
-#: pl_exec.c:2196
-#: pl_exec.c:2209
+#: pl_exec.c:2239
+#: pl_exec.c:2258
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "tipul  înregistrării furnizat în RETURN NEXT este greşit"
 
-#: pl_exec.c:2253
+#: pl_exec.c:2300
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT trebuie să aibă un parametru"
 
-#: pl_exec.c:2285
-#: gram.y:2451
+#: pl_exec.c:2331
+#: gram.y:2803
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "RETURN QUERY nu pote fi folosit într-o funcție non-SETOF"
 
-#: pl_exec.c:2304
+#: pl_exec.c:2351
 msgid "structure of query does not match function result type"
 msgstr "structura interogării nu se potriveşte cu tipul rezultatului funcţiei"
 
-#: pl_exec.c:2421
+#: pl_exec.c:2483
 msgid "too few parameters specified for RAISE"
 msgstr "prea puțini parametri specificați pentru RAISE"
 
-#: pl_exec.c:2447
+#: pl_exec.c:2509
 msgid "too many parameters specified for RAISE"
 msgstr "prea mulți parametri specificați pentru RAISE"
 
-#: pl_exec.c:2467
+#: pl_exec.c:2529
 msgid "RAISE statement option cannot be null"
 msgstr "opţiunea comenzii RAISE nu poate fi NULL"
 
-#: pl_exec.c:2477
-#: pl_exec.c:2486
-#: pl_exec.c:2494
-#: pl_exec.c:2502
+#: pl_exec.c:2539
+#: pl_exec.c:2548
+#: pl_exec.c:2556
+#: pl_exec.c:2564
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "opțiune RAISE deja specificată: %s"
 
-#: pl_exec.c:2537
-#: pl_exec.c:2538
-#: pl_exec.c:5131
-#: pl_exec.c:5136
-#: pl_exec.c:5145
+#: pl_exec.c:2599
+#: pl_exec.c:2600
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2680
-#: pl_exec.c:2986
+#: pl_exec.c:2749
+#: pl_exec.c:3053
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "COPY la/de la un client nu poate fi folosită în PL/pgSQL"
 
-#: pl_exec.c:2684
-#: pl_exec.c:2990
+#: pl_exec.c:2753
+#: pl_exec.c:3057
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "nu pot începe/termina tranzacții în PL/pgSQL"
 
-#: pl_exec.c:2685
-#: pl_exec.c:2991
+#: pl_exec.c:2754
+#: pl_exec.c:3058
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Folosiți, în loc, blocul BEGIN cu clauza EXCEPTION "
 
-#: pl_exec.c:2836
-#: pl_exec.c:3015
+#: pl_exec.c:2902
+#: pl_exec.c:3082
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO utilizat într-o comandă care nu poate returna date"
 
-#: pl_exec.c:2856
-#: pl_exec.c:3035
+#: pl_exec.c:2922
+#: pl_exec.c:3102
 msgid "query returned no rows"
 msgstr "interogarea nu a rezultat nici un rând"
 
-#: pl_exec.c:2865
-#: pl_exec.c:3044
+#: pl_exec.c:2931
+#: pl_exec.c:3111
 msgid "query returned more than one row"
 msgstr "interogarea a rezultat mai mult de un rând"
 
-#: pl_exec.c:2879
+#: pl_exec.c:2945
 msgid "query has no destination for result data"
 msgstr "interogarea nu are destinaţie pentru datele rezultate"
 
-#: pl_exec.c:2880
+#: pl_exec.c:2946
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Dacă doriți să renunțați la rezultatul unui SELECT, folosiți PERFORM în loc."
 
-#: pl_exec.c:2913
-#: pl_exec.c:3163
-#: pl_exec.c:5399
+#: pl_exec.c:2979
+#: pl_exec.c:5602
 msgid "query string argument of EXECUTE is null"
 msgstr "comanda EXECUTE are ca parametru o expresie nulă"
 
-#: pl_exec.c:2978
+#: pl_exec.c:3044
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE of SELECT ... INTO nu este încă implementat"
 
-#: pl_exec.c:3297
-#: pl_exec.c:3393
+#: pl_exec.c:3045
+msgid "You might want to use EXECUTE ... INTO instead."
+msgstr "Posibil să doriți să utilizați, în loc, EXECUTE ... INTO."
+
+#: pl_exec.c:3333
+#: pl_exec.c:3424
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "variabila cursor \"%s\" este NULL"
 
-#: pl_exec.c:3304
-#: pl_exec.c:3400
+#: pl_exec.c:3340
+#: pl_exec.c:3431
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "cursorul \"%s\" nu există"
 
-#: pl_exec.c:3318
+#: pl_exec.c:3354
 msgid "relative or absolute cursor position is null"
 msgstr "poziţia relativă sau absolută a cursorului este NULL"
 
-#: pl_exec.c:3460
+#: pl_exec.c:3495
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "NULL nu poate fi attribuit variabilei \"%s\" declarată NOT NULL"
 
-#: pl_exec.c:3505
+#: pl_exec.c:3553
 msgid "cannot assign non-composite value to a row variable"
 msgstr "o valoare de tip non-compozit nu poate fi atribuită unei variabile de tip rând"
 
-#: pl_exec.c:3547
+#: pl_exec.c:3595
 msgid "cannot assign non-composite value to a record variable"
 msgstr "o valoare de tip non-compozit nu poate fi atribuită unei variabile de tip înregistrare"
 
-#: pl_exec.c:3619
-#: pl_exec.c:3944
+#: pl_exec.c:3655
+#: pl_exec.c:3989
+#: pl_exec.c:4070
+#: pl_exec.c:4107
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "înregistrarea \"%s\" nu are nici un câmp \"%s\""
 
-#: pl_exec.c:3717
+#: pl_exec.c:3765
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "numarul dimensiunilor array-ului  (%d)  depăşeşte maximul admis, %d"
 
-#: pl_exec.c:3731
+#: pl_exec.c:3779
 msgid "subscripted object is not an array"
 msgstr "obiectul transmis nu este un array"
 
-#: pl_exec.c:3754
+#: pl_exec.c:3802
 msgid "array subscript in assignment must not be null"
 msgstr "array-ul transmis pentru atribuire nu poate fi null"
 
-#: pl_exec.c:3860
-#: pl_exec.c:3885
-#: pl_exec.c:3922
-#, c-format
-msgid "type of \"%s\" does not match that when preparing the plan"
-msgstr "tipul pentru \"%s\" nu se potriveşte cu asta în pregatirea planului"
-
-#: pl_exec.c:3951
-#, c-format
-msgid "type of \"%s.%s\" does not match that when preparing the plan"
-msgstr "de tipul \"%s.%s\" nu pe potriveşte cu asta în timpul preparării planului"
-
-#: pl_exec.c:3976
-#, c-format
-msgid "type of tgargv[%d] does not match that when preparing the plan"
-msgstr "de tipul tgargv[%d] nu se potriveşte cu asta în timpul preparării planului"
-
-#: pl_exec.c:4069
+#: pl_exec.c:4198
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "interogarea \"%s\" nu a rezultat date"
 
-#: pl_exec.c:4086
+#: pl_exec.c:4206
+#, fuzzy, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "interogarea \"%s\" a rezultat %d coloane"
+msgstr[1] "interogarea \"%s\" a rezultat %d coloane"
+
+#: pl_exec.c:4232
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "interogarea \"%s\" a rezultat mai mult un rând"
 
-#: pl_exec.c:4091
-#, c-format
-msgid "query \"%s\" returned %d columns"
-msgstr "interogarea \"%s\" a rezultat %d coloane"
-
-#: pl_exec.c:4149
+#: pl_exec.c:4290
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "interogarea \"%s\" nu este un SELECT"
 
-#: pl_exec.c:5126
-msgid "N/A (dropped column)"
-msgstr "N/A (coloană ştearsă)"
-
-#: pl_exec.c:5137
-#, c-format
-msgid "Number of returned columns (%d) does not match expected column count (%d)."
-msgstr "Numărul coloanelor rezultate (%d) nu se potriveşte cu numărul coloanelor aşteptat (%d)."
-
-#: pl_exec.c:5146
-#, c-format
-msgid "Returned type %s does not match expected type %s in column %s."
-msgstr "Tipul de dată rezultat %s nu se potriveşte cu tipul de dată aşteptat %s în coloana %s."
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr "eticheta bloc trebuie plasată înainte de DECLARE, nu după"
 
-#: gram.y:359
+#: gram.y:441
 msgid "row or record variable cannot be CONSTANT"
 msgstr "variabila de tip rând sau înregistrare nu poate fi CONSTANT"
 
-#: gram.y:368
+#: gram.y:451
 msgid "row or record variable cannot be NOT NULL"
 msgstr "variabila de tip rând sau înregistrare nu poate fi NOT NULL"
 
-#: gram.y:377
+#: gram.y:462
 msgid "default value for row or record variable is not supported"
 msgstr "valoare predefinită pentru o variabilă de tip rând sau înregistrare nu este suportată"
 
-#: gram.y:526
-msgid "only positional parameters can be aliased"
-msgstr "doar parametrii poziționali pot avea alias"
-
-#: gram.y:536
+#: gram.y:606
+#: gram.y:632
 #, c-format
-msgid "function has no parameter \"%s\""
-msgstr "funcţia nu are nici un parametru \"%s\""
+msgid "variable \"%s\" does not exist"
+msgstr "variabila \"%s\" nu există"
+
+#: gram.y:650
+#: gram.y:663
+msgid "duplicate declaration"
+msgstr "declarație duplicată"
+
+#: gram.y:841
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "element GET DIAGNOSTICS necunoscut"
 
-#: gram.y:746
-#: gram.y:750
-#: gram.y:754
-msgid "expected an integer variable"
-msgstr "e așteptată o variabilă de tip integer"
+#: gram.y:852
+#: gram.y:2990
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" nu este o variabilă de tip scalar"
 
-#: gram.y:1009
-#: gram.y:1198
+#: gram.y:1114
+#: gram.y:1306
 msgid "loop variable of loop over rows must be a record or row variable or list of scalar variables"
 msgstr "variabila unei bucle de tip -buclă peste rânduri-  trebuie să fie o variabilă de tip înregistrare sau rând, sau o listă de variabile de tip scalar"
 
-#: gram.y:1046
+#: gram.y:1148
 msgid "cursor FOR loop must have only one target variable"
 msgstr "bucla cursor FOR trebuie sa aibă doar o variabilă ţintă"
 
-#: gram.y:1058
+#: gram.y:1155
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "bucla cursor FOR trebuie să utilizeze o variabilă de tip bound cursor"
 
-#: gram.y:1134
+#: gram.y:1238
 msgid "integer FOR loop must have only one target variable"
 msgstr "variabila de tip integer din bucla FOR trebuie să aibă o singură variabilă ţintă"
 
-#: gram.y:1167
+#: gram.y:1273
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "REVERSE nu poate fi specificat într-o interogare buclă FOR"
 
-#: gram.y:1258
-#: gram.y:2616
-#, c-format
-msgid "\"%s\" is not a scalar variable"
-msgstr "\"%s\" nu este o variabilă de tip scalar"
-
-#: gram.y:1311
-#: gram.y:1351
-#: gram.y:1395
-#: gram.y:2172
-#: gram.y:2263
-#: gram.y:2881
+#: gram.y:1420
+#: gram.y:1457
+#: gram.y:1505
+#: gram.y:2440
+#: gram.y:2521
+#: gram.y:2632
+#: gram.y:3264
 msgid "unexpected end of function definition"
 msgstr "sfârșit de definiție a funcției nerecunoscut"
 
-#: gram.y:1415
-#: gram.y:1437
-#: gram.y:1451
-#: gram.y:1459
-#: gram.y:1520
-#: gram.y:1607
-#: gram.y:1776
-#: gram.y:1780
+#: gram.y:1525
+#: gram.y:1549
+#: gram.y:1561
+#: gram.y:1568
+#: gram.y:1657
+#: gram.y:1665
+#: gram.y:1679
+#: gram.y:1774
+#: gram.y:1951
+#: gram.y:2030
+#: gram.y:2143
+#: gram.y:2721
+#: gram.y:2785
+#: gram.y:3224
+#: gram.y:3245
 msgid "syntax error"
 msgstr "eroare de sintaxă"
 
-#: gram.y:1441
-#: gram.y:1443
-#: gram.y:1784
-#: gram.y:1786
+#: gram.y:1553
+#: gram.y:1555
+#: gram.y:1955
+#: gram.y:1957
 msgid "invalid SQLSTATE code"
 msgstr "cod SQLSTATE invalid"
 
-#: gram.y:1571
-#: gram.y:2565
-#: gram.y:2810
-#, c-format
-msgid "syntax error at \"%s\""
-msgstr "eroare de sintaxă la \"%s\""
+#: gram.y:1721
+msgid "syntax error, expected \"FOR\""
+msgstr "eroare de sintaxă, așteptam \"FOR\""
 
-#: gram.y:1573
-msgid "Expected \"FOR\", to open a reference cursor."
-msgstr "este așteptat \"FOR\" pentru a deschide o referinţă cursor."
+#: gram.y:1783
+msgid "FETCH statement cannot return multiple rows"
+msgstr "comanda FETCH nu poate returna mai multe rânduri"
 
-#: gram.y:1660
+#: gram.y:1839
 msgid "cursor variable must be a simple variable"
 msgstr "variabila cursor trebuie să fie o variabilă simplă"
 
-#: gram.y:1667
+#: gram.y:1845
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "variabila \"%s\" trebuie să fie de tip cursor sau refcursor"
 
-#: gram.y:1674
-#: gram.y:1678
-#: gram.y:1682
-msgid "expected a cursor or refcursor variable"
-msgstr "aşteptam o variabilă cursor sau refcursor"
+#: gram.y:2009
+msgid "label does not exist"
+msgstr "etichetă inexistentă"
 
-#: gram.y:1907
-#: gram.y:2978
-msgid "too many variables specified in SQL statement"
-msgstr "prea multe variabile specificate in comanda SQL"
+#: gram.y:2114
+#: gram.y:2125
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" nu este o variabilă cunoscută"
 
-#: gram.y:1992
-#: gram.y:2002
-#: gram.y:2095
+#: gram.y:2227
+#: gram.y:2237
+#: gram.y:2365
 msgid "mismatched parentheses"
 msgstr "paranteze care nu se potrivesc"
 
-#: gram.y:2007
+#: gram.y:2241
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "lipsă \"%s\" la sfârșitul unei expresii SQL"
 
-#: gram.y:2012
+#: gram.y:2247
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "lipsă \"%s\" la sfârșitul unei comenzi SQL"
 
-#: gram.y:2097
+#: gram.y:2264
+msgid "missing expression"
+msgstr "expresie lipsă"
+
+#: gram.y:2266
+msgid "missing SQL statement"
+msgstr "comandă SQL incompletă"
+
+#: gram.y:2367
 msgid "incomplete data type declaration"
 msgstr "declarație incompletă pentru un tip de dată"
 
-#: gram.y:2122
+#: gram.y:2389
 msgid "missing data type declaration"
 msgstr "declarație lipsă pentru un tip de dată"
 
-#: gram.y:2177
+#: gram.y:2445
 msgid "INTO specified more than once"
 msgstr "INTO este folosit mai mult de o singură dată"
 
-#: gram.y:2326
+#: gram.y:2613
 msgid "expected FROM or IN"
 msgstr "este așteptat FROM sau IN"
 
-#: gram.y:2347
-msgid "RETURN cannot have a parameter in function returning set; use RETURN NEXT or RETURN QUERY"
-msgstr "RETURN nu poate avea un parametru în cazul unei funcții ce returnează un set; folosiți RETURN NEXT sau RETURN QUERY"
+#: gram.y:2673
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "RETURN nu poate avea un parametru în cazul unei funcții ce returnează un set"
+
+#: gram.y:2674
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "Folosiți RETURN NEXT sau RETURN QUERY."
 
-#: gram.y:2353
+#: gram.y:2682
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN nu poate avea un parametru în cazul unei funcții cu parametrii de tip OUT"
 
-#: gram.y:2359
+#: gram.y:2691
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN nu poate avea un parametru în cazul unei funcții de tip void"
 
-#: gram.y:2378
-#: gram.y:2382
+#: gram.y:2709
+#: gram.y:2716
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr "RETURN trebuie să specifice o variabilă de tip înregistrare sau rând într-o funcție ce returnează un rând"
 
-#: gram.y:2415
+#: gram.y:2758
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "RETURN NEXT nu poate avea un parametru într-o funcţie cu parametrii de tip OUT"
 
-#: gram.y:2431
-#: gram.y:2435
+#: gram.y:2773
+#: gram.y:2780
 msgid "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr "RETURN NEXT trebuie să specifice o variabilă de tip înregistrare sau rând într-o funcție ce returnează un rând"
 
-#: gram.y:2498
+#: gram.y:2859
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" este declarat CONSTANT"
 
-#: gram.y:2515
-msgid "cannot assign to tg_argv"
-msgstr "nu pot aloca la  tg_argv"
-
-#: gram.y:2566
-msgid "Expected record variable, row variable, or list of scalar variables following INTO."
-msgstr "Este așteptată variabilă de tip înregistrare, variabilă de tip rând, sau listă de variabile de tip scalar după INTO."
+#: gram.y:2921
+#: gram.y:2933
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr "variabila înregistrare sau rînd nu poate fi parte a unul element multiplu dintr-o listă INTO"
 
-#: gram.y:2600
+#: gram.y:2978
 msgid "too many INTO variables specified"
 msgstr "prea multe variabile INTO specificate"
 
-#: gram.y:2734
-#, c-format
-msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-msgstr "comandă SQL în funcția PL/PgSQL \"%s\" aproape de linia %d"
-
-#: gram.y:2748
-msgid "label does not exist"
-msgstr "etichetă inexistentă"
-
-#: gram.y:2762
+#: gram.y:3185
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "etichetă de sfârșit \"%s\" specificată pentru un bloc fără etichetă "
 
-#: gram.y:2771
+#: gram.y:3192
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "eticheta de sfârșit \"%s\" diferă față de eticheta blocului \"%s\""
 
-#: gram.y:2801
+#: gram.y:3219
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "cursorul \"%s\" nu are argumente"
 
-#: gram.y:2823
+#: gram.y:3233
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "cursorul \"%s\" are argumente"
 
-#: gram.y:2861
-msgid "expected \")\""
-msgstr "este așteptat \")\""
-
-#: gram.y:2898
-#, c-format
-msgid "unrecognized RAISE statement option \"%s\""
-msgstr "opțiune nerecunoscută a comenzii RAISE \"%s\""
+#: gram.y:3281
+msgid "unrecognized RAISE statement option"
+msgstr "opțiune nerecunoscută a comenzii RAISE"
 
-#: gram.y:2903
+#: gram.y:3285
 msgid "syntax error, expected \"=\""
 msgstr "eroare de sintaxă, expected \"=\""
 
-#: pl_funcs.c:359
-#, c-format
-msgid "variable \"%s\" does not exist in the current block"
-msgstr "variabila \"%s\" nu există in blocul curent"
-
-#: pl_funcs.c:415
-#, c-format
-msgid "unterminated \" in identifier: %s"
-msgstr "\" neterminat în identificatorul: %s"
-
-#: pl_funcs.c:439
-#, c-format
-msgid "qualified identifier cannot be used here: %s"
-msgstr "identificatorul calificat nu poate fi utilizat aici: %s"
-
-#: pl_funcs.c:471
+#: pl_funcs.c:216
 msgid "statement block"
 msgstr "bloc de comenzi"
 
-#: pl_funcs.c:473
+#: pl_funcs.c:218
 msgid "assignment"
 msgstr "atribuire"
 
-#: pl_funcs.c:483
+#: pl_funcs.c:228
 msgid "FOR with integer loop variable"
 msgstr "FOR cu variabila buclei de tip integer"
 
-#: pl_funcs.c:485
+#: pl_funcs.c:230
 msgid "FOR over SELECT rows"
 msgstr "FOR peste SELECT rânduri"
 
-#: pl_funcs.c:487
+#: pl_funcs.c:232
 msgid "FOR over cursor"
 msgstr "FOR peste cursor"
 
-#: pl_funcs.c:499
+#: pl_funcs.c:244
 msgid "SQL statement"
 msgstr "comandă SQL"
 
-#: pl_funcs.c:501
+#: pl_funcs.c:246
 msgid "EXECUTE statement"
 msgstr "comandă EXECUTE"
 
-#: pl_funcs.c:503
+#: pl_funcs.c:248
 msgid "FOR over EXECUTE statement"
 msgstr "FOR peste comandă EXECUTE"
 
-#: scan.l:232
-msgid "unterminated quoted identifier"
-msgstr "identificator în ghilimele, neterminat"
-
-#: scan.l:257
-msgid "unterminated /* comment"
-msgstr "comentariu  /* neterminat"
-
-#: scan.l:296
-msgid "unterminated quoted string"
-msgstr "șir în ghilimele, neterminat"
+#: pl_handler.c:60
+msgid "Sets handling of conflicts between PL/pgSQL variable names and table column names."
+msgstr "Stabilește modalitatea de rezolvare a conflictelor de nume dintre variabilele PL/pgSQL și coloanele tabelelor."
 
-#: scan.l:333
-msgid "unterminated dollar-quoted string"
-msgstr "șir încadrat în semnul dollar neterminat"
-
-#. translator: %s is typically "syntax error"
-#: scan.l:395
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:463
 #, c-format
 msgid "%s at end of input"
 msgstr "%s la sfârşit de intrare"
 
-#. translator: first %s is typically "syntax error"
-#: scan.l:404
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:479
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s la sau aproape de \"%s\""
 
+#~ msgid "expected \"[\""
+#~ msgstr "este așteptat \"[\""
+
+#~ msgid "row \"%s\" has no field \"%s\""
+#~ msgstr "rândul \"%s\" nu are nici un câmp \"%s\""
+
+#~ msgid "row \"%s.%s\" has no field \"%s\""
+#~ msgstr "rândul \"%s.%s\" nu are nici un câmp \"%s\""
+
+#~ msgid "type of \"%s\" does not match that when preparing the plan"
+#~ msgstr "tipul pentru \"%s\" nu se potriveşte cu asta în pregatirea planului"
+
+#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
+#~ msgstr ""
+#~ "de tipul \"%s.%s\" nu pe potriveşte cu asta în timpul preparării planului"
+
+#~ msgid "type of tgargv[%d] does not match that when preparing the plan"
+#~ msgstr ""
+#~ "de tipul tgargv[%d] nu se potriveşte cu asta în timpul preparării planului"
+
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/A (coloană ştearsă)"
+
+#~ msgid ""
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ msgstr ""
+#~ "Numărul coloanelor rezultate (%d) nu se potriveşte cu numărul coloanelor "
+#~ "aşteptat (%d)."
+
+#~ msgid "Returned type %s does not match expected type %s in column %s."
+#~ msgstr ""
+#~ "Tipul de dată rezultat %s nu se potriveşte cu tipul de dată aşteptat %s "
+#~ "în coloana %s."
+
+#~ msgid "only positional parameters can be aliased"
+#~ msgstr "doar parametrii poziționali pot avea alias"
+
+#~ msgid "function has no parameter \"%s\""
+#~ msgstr "funcţia nu are nici un parametru \"%s\""
+
+#~ msgid "expected an integer variable"
+#~ msgstr "e așteptată o variabilă de tip integer"
+
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "eroare de sintaxă la \"%s\""
+
+#~ msgid "Expected \"FOR\", to open a reference cursor."
+#~ msgstr "este așteptat \"FOR\" pentru a deschide o referinţă cursor."
+
+#~ msgid "expected a cursor or refcursor variable"
+#~ msgstr "aşteptam o variabilă cursor sau refcursor"
+
+#~ msgid "too many variables specified in SQL statement"
+#~ msgstr "prea multe variabile specificate in comanda SQL"
+
+#~ msgid ""
+#~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
+#~ "or RETURN QUERY"
+#~ msgstr ""
+#~ "RETURN nu poate avea un parametru în cazul unei funcții ce returnează un "
+#~ "set; folosiți RETURN NEXT sau RETURN QUERY"
+
+#~ msgid "cannot assign to tg_argv"
+#~ msgstr "nu pot aloca la  tg_argv"
+
+#~ msgid ""
+#~ "Expected record variable, row variable, or list of scalar variables "
+#~ "following INTO."
+#~ msgstr ""
+#~ "Este așteptată variabilă de tip înregistrare, variabilă de tip rând, sau "
+#~ "listă de variabile de tip scalar după INTO."
+
+#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "comandă SQL în funcția PL/PgSQL \"%s\" aproape de linia %d"
+
+#~ msgid "expected \")\""
+#~ msgstr "este așteptat \")\""
+
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "variabila \"%s\" nu există in blocul curent"
+
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "\" neterminat în identificatorul: %s"
+
+#~ msgid "qualified identifier cannot be used here: %s"
+#~ msgstr "identificatorul calificat nu poate fi utilizat aici: %s"
+
+#~ msgid "unterminated quoted identifier"
+#~ msgstr "identificator în ghilimele, neterminat"
+
+#~ msgid "unterminated /* comment"
+#~ msgstr "comentariu  /* neterminat"
+
+#~ msgid "unterminated quoted string"
+#~ msgstr "șir în ghilimele, neterminat"
+
+#~ msgid "unterminated dollar-quoted string"
+#~ msgstr "șir încadrat în semnul dollar neterminat"
diff --git a/src/pl/plpgsql/src/po/zh_CN.po b/src/pl/plpgsql/src/po/zh_CN.po
new file mode 100644
index 00000000000..8fe3c7a9347
--- /dev/null
+++ b/src/pl/plpgsql/src/po/zh_CN.po
@@ -0,0 +1,743 @@
+# LANGUAGE message translation file for plpgsql
+# 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.0\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-10-15 16:49+0000\n"
+"PO-Revision-Date: 2010-10-01 12:53+0800\n"
+"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
+"Language-Team: Weibin <ssmei_2000@yahoo.com>\n"
+"Language: \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"
+
+#: pl_comp.c:422 pl_handler.c:256
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "PL/pgSQL函数不使用类型%s"
+
+#: pl_comp.c:501
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr "无法确定多态函数\"%s\"的实际返回类型"
+
+#: pl_comp.c:531
+msgid "trigger functions can only be called as triggers"
+msgstr "触发器函数只能以触发器的形式调用"
+
+#: pl_comp.c:535 pl_handler.c:241
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "PL/pgSQL函数不能返回类型%s"
+
+#: pl_comp.c:576
+msgid "trigger functions cannot have declared arguments"
+msgstr "触发器函数不能有已声明的参数"
+
+#: pl_comp.c:577
+msgid ""
+"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
+"instead."
+msgstr "触发器的参数可以通过TG_NARGS和TG_ARGV进行访问."
+
+#: pl_comp.c:880
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "在第%2$d行附件编译PL/pgSQL函数\"%1$s\""
+
+#: pl_comp.c:978
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "字段关联 \"%s\" 是不明确的"
+
+#: pl_comp.c:980
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr "可以指向一个PL/pgSQL变量或表中的列"
+
+#: pl_comp.c:1690
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "关系 \"%s\" 不存在"
+
+#: pl_comp.c:1722
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "关系 \"%s.%s\" 不存在"
+
+#: pl_comp.c:1804
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "变量\"%s\"具有伪类型%s"
+
+#: pl_comp.c:1865
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "关系 \"%s\"不是一张表"
+
+#: pl_comp.c:2017
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "类型 \"%s\" 只是一个 shell"
+
+#: pl_comp.c:2087 pl_comp.c:2140
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "不可识别的异常条件\"%s\""
+
+#: pl_comp.c:2295
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr "无法确定多态函数\"%s\"的实际参数类型"
+
+#: pl_exec.c:236 pl_exec.c:511
+msgid "during initialization of execution state"
+msgstr "在执行状态的初始化期间"
+
+#: pl_exec.c:243
+msgid "while storing call arguments into local variables"
+msgstr "在将调用的参数存储到本地变量时"
+
+#: pl_exec.c:298 pl_exec.c:666
+msgid "during function entry"
+msgstr "在进入函数期间"
+
+#: pl_exec.c:329 pl_exec.c:697
+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
+msgid "control reached end of function without RETURN"
+msgstr "控制流程到达函数的结束部分，但是没有看到RETURN"
+
+#: pl_exec.c:344
+msgid "while casting return value to function's return type"
+msgstr "正在将返回值强行指派为函数的返回类型"
+
+#: pl_exec.c:357 pl_exec.c:2403
+msgid "set-valued function called in context that cannot accept a set"
+msgstr "集值函数在不接受使用集合的环境中调用"
+
+#: pl_exec.c:395
+msgid "returned record type does not match expected record type"
+msgstr "所返回的记录类型与所期待的记录类型不匹配"
+
+#: pl_exec.c:453 pl_exec.c:709
+msgid "during function exit"
+msgstr "在函数退出期间"
+
+#: pl_exec.c:705
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "控制流程到达触发器/存储过程的结束部分，但是没有看到RETURN"
+
+#: pl_exec.c:714
+msgid "trigger procedure cannot return a set"
+msgstr "触发器存储过程无法返回集合"
+
+#: pl_exec.c:736
+msgid ""
+"returned row structure does not match the structure of the triggering table"
+msgstr "所返回的记录结构与触发表的结构不匹配"
+
+#: pl_exec.c:799
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "PL/pgSQL 函数\"%s\" 在第%d行 %s"
+
+#: pl_exec.c:810
+#, 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
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "在%3$s的第%2$d行的PL/pgSQL函数\"%1$s\""
+
+#: pl_exec.c:824
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "PL/pgSQL函数 \"%s\""
+
+#: pl_exec.c:932
+msgid "during statement block local variable initialization"
+msgstr "在初始化语句块的局部变量期间"
+
+#: pl_exec.c:974
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr "声明为NOT NULL的变量\"%s\"无法将缺省值设为NULL"
+
+#: pl_exec.c:1023
+msgid "during statement block entry"
+msgstr "在进入语句块期间"
+
+#: pl_exec.c:1044
+msgid "during statement block exit"
+msgstr "在退出语句块期间"
+
+#: pl_exec.c:1087
+msgid "during exception cleanup"
+msgstr "在清理异常期间"
+
+#: pl_exec.c:1556
+msgid "case not found"
+msgstr "没有找到CASE"
+
+#: pl_exec.c:1557
+msgid "CASE statement is missing ELSE part."
+msgstr "在CASE语句结构中丢失ELSE部分"
+
+#: pl_exec.c:1713
+msgid "lower bound of FOR loop cannot be null"
+msgstr "FOR循环的低位边界不能为空"
+
+#: pl_exec.c:1728
+msgid "upper bound of FOR loop cannot be null"
+msgstr "FOR循环的高位边界不能为空"
+
+#: pl_exec.c:1745
+msgid "BY value of FOR loop cannot be null"
+msgstr "FOR循环的BY值不能为空"
+
+#: pl_exec.c:1751
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "FOR循环的BY值必须大于0"
+
+#: pl_exec.c:1923 pl_exec.c:3188
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "游标\"%s\"已经在使用"
+
+#: pl_exec.c:1946 pl_exec.c:3250
+msgid "arguments given for cursor without arguments"
+msgstr "给不带有参数的游标指定参数"
+
+#: pl_exec.c:1965 pl_exec.c:3269
+msgid "arguments required for cursor"
+msgstr "游标需要参数"
+
+#: pl_exec.c:2187 gram.y:2744
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr "无法在非SETOF函数中使用RETURN NEXT"
+
+#: pl_exec.c:2211 pl_exec.c:2277
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "在RETURN NEXT中提供了错误的结果类型"
+
+#: pl_exec.c:2233 pl_exec.c:3642 pl_exec.c:3948 pl_exec.c:3982 pl_exec.c:4044
+#: pl_exec.c:4063 pl_exec.c:4100
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "记录 \"%s\"还没有分配"
+
+#: pl_exec.c:2235 pl_exec.c:3644 pl_exec.c:3950 pl_exec.c:3984 pl_exec.c:4046
+#: pl_exec.c:4065 pl_exec.c:4102
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr "未分配记录的元组结构未确定."
+
+#: pl_exec.c:2239 pl_exec.c:2258
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr "在RETURN NEXT中提供了错误的记录类型"
+
+#: pl_exec.c:2300
+msgid "RETURN NEXT must have a parameter"
+msgstr "RETURN NEXT必须有一个参数"
+
+#: pl_exec.c:2331 gram.y:2803
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr "无法在非SETOF函数中使用RETURN QUERY"
+
+#: pl_exec.c:2351
+msgid "structure of query does not match function result type"
+msgstr "查询的结构与函数的返回类型不匹配"
+
+#: pl_exec.c:2483
+msgid "too few parameters specified for RAISE"
+msgstr "为RAISE子句指定参数过少"
+
+#: pl_exec.c:2509
+msgid "too many parameters specified for RAISE"
+msgstr "为RAISE子句指定参数过多"
+
+#: pl_exec.c:2529
+msgid "RAISE statement option cannot be null"
+msgstr "RAISE语句选项不能为空"
+
+#: pl_exec.c:2539 pl_exec.c:2548 pl_exec.c:2556 pl_exec.c:2564
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "已经指定了RAISE选项：%s"
+
+#: pl_exec.c:2599 pl_exec.c:2600
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pl_exec.c:2749 pl_exec.c:3053
+msgid "cannot COPY to/from client in PL/pgSQL"
+msgstr "无法在PL/pgSQL中从客户端或向客户端使用COPY命令"
+
+#: pl_exec.c:2753 pl_exec.c:3057
+msgid "cannot begin/end transactions in PL/pgSQL"
+msgstr "无法在PL/pgSQL中无法使用begin/end事务"
+
+#: pl_exec.c:2754 pl_exec.c:3058
+msgid "Use a BEGIN block with an EXCEPTION clause instead."
+msgstr "使用带有一个EXCEPTION子句的BEGIN代码块."
+
+#: pl_exec.c:2902 pl_exec.c:3082
+msgid "INTO used with a command that cannot return data"
+msgstr "使用了带有无法返回数据的命令的INTO"
+
+#: pl_exec.c:2922 pl_exec.c:3102
+msgid "query returned no rows"
+msgstr "查询没有返回记录"
+
+#: pl_exec.c:2931 pl_exec.c:3111
+msgid "query returned more than one row"
+msgstr "查询返回多条记录"
+
+#: pl_exec.c:2945
+msgid "query has no destination for result data"
+msgstr "对于结果数据，查询没有目标"
+
+#: pl_exec.c:2946
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr "如果您想要放弃SELECT语句的结果，请使用PERFORM."
+
+#: pl_exec.c:2979 pl_exec.c:5602
+msgid "query string argument of EXECUTE is null"
+msgstr "EXECUTE的查询字符串参数是空值"
+
+#: pl_exec.c:3044
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "没有执行EXECUTE of SELECT ... INTO "
+
+#: pl_exec.c:3045
+msgid "You might want to use EXECUTE ... INTO instead."
+msgstr "您可以使用EXECUTE ... INTO语句来替代"
+
+#: pl_exec.c:3333 pl_exec.c:3424
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "游标变量\"%s\"是空的"
+
+#: pl_exec.c:3340 pl_exec.c:3431
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "游标 \"%s\" 不存在"
+
+#: pl_exec.c:3354
+msgid "relative or absolute cursor position is null"
+msgstr "游标的相对或绝对位置是空的"
+
+#: pl_exec.c:3495
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr "不能将声明为NOT NULL的变量\"%s\" 分配空值"
+
+#: pl_exec.c:3553
+msgid "cannot assign non-composite value to a row variable"
+msgstr "无法将非组合值分配给记录变量"
+
+#: pl_exec.c:3595
+msgid "cannot assign non-composite value to a record variable"
+msgstr "无法将非组合值分配给记录类型变量"
+
+#: pl_exec.c:3655 pl_exec.c:3989 pl_exec.c:4070 pl_exec.c:4107
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "记录\"%s\"没有字段\"%s\""
+
+#: pl_exec.c:3765
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "数组维数(%d)超过了最大允许值(%d)"
+
+#: pl_exec.c:3779
+msgid "subscripted object is not an array"
+msgstr "下标对象不是一个数组"
+
+#: pl_exec.c:3802
+msgid "array subscript in assignment must not be null"
+msgstr "在赋值中数组下标不能为空"
+
+#: pl_exec.c:4198
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "查询\"%s\"没有返回数据"
+
+#: pl_exec.c:4206
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "查询\"%s\"返回%d列"
+
+#: pl_exec.c:4232
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "查询\"%s\"返回多条数据"
+
+#: pl_exec.c:4290
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "查询 \"%s\"不是SELECT语句"
+
+#: gram.y:423
+msgid "block label must be placed before DECLARE, not after"
+msgstr "代码块标签必须放在DECLARE的前面，而不是后面"
+
+#: gram.y:441
+msgid "row or record variable cannot be CONSTANT"
+msgstr "记录或者记录类型变量不能是CONSTANT类型"
+
+#: gram.y:451
+msgid "row or record variable cannot be NOT NULL"
+msgstr "记录或者记录类型变量不能是NOT NULL"
+
+#: gram.y:462
+msgid "default value for row or record variable is not supported"
+msgstr "不支持为记录或记录类型变量设置缺省值"
+
+#: gram.y:606 gram.y:632
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "变量 \"%s\" 不存在"
+
+#: gram.y:650 gram.y:663
+msgid "duplicate declaration"
+msgstr "重复声明"
+
+#: gram.y:841
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "无法识别的项GET DIAGNOSTICS"
+
+#: gram.y:852 gram.y:2990
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" 不是一个标量变量"
+
+#: gram.y:1114 gram.y:1306
+msgid ""
+"loop variable of loop over rows must be a record or row variable or list of "
+"scalar variables"
+msgstr "在记录集上进行循环的循环变量必须是记录或记录类型变量或标量变量的列表"
+
+#: gram.y:1148
+msgid "cursor FOR loop must have only one target variable"
+msgstr "游标的FOR循环只能有一个目标变量"
+
+#: gram.y:1155
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "游标的FOR循环必须使用有界游标变量"
+
+#: gram.y:1238
+msgid "integer FOR loop must have only one target variable"
+msgstr "整数FOR循环必须只能有一个目标变量"
+
+#: gram.y:1273
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "无法在查询FOR循环中指定REVERSE "
+
+#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2440 gram.y:2521 gram.y:2632
+#: gram.y:3264
+msgid "unexpected end of function definition"
+msgstr "在函数定义中意外出现的结束标志"
+
+#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1657 gram.y:1665
+#: gram.y:1679 gram.y:1774 gram.y:1951 gram.y:2030 gram.y:2143 gram.y:2721
+#: gram.y:2785 gram.y:3224 gram.y:3245
+msgid "syntax error"
+msgstr "语法错误"
+
+#: gram.y:1553 gram.y:1555 gram.y:1955 gram.y:1957
+msgid "invalid SQLSTATE code"
+msgstr "无效的SQLSTATE代码"
+
+#: gram.y:1721
+msgid "syntax error, expected \"FOR\""
+msgstr "语法错误，期望\"FOR\""
+
+#: gram.y:1783
+msgid "FETCH statement cannot return multiple rows"
+msgstr "FETCH语句无法返回多条记录"
+
+#: gram.y:1839
+msgid "cursor variable must be a simple variable"
+msgstr "游标变量必须是一个简单变量"
+
+#: gram.y:1845
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "变量\"%s\" 必须属于游标类型或refcursor类型"
+
+#: gram.y:2009
+msgid "label does not exist"
+msgstr "标签不存在"
+
+#: gram.y:2114 gram.y:2125
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" 不是一个已知变量"
+
+#: gram.y:2227 gram.y:2237 gram.y:2365
+msgid "mismatched parentheses"
+msgstr "括号不匹配"
+
+#: gram.y:2241
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "在SQL表达式的结尾处丢失\"%s\""
+
+#: gram.y:2247
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "在SQL语句的结尾处丢失\"%s\""
+
+#: gram.y:2264
+msgid "missing expression"
+msgstr "缺少表达式"
+
+#: gram.y:2266
+msgid "missing SQL statement"
+msgstr "缺少SQL语句"
+
+#: gram.y:2367
+msgid "incomplete data type declaration"
+msgstr "未完成的数据类型声明"
+
+#: gram.y:2389
+msgid "missing data type declaration"
+msgstr "丢失数据类型声明"
+
+#: gram.y:2445
+msgid "INTO specified more than once"
+msgstr "多次指定INTO"
+
+#: gram.y:2613
+msgid "expected FROM or IN"
+msgstr "期望关键字FROM或IN"
+
+#: gram.y:2673
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "在返回为集合的函数中RETURN不能带有参数"
+
+#: gram.y:2674
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "使用RETURN NEXT或RETURN QUERY."
+
+#: gram.y:2682
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr "在带有输出参数的函数中RETURN不能有参数"
+
+#: gram.y:2691
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr "在返回为空的函数中RETURN不能有参数"
+
+#: gram.y:2709 gram.y:2716
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr "在返回记录的函数中RETURN必须制定一个记录或记录类型变量"
+
+#: gram.y:2758
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr "在带有输出参数的函数中RETURN NEXT不能有参数"
+
+#: gram.y:2773 gram.y:2780
+msgid ""
+"RETURN NEXT must specify a record or row variable in function returning row"
+msgstr "在返回记录的函数中RETURN NEXT必须指定记录或记录类型变量"
+
+#: gram.y:2859
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\"被声明为常量"
+
+#: gram.y:2921 gram.y:2933
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr "记录或行类型变量不能作为带有多个项的INTO列表中的一部分"
+
+#: gram.y:2978
+msgid "too many INTO variables specified"
+msgstr "在INTO后面指定了太多的变量"
+
+#: gram.y:3185
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "为没有标签的代码块指定结束标签\"%s\" "
+
+#: gram.y:3192
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "结束标签\"%s\" 与代码块标签\"%s\"不同"
+
+#: gram.y:3219
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "游标\"%s\" 没有参数"
+
+#: gram.y:3233
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "游标\"%s\"有参数"
+
+#: gram.y:3281
+msgid "unrecognized RAISE statement option"
+msgstr "无法识别的RAISE语句选项"
+
+#: gram.y:3285
+msgid "syntax error, expected \"=\""
+msgstr "语法错误，期望\"=\""
+
+#: pl_funcs.c:216
+msgid "statement block"
+msgstr "语句块"
+
+#: pl_funcs.c:218
+msgid "assignment"
+msgstr "赋值"
+
+#: pl_funcs.c:228
+msgid "FOR with integer loop variable"
+msgstr "带有整型循环变量的FOR语句"
+
+#: pl_funcs.c:230
+msgid "FOR over SELECT rows"
+msgstr "在SELECT记录上的FOR语句"
+
+#: pl_funcs.c:232
+msgid "FOR over cursor"
+msgstr "在游标上运行的FOR语句"
+
+#: pl_funcs.c:244
+msgid "SQL statement"
+msgstr "SQL语句"
+
+#: pl_funcs.c:246
+msgid "EXECUTE statement"
+msgstr "EXECUTE 语句"
+
+#: pl_funcs.c:248
+msgid "FOR over EXECUTE statement"
+msgstr "在EXECUTE语句上的FOR语句"
+
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr "设置在PL/pgSQL变量名称和表中列名冲突时的处理原则"
+
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:463
+#, c-format
+msgid "%s at end of input"
+msgstr "%s 在输入的末尾"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:479
+#, c-format
+msgid "%s at or near \"%s\""
+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 "type of \"%s\" does not match that when preparing the plan"
+#~ msgstr " \"%s\"类型与正在准备计划时的类型不匹配"
+
+#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
+#~ msgstr " \"%s.%s\"类型与正在准备计划时的类型不匹配"
+
+#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
+#~ msgstr "tg_argv[%d]的类型与正在准备计划时的类型不匹配"
+
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/A (已删除的列)"
+
+#~ msgid ""
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ msgstr "所返回列的数量（%d列）与所期望列的数量(%d)不匹配."
+
+#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
+#~ msgstr "所返回的类型%1$s与列\"%3$s\"中期待的类型%2$s不匹配."
+
+#~ msgid "only positional parameters can be aliased"
+#~ msgstr "只有已定位的参数能使用化名"
+
+#~ msgid "function has no parameter \"%s\""
+#~ msgstr "函数中没有参数\"%s\""
+
+#~ msgid "expected an integer variable"
+#~ msgstr "期望一个整型变量"
+
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "在\"%s\"上出现语法错误"
+
+#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
+#~ msgstr "期望\"FOR\"来为无界游标变量打开游标"
+
+#~ msgid "expected a cursor or refcursor variable"
+#~ msgstr "期望游标或refcursor类型变量"
+
+#~ msgid "too many variables specified in SQL statement"
+#~ msgstr "在SQL语句中指定了太多的变量"
+
+#~ 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 ""
+#~ "Expected record variable, row variable, or list of scalar variables "
+#~ "following INTO."
+#~ msgstr "在INTO后期望记录类型变量，记录变量或标量变量的列表."
+
+#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的SQL语句"
+
+#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的字符串常量"
+
+#~ msgid "expected \")\""
+#~ msgstr "期望\")\""
+
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "在当前代码块中不存在变量 \"%s\""
+
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "在标识符中未结束的\"：%s"
+
+#~ msgid "qualified identifier cannot be used here: %s"
+#~ msgstr "在这里不能使用限定标识符：%s"
+
+#~ msgid "unterminated quoted identifier"
+#~ msgstr "未结束的引用标识符"
+
+#~ msgid "unterminated /* comment"
+#~ msgstr "/* 注释没有结束"
+
+#~ msgid "unterminated quoted string"
+#~ msgstr "未结束的引用字符串"
+
+#~ msgid "unterminated dollar-quoted string"
+#~ msgstr "未结束的$引用字符串"
diff --git a/src/pl/plpgsql/src/po/zh_TW.po b/src/pl/plpgsql/src/po/zh_TW.po
new file mode 100644
index 00000000000..ee473cd6784
--- /dev/null
+++ b/src/pl/plpgsql/src/po/zh_TW.po
@@ -0,0 +1,789 @@
+# Traditional Chinese message translation file for plpgsql
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-05-13 20:38+0000\n"
+"PO-Revision-Date: 2011-05-12 15:24+0800\n"
+"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
+"com>\n"
+"Language: \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"
+
+#: pl_comp.c:426 pl_handler.c:266
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "PL/pgSQL 函式無法接受型別 %s"
+
+#: pl_comp.c:505
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr "無法判斷多型函式 \"%s\" 實際傳回型別"
+
+#: pl_comp.c:535
+msgid "trigger functions can only be called as triggers"
+msgstr "觸發函式只能當做觸發呼叫"
+
+#: pl_comp.c:539 pl_handler.c:251
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "PL/pgSQL 函式無法傳回型別 %s"
+
+#: pl_comp.c:582
+msgid "trigger functions cannot have declared arguments"
+msgstr "觸發函式不能有宣告過的參數"
+
+#: pl_comp.c:583
+msgid ""
+"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
+"instead."
+msgstr "觸發程序的參數可以改透過 TG_NARGS 和 TG_ARGV 存取。"
+
+#: pl_comp.c:911
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "編譯 PL/pgSQL 函式 \"%s\"，靠近行 %d"
+
+# parser/parse_relation.c:510 parser/parse_relation.c:609
+#: pl_comp.c:1019
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "資料行參考 \"%s\" 模稜兩可"
+
+#: pl_comp.c:1021
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr "可能參考到 PL/pgSQL 變數或資料表欄位。"
+
+#: pl_comp.c:1201 pl_comp.c:1229 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4351
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "紀錄 \"%s\" 沒有欄位 \"%s\""
+
+# catalog/namespace.c:200 utils/adt/regproc.c:837
+#: pl_comp.c:1754
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "關聯 \"%s\"不存在"
+
+# catalog/namespace.c:195
+#: pl_comp.c:1786
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "關聯 \"%s.%s\"不存在"
+
+#: pl_comp.c:1868
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "變數 \"%s\" 具有處擬型別 %s"
+
+#: pl_comp.c:1929
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "關係 \"%s\" 不是資料表"
+
+#: pl_comp.c:2089
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "型別 \"%s\" 只是殼"
+
+#: pl_comp.c:2162 pl_comp.c:2215
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "無法辨識的例外條件 \"%s\""
+
+#: pl_comp.c:2373
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr "無法判斷同名異式函式 \"%s\" 的實際參數型別"
+
+#: pl_exec.c:239 pl_exec.c:510
+msgid "during initialization of execution state"
+msgstr "在初始化執行狀態期間"
+
+#: pl_exec.c:246
+msgid "while storing call arguments into local variables"
+msgstr "儲存呼叫參數到區域變數時"
+
+#: pl_exec.c:301 pl_exec.c:667
+msgid "during function entry"
+msgstr "在函式進入期間"
+
+#: pl_exec.c:332 pl_exec.c:698
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "CONTINUE 不能在迴圈之外使用"
+
+#: pl_exec.c:336
+msgid "control reached end of function without RETURN"
+msgstr "控制權已到達沒有 RETURN 的函式結尾"
+
+#: pl_exec.c:343
+msgid "while casting return value to function's return type"
+msgstr "將傳回值轉換成函式的傳回值時"
+
+#: pl_exec.c:356 pl_exec.c:2591
+msgid "set-valued function called in context that cannot accept a set"
+msgstr "set-valued 函式於無法接受集合的內容中進行呼叫"
+
+#: pl_exec.c:394
+msgid "returned record type does not match expected record type"
+msgstr "傳回的記錄型別與預期的記錄型別不相符。"
+
+#: pl_exec.c:452 pl_exec.c:706
+msgid "during function exit"
+msgstr "在函式結束期間"
+
+#: pl_exec.c:702
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "控制權已到達沒有 RETURN 的觸發程序結尾"
+
+#: pl_exec.c:711
+msgid "trigger procedure cannot return a set"
+msgstr "觸發程序無法傳回集合"
+
+#: pl_exec.c:733
+msgid ""
+"returned row structure does not match the structure of the triggering table"
+msgstr "傳回的資料列結構與觸發的資料表結構不相符"
+
+#: pl_exec.c:796
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "PL/pgSQL 函式 \"%s\"，位於行 %d %s"
+
+#: 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:815
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "PL/pgSQL 函式 \"%s\"，行 %d，位於 %s"
+
+#: pl_exec.c:821
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "PL/pgSQL 函式 \"%s\""
+
+#: pl_exec.c:929
+msgid "during statement block local variable initialization"
+msgstr "在陳述式區塊區域變數初始化期間"
+
+#: pl_exec.c:971
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr "宣告為 NOT NULL 的變數 \"%s\" 不能預設為 NULL"
+
+#: pl_exec.c:1021
+msgid "during statement block entry"
+msgstr "在陳述式區塊進入期間"
+
+#: pl_exec.c:1042
+msgid "during statement block exit"
+msgstr "在陳述式區塊結束期間"
+
+#: pl_exec.c:1085
+msgid "during exception cleanup"
+msgstr "在例外清除期間"
+
+#: pl_exec.c:1570
+msgid "case not found"
+msgstr "找不到案例"
+
+#: pl_exec.c:1571
+msgid "CASE statement is missing ELSE part."
+msgstr "CASE 陳述式遺漏 ELSE 部分。"
+
+#: pl_exec.c:1725
+msgid "lower bound of FOR loop cannot be null"
+msgstr "FOR 迴圈的下限不可為 null"
+
+#: pl_exec.c:1740
+msgid "upper bound of FOR loop cannot be null"
+msgstr "FOR 迴圈的上限不可為 null"
+
+#: pl_exec.c:1757
+msgid "BY value of FOR loop cannot be null"
+msgstr "FOR 迴圈的 BY 值不可為 null"
+
+#: pl_exec.c:1763
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "FOR 迴圈的 BY 值必須大於零"
+
+#: pl_exec.c:1933 pl_exec.c:3395
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "指標 \"%s\" 已在使用中"
+
+#: pl_exec.c:1956 pl_exec.c:3457
+msgid "arguments given for cursor without arguments"
+msgstr "指定給沒有參數之指標的參數"
+
+#: pl_exec.c:1975 pl_exec.c:3476
+msgid "arguments required for cursor"
+msgstr "指標所需的參數"
+
+# catalog/heap.c:1797
+#: 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"
+
+# utils/adt/varlena.c:1407 utils/adt/varlena.c:1438 utils/adt/varlena.c:1474
+# utils/adt/varlena.c:1517
+#: 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:2399 pl_exec.c:2465
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "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:4344
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "尚未指派記錄 \"%s\""
+
+#: 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:4346
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr "尚未指派之記錄的欄組結構未定。"
+
+#: pl_exec.c:2427 pl_exec.c:2446
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr "RETURN NEXT 中提供的記錄型別錯誤"
+
+#: pl_exec.c:2488
+msgid "RETURN NEXT must have a parameter"
+msgstr "RETURN NEXT 必須要有參數"
+
+#: pl_exec.c:2519 gram.y:2903
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr "無法在非 SETOF 函式中使用 RETURN QUERY"
+
+#: pl_exec.c:2539
+msgid "structure of query does not match function result type"
+msgstr "查詢的結構與函式結果型別不相符"
+
+#: 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:2704
+msgid "too many parameters specified for RAISE"
+msgstr "為 RAISE 指定的參數太多"
+
+#: pl_exec.c:2724
+msgid "RAISE statement option cannot be null"
+msgstr "RAISE 陳述式選項不可為 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 "RAISE 選項已指定: %s"
+
+# commands/vacuum.c:2258 commands/vacuumlazy.c:489 commands/vacuumlazy.c:770
+# nodes/print.c:86 storage/lmgr/deadlock.c:888 tcop/postgres.c:3285
+#: pl_exec.c:2794 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 "無法在 PL/pgSQL 中與用戶端進行 COPY"
+
+#: 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: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:3109 pl_exec.c:3289
+msgid "INTO used with a command that cannot return data"
+msgstr "搭配指令使用的 INTO 無法傳回資料"
+
+#: pl_exec.c:3129 pl_exec.c:3309
+msgid "query returned no rows"
+msgstr "查詢沒有傳回任何資料列"
+
+#: pl_exec.c:3138 pl_exec.c:3318
+msgid "query returned more than one row"
+msgstr "查詢傳回多個資料列"
+
+#: pl_exec.c:3152
+msgid "query has no destination for result data"
+msgstr "查詢沒有結果資料的目的地"
+
+#: pl_exec.c:3153
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr "如果要捨棄 SELECT 的結果，請改用 PERFORM。"
+
+#: pl_exec.c:3186 pl_exec.c:5889
+msgid "query string argument of EXECUTE is null"
+msgstr "EXECUTE 的查詢字串參數為 null"
+
+#: pl_exec.c:3251
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "SELECT ...INTO 的 EXECUTE 尚未實作"
+
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr "你可能想改用  EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS。"
+
+#: pl_exec.c:3540 pl_exec.c:3631
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "指標變數 \"%s\" 為 null"
+
+# commands/portalcmds.c:182 commands/portalcmds.c:229
+#: pl_exec.c:3547 pl_exec.c:3638
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "cursor \"%s\"不存在"
+
+#: pl_exec.c:3561
+msgid "relative or absolute cursor position is null"
+msgstr "相對或絕對指標位置為 null"
+
+#: pl_exec.c:3702
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr "不可將 Null 值指派給宣告為 NOT NULL 的變數 \"%s\""
+
+#: pl_exec.c:3760
+msgid "cannot assign non-composite value to a row variable"
+msgstr "不可將非複合值指派給資料列變數"
+
+#: pl_exec.c:3802
+msgid "cannot assign non-composite value to a record variable"
+msgstr "不可將非複合值指派給記錄變數"
+
+#: pl_exec.c:3973
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "陣列維度數目 (%d) 超過允許的上限 (%d)"
+
+#: pl_exec.c:3992
+msgid "subscripted object is not an array"
+msgstr "下標物件不是陣列"
+
+#: pl_exec.c:4015
+msgid "array subscript in assignment must not be null"
+msgstr "指派中的陣列下標不可為 null"
+
+#: pl_exec.c:4453
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "查詢 \"%s\" 未傳回資料"
+
+#: pl_exec.c:4461
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "查詢 \"%s\" 傳回 %d 個欄位"
+
+#: pl_exec.c:4487
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "查詢 \"%s\" 傳回多個資料列"
+
+#: pl_exec.c:4545
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "查詢 \"%s\" 不是 SELECT"
+
+#: gram.y:430
+msgid "block label must be placed before DECLARE, not after"
+msgstr "區塊標籤必須在 DECLARE 之前而非之後"
+
+# catalog/pg_proc.c:487
+#: 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 "資料列或記錄變數不可為 CONSTANT"
+
+#: gram.y:475
+msgid "row or record variable cannot be NOT NULL"
+msgstr "資料列或記錄變數不可為 NOT NULL"
+
+#: gram.y:486
+msgid "default value for row or record variable is not supported"
+msgstr "不支援資料列或記錄變數的預設值"
+
+# tcop/utility.c:77
+#: gram.y:631 gram.y:657
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "變數 \"%s\" 不存在"
+
+#: gram.y:675 gram.y:688
+msgid "duplicate declaration"
+msgstr "重複的宣告"
+
+#: gram.y:881
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "無法辨識的 GET DIAGNOSTICS 項目"
+
+#: gram.y:892 gram.y:3090
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" 不是純量變數"
+
+#: 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 "資料列迴圈的迴圈變數必須是記錄或資料列變數，或是純量變數清單"
+
+#: gram.y:1188
+msgid "cursor FOR loop must have only one target variable"
+msgstr "指標 FOR 迴圈只能有一個目標變數"
+
+#: gram.y:1195
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "指標 FOR 迴圈必須使用繫結指標變數"
+
+#: gram.y:1278
+msgid "integer FOR loop must have only one target variable"
+msgstr "整數 FOR 迴圈只能有一個目標變數"
+
+#: gram.y:1314
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "無法在查詢 FOR 迴圈中指定 REVERSE"
+
+#: 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:8218 gram.y:8220 y.tab.c:19175
+#: 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 "語法錯誤"
+
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
+msgid "invalid SQLSTATE code"
+msgstr "SQLSTATE 程式碼無效"
+
+#: gram.y:1814
+msgid "syntax error, expected \"FOR\""
+msgstr "語法錯誤，預期 \"FOR\""
+
+#: gram.y:1876
+msgid "FETCH statement cannot return multiple rows"
+msgstr "FETCH 陳述式不能傳回多筆資料"
+
+#: gram.y:1932
+msgid "cursor variable must be a simple variable"
+msgstr "指標變數必須是簡單變數"
+
+#: gram.y:1938
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "變數 \"%s\" 必須是指標型別或 refcursor 型別"
+
+#: gram.y:2106
+msgid "label does not exist"
+msgstr "標籤不存在"
+
+#: gram.y:2213 gram.y:2224
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" 不是已知變數"
+
+#: gram.y:2326 gram.y:2336 gram.y:2464
+msgid "mismatched parentheses"
+msgstr "括號不相符"
+
+#: gram.y:2340
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "SQL 運算式的結尾遺漏 \"%s\""
+
+#: gram.y:2346
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "SQL 陳述式的結尾遺漏 \"%s\""
+
+#: gram.y:2363
+msgid "missing expression"
+msgstr "缺少運算式"
+
+#: gram.y:2365
+msgid "missing SQL statement"
+msgstr "缺少 SQL 陳述式"
+
+#: gram.y:2466
+msgid "incomplete data type declaration"
+msgstr "不完整的資料型別宣告"
+
+#: gram.y:2489
+msgid "missing data type declaration"
+msgstr "遺漏資料型別宣告"
+
+#: gram.y:2545
+msgid "INTO specified more than once"
+msgstr "INTO 指定一次以上"
+
+#: gram.y:2713
+msgid "expected FROM or IN"
+msgstr "預期 FROM 或 IN "
+
+#: gram.y:2773
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "RETURN 在傳回 set 的函式中不能有參數"
+
+#: gram.y:2774
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "用 RETURN NEXT 或 RETURN QUERY。"
+
+#: gram.y:2782
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr "RETURN 在具有 OUT 參數的函式中不能有參數"
+
+#: gram.y:2791
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr "RETURN 在傳回 void 的函式中不能有參數"
+
+#: gram.y:2809 gram.y:2816
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr "RETURN 在傳回資料列的函式中必須指定記錄或資料列變數"
+
+#: gram.y:2858
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr "RETURN NEXT 在具有 OUT 參數的函式中不能有參數"
+
+#: 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:2959
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\" 宣告為 CONSTANT"
+
+#: gram.y:3021 gram.y:3033
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr "紀錄或資料行變數不能用在多項目 INTO 清單"
+
+#: gram.y:3078
+msgid "too many INTO variables specified"
+msgstr "指定太多的 INTO 變數"
+
+#: gram.y:3286
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "為未標籤區塊指定結束標籤 \"%s\""
+
+#: gram.y:3293
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "結束標籤 \"%s\" 不同於區塊標籤 \"%s\""
+
+#: gram.y:3320
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "指標 \"%s\" 沒有參數"
+
+#: gram.y:3334
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "指標 \"%s\" 有參數"
+
+#: gram.y:3382
+msgid "unrecognized RAISE statement option"
+msgstr "無法辨識 RAISE 陳述式選項"
+
+#: gram.y:3386
+msgid "syntax error, expected \"=\""
+msgstr "語法錯誤，預期 \"=\""
+
+#: pl_funcs.c:218
+msgid "statement block"
+msgstr "陳述式區塊"
+
+#: pl_funcs.c:220
+msgid "assignment"
+msgstr "指派"
+
+#: pl_funcs.c:230
+msgid "FOR with integer loop variable"
+msgstr "具有整數迴圈變數的 FOR"
+
+#: pl_funcs.c:232
+msgid "FOR over SELECT rows"
+msgstr "FOR 用於 SELECT 資料行"
+
+#: pl_funcs.c:234
+msgid "FOR over cursor"
+msgstr "FOR 用於指標"
+
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH 用於陣列"
+
+#: pl_funcs.c:248
+msgid "SQL statement"
+msgstr "SQL 陳述式"
+
+#: pl_funcs.c:250
+msgid "EXECUTE statement"
+msgstr "EXECUTE 陳述式"
+
+#: pl_funcs.c:252
+msgid "FOR over EXECUTE statement"
+msgstr "目標為 EXECUTE 陳述式的 FOR"
+
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr "PL/pgSQL 變數名稱和資料表欄位名稱衝突處理。"
+
+#  translator: %s is typically "syntax error"
+# scan.l:621
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:467
+#, c-format
+msgid "%s at end of input"
+msgstr "輸入結尾發生 %s"
+
+#  translator: first %s is typically "syntax error"
+# scan.l:629
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:483
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "\"%2$s\" 附近發生 %1$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 "type of \"%s\" does not match that when preparing the plan"
+#~ msgstr "\"%s\" 型別與準備計畫時的型別不相符"
+
+#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
+#~ msgstr "\"%s.%s\" 型別與準備計畫時的型別不相符"
+
+#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
+#~ msgstr "tg_argv[%d] 型別與準備計畫時的型別不相符"
+
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/A (已捨棄資料行)"
+
+#~ msgid ""
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ msgstr "傳回的資料行數 (%d) 與預期的資料行計數 (%d) 不相符。"
+
+#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
+#~ msgstr "傳回的型別 %s 不符合預期的型別 %s (在資料行 \"%s\" 中)。"
+
+#~ msgid "only positional parameters can be aliased"
+#~ msgstr "只有位置參數可以有別名"
+
+#~ msgid "function has no parameter \"%s\""
+#~ msgstr "函式沒有參數 \"%s\""
+
+#~ msgid "expected an integer variable"
+#~ msgstr "預期整數變數"
+
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "\"%s\" 發生語法錯誤"
+
+#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
+#~ msgstr "預期 \"FOR\"，以開啟未繫結指標變數的指標。"
+
+#~ msgid "expected a cursor or refcursor variable"
+#~ msgstr "預期指標變數或 refcursor 變數"
+
+#~ msgid "too many variables specified in SQL statement"
+#~ msgstr "SQL 陳述式中指定太多變數"
+
+#~ 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 ""
+#~ "Expected record variable, row variable, or list of scalar variables "
+#~ "following INTO."
+#~ msgstr "預期是記錄變數、資料列變數或接在 INTO 之後的純量清單變數。"
+
+#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr " PL/PgSQL 函式 \"%s\" 中的 SQL 陳述式，靠近行 %d"
+
+#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr " PL/PgSQL 函式 \"%s\" 中的字串實量，靠近行 %d"
+
+#~ msgid "expected \")\""
+#~ msgstr "預期 \")\""
+
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "變數 \"%s\" 不在目前區塊中"
+
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "識別字中有未結束的 \":%s"
+
+#~ msgid "qualified identifier cannot be used here: %s"
+#~ msgstr "此處不可使用完整的識別字:%s"
+
+#~ msgid "unterminated quoted identifier"
+#~ msgstr "未結束的引號識別字"