Translation updates

7 files changed, 6190 insertions, 4025 deletions

diff --git a/src/bin/psql/po/cs.po b/src/bin/psql/po/cs.po
index d505e51c68..1a2ff0c651 100644
--- a/src/bin/psql/po/cs.po
+++ b/src/bin/psql/po/cs.po
@@ -1,302 +1,391 @@
 # translation of psql-cs.po to Czech
 # Czech message translation file for psql
 #
-# $PostgreSQL: pgsql/src/bin/psql/po/cs.po,v 1.5 2005/01/06 00:11:55 tgl Exp $
-# Karel Zak <zakkr@zf.jcu.cz>, 2001-2003, 2004.
-#
+# $PostgreSQL: pgsql/src/bin/psql/po/cs.po,v 1.6 2009/06/10 23:42:43 petere Exp $
+# Karel Žák, 2001-2003, 2004.
+# Zdeněk Kotala, 2009.
+
 msgid ""
 msgstr ""
-"Project-Id-Version: psql-cs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-27 14:19+0200\n"
-"PO-Revision-Date: 2004-10-21 14:32+0200\n"
-"Last-Translator: Karel Zak <zakkr@zf.jcu.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
+"Project-Id-Version: postgresql 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2009-05-21 21:08+0000\n"
+"PO-Revision-Date: 2009-05-24 15:46+0200\n"
+"Last-Translator: Zdeněk Kotala\n"
+"Language-Team: Czech \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: command.c:112
-msgid "Warning: This syntax is deprecated.\n"
-msgstr "Varov�n�: tato syntaxe je zastaral�.\n"
-
-#: command.c:120
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
-msgstr "Neplatn� p��kaz \\%s. Pou�ijte \\? pro n�pov�du.\n"
+msgstr "Neplatný příkaz \\%s. Použijte \\? pro nápovědu.\n"
 
-#: command.c:122
+#: command.c:114
 #, c-format
 msgid "invalid command \\%s\n"
-msgstr "neplatn� p��kaz \\%s\n"
+msgstr "neplatný příkaz \\%s\n"
 
-#: command.c:131
+#: command.c:125
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
-msgstr "\\%s: vedlej�� argument \"%s\" ignorov�n\n"
+msgstr "\\%s: vedlejší argument \"%s\" ignorován\n"
 
-#: command.c:240
+#: command.c:267
 #, c-format
 msgid "could not get home directory: %s\n"
-msgstr "nelze z�skat dom�c� adres��: %s\n"
+msgstr "nelze získat domácí adresář: %s\n"
 
-#: command.c:256
+#: command.c:283
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
-msgstr "\\%s: nelze zm�nit adres�� na \"%s\": %s\n"
+msgstr "\\%s: nelze změnit adresář na \"%s\": %s\n"
 
-#: command.c:370 command.c:760
+#: command.c:316 common.c:935
+#, c-format
+msgid "Time: %.3f ms\n"
+msgstr "Čas: %.3f ms\n"
+
+#: command.c:468 command.c:496 command.c:1035
 msgid "no query buffer\n"
-msgstr "v pam�ti nen� ��dn� dotaz\n"
+msgstr "v paměti není žádný dotaz\n"
+
+#: command.c:538
+msgid "No changes"
+msgstr "Žádné změny"
 
-#: command.c:433
+#: command.c:592
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
-msgstr "%s: neplatn� jm�no k�dov�n� nebo nenalezena konverzn� funkce\n"
+msgstr "%s: neplatné jméno kódování nebo nenalezena konverzní funkce\n"
 
-#: command.c:501 command.c:535 command.c:549 command.c:566 command.c:612
-#: command.c:740 command.c:771
+#: command.c:660 command.c:694 command.c:708 command.c:725 command.c:829
+#: command.c:879 command.c:1015 command.c:1046
 #, c-format
 msgid "\\%s: missing required argument\n"
-msgstr "\\%s: chyb� po�adovan� argument\n"
+msgstr "\\%s: chybí požadovaný argument\n"
 
-#: command.c:598
+#: command.c:757
 msgid "Query buffer is empty."
-msgstr "Buffer dotaz� je pr�zdn�."
+msgstr "Buffer dotazů je prázdný."
 
-#: command.c:632
-msgid "Query buffer reset (cleared)."
-msgstr "Buffer dotaz� vypr�zdn�n."
+#: command.c:767
+msgid "Enter new password: "
+msgstr "Zadejte nové heslo: "
+
+#: command.c:768
+msgid "Enter it again: "
+msgstr "Zadejte znova: "
 
-#: command.c:646
+#: command.c:772
 #, c-format
-msgid "Wrote history to file \"%s\".\n"
-msgstr "Historie zaps�na do: \"%s\".\n"
+msgid "Passwords didn't match.\n"
+msgstr "Hesla se neshodují.\n"
 
-#: command.c:681 common.c:85 common.c:99 mainloop.c:71
-msgid "out of memory\n"
-msgstr "pam� vy�erp�na\n"
+#: command.c:790
+#, c-format
+msgid "Password encryption failed.\n"
+msgstr "Zašifrování hesla selhalo.\n"
 
-#: command.c:696 command.c:745
+#: command.c:858 command.c:959 command.c:1020
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: chyba\n"
 
-#: command.c:726
+#: command.c:899
+msgid "Query buffer reset (cleared)."
+msgstr "Buffer dotazů vyprázdněn."
+
+#: command.c:912
+#, c-format
+msgid "Wrote history to file \"%s/%s\".\n"
+msgstr "Historie zapsána do soubor: \"%s/%s\".\n"
+
+#: command.c:950 common.c:52 common.c:66 input.c:198 mainloop.c:69
+#: mainloop.c:227 print.c:61 print.c:75
+#, c-format
+msgid "out of memory\n"
+msgstr "paměť vyčerpána\n"
+
+#: command.c:1000
 msgid "Timing is on."
-msgstr "Sledov�n� �asu je zapnuto."
+msgstr "Sledování času je zapnuto."
 
-#: command.c:728
+#: command.c:1002
 msgid "Timing is off."
-msgstr "Sledov�n� �asu je vypnuto."
+msgstr "Sledování času je vypnuto."
 
-#: command.c:788 command.c:808 command.c:1163 command.c:1170 command.c:1180
-#: command.c:1192 command.c:1205 command.c:1219 command.c:1241 command.c:1272
-#: common.c:170 copy.c:530 copy.c:575
+#: command.c:1063 command.c:1083 command.c:1581 command.c:1588 command.c:1597
+#: command.c:1607 command.c:1616 command.c:1630 command.c:1647 command.c:1680
+#: common.c:137 copy.c:517 copy.c:581
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:915 command.c:939 startup.c:187 startup.c:205
+#: command.c:1165 startup.c:159
 msgid "Password: "
 msgstr "Heslo: "
 
-#: command.c:953 common.c:216 common.c:605 common.c:660 common.c:903
+#: command.c:1172 startup.c:162 startup.c:164
+#, c-format
+msgid "Password for user %s: "
+msgstr "Vložte heslo uživatele %s: "
+
+#: command.c:1268 command.c:2110 common.c:183 common.c:460 common.c:525
+#: common.c:811 common.c:836 common.c:920 copy.c:652 copy.c:697 copy.c:826
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:957
+#: command.c:1272
 msgid "Previous connection kept\n"
-msgstr "P�edchoz� spojen� zachov�no\n"
+msgstr "Předchozí spojení zachováno\n"
 
-#: command.c:969
+#: command.c:1276
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:981
+#: command.c:1300
+#, c-format
+msgid "You are now connected to database \"%s\""
+msgstr "Nyní jste připojeni do databáze \"%s\""
+
+#: command.c:1303
+#, c-format
+msgid " on host \"%s\""
+msgstr " na počítač \"%s\""
+
+#: command.c:1306
+#, c-format
+msgid " at port \"%s\""
+msgstr " na port \"%s\""
+
+#: command.c:1309
+#, c-format
+msgid " as user \"%s\""
+msgstr " jako uživatel \"%s\""
+
+#: command.c:1344
+#, c-format
+msgid "%s (%s, server %s)\n"
+msgstr "%s (%s, server %s)\n"
+
+#: command.c:1351
+#, c-format
+msgid ""
+"WARNING: %s version %d.%d, server version %d.%d.\n"
+"         Some psql features might not work.\n"
+msgstr ""
+"VAROVÁNÍ: %s verze %d.%d, verze serveru %d.%d.\n"
+"          Některé vlastnosti psql nemusí fungovat.\n"
+
+#: command.c:1381
 #, c-format
-msgid "You are now connected to database \"%s\".\n"
-msgstr "P�ipojen� je nyn� do datab�ze \"%s\".\n"
+msgid "SSL connection (cipher: %s, bits: %i)\n"
+msgstr "SSL spojení (šifra: %s, bitů: %i)\n"
 
-#: command.c:983
+#: command.c:1390
 #, c-format
-msgid "You are now connected as new user \"%s\".\n"
-msgstr "P�ipojen� je nyn� jako u�ivatel %s.\n"
+msgid "SSL connection (unknown cipher)\n"
+msgstr "SSL spojení (neznámá šifra)\n"
 
-#: command.c:986
+#: command.c:1411
 #, c-format
-msgid "You are now connected to database \"%s\" as user \"%s\".\n"
-msgstr "Nyn�j�� p�ipojen� je do datab�ze \"%s\" jako u�ivatel \"%s\".\n"
+msgid ""
+"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
+"         8-bit characters might not work correctly. See psql reference\n"
+"         page \"Notes for Windows users\" for details.\n"
+msgstr ""
 
-#: command.c:1103
+#: command.c:1500
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "nelze spustit editor \"%s\"\n"
 
-#: command.c:1105
+#: command.c:1502
 msgid "could not start /bin/sh\n"
 msgstr "nelze spustit /bin/sh\n"
 
-#: command.c:1148
+#: command.c:1539
+#, c-format
+msgid "cannot locate temporary directory: %s"
+msgstr "nelze otevřít dočasný soubor: %s"
+
+#: command.c:1566
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
-msgstr "nelze otev��t do�asn� soubor \"%s\": %s\n"
+msgstr "nelze otevřít dočasný soubor \"%s\": %s\n"
 
-#: command.c:1340
-msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
-msgstr "\\pset: dovolen� form�ty jsou: unaligned, aligned, html, latex\n"
+#: command.c:1764
+msgid ""
+"\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
+"ms\n"
+msgstr "" 
+"\\pset: dovolené formáty jsou: unaligned, aligned, wrapped, html, latex, troff-"
+"ms\n"
 
-#: command.c:1345
+#: command.c:1769
 #, c-format
 msgid "Output format is %s.\n"
-msgstr "V�stupn� form�t je %s.\n"
+msgstr "Výstupní formát je %s.\n"
 
-#: command.c:1355
+#: command.c:1779
 #, c-format
 msgid "Border style is %d.\n"
-msgstr "Styl r�me�k� je %d.\n"
+msgstr "Styl rámečků je %d.\n"
 
-#: command.c:1364
+#: command.c:1791
 #, c-format
 msgid "Expanded display is on.\n"
-msgstr "Roz���en� zobrazen� zapnuto.\n"
+msgstr "Rozšířené zobrazení zapnuto.\n"
 
-#: command.c:1365
+#: command.c:1792
 #, c-format
 msgid "Expanded display is off.\n"
-msgstr "Roz���en� zobrazen� vypnuto.\n"
+msgstr "Rozšířené zobrazení vypnuto.\n"
 
-#: command.c:1377
+#: command.c:1805
+msgid "Showing locale-adjusted numeric output."
+msgstr "Zobrazí číselný výstup dle národního nastavení."
+
+#: command.c:1807
+msgid "Locale-adjusted numeric output is off."
+msgstr "Zobrazení číselného výstupu dle národního nastavení je vypnuto."
+
+#: command.c:1820
 #, c-format
 msgid "Null display is \"%s\".\n"
-msgstr "Null je zobrazov�n jako '\"%s\"'.\n"
+msgstr "Null je zobrazován jako '\"%s\"'.\n"
 
-#: command.c:1389
+#: command.c:1832
 #, c-format
 msgid "Field separator is \"%s\".\n"
-msgstr "Odd�lova� pol� je '\"%s\"'.\n"
+msgstr "Oddělovač polí je '\"%s\"'.\n"
 
-#: command.c:1403
+#: command.c:1846
 #, c-format
 msgid "Record separator is <newline>."
-msgstr "Odd�lova� z�znam� je <newline>."
+msgstr "Oddělovač záznamů je <newline>."
 
-#: command.c:1405
+#: command.c:1848
 #, c-format
 msgid "Record separator is \"%s\".\n"
-msgstr "Odd�lova� z�znam� je '\"%s\"'.\n"
+msgstr "Oddělovač záznamů je '\"%s\"'.\n"
 
-#: command.c:1416
+#: command.c:1862
 msgid "Showing only tuples."
-msgstr "Zobrazov�ny jsou pouze z�znamy."
+msgstr "Zobrazovány jsou pouze záznamy."
 
-#: command.c:1418
+#: command.c:1864
 msgid "Tuples only is off."
-msgstr "Zobrazov�n� pouze z�znam� je vypnuto."
+msgstr "Zobrazování pouze záznamů je vypnuto."
 
-#: command.c:1434
+#: command.c:1880
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Nadpis je \"%s\".\n"
 
-#: command.c:1436
+#: command.c:1882
 #, c-format
 msgid "Title is unset.\n"
-msgstr "Nadpis nen� nastaven.\n"
+msgstr "Nadpis není nastaven.\n"
 
-#: command.c:1452
+#: command.c:1898
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Atribut tabulky je \"%s\".\n"
 
-#: command.c:1454
+#: command.c:1900
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Atributy tabulky nejsou nastaveny.\n"
 
-#: command.c:1470
+#: command.c:1921
 msgid "Pager is used for long output."
-msgstr "Str�nkov�n� je zapnuto pro dlouh� v�stupy."
+msgstr "Stránkování je zapnuto pro dlouhé výstupy."
 
-#: command.c:1472
+#: command.c:1923
 msgid "Pager is always used."
-msgstr "Str�nkov�n� je v�dy pou�ito."
+msgstr "Stránkování je vždy použito."
 
-#: command.c:1474
+#: command.c:1925
 msgid "Pager usage is off."
-msgstr "Str�nkov�n� je vypnuto."
+msgstr "Stránkování je vypnuto."
 
-#: command.c:1485
+#: command.c:1939
 msgid "Default footer is on."
-msgstr "Implicitn� z�hlav� je zapnuto."
+msgstr "Implicitní záhlaví je zapnuto."
 
-#: command.c:1487
+#: command.c:1941
 msgid "Default footer is off."
-msgstr "Implicitn� z�hlav� je vypnuto."
+msgstr "Implicitní záhlaví je vypnuto."
 
-#: command.c:1493
+#: command.c:1952
+#, c-format
+msgid "Target width for \"wrapped\" format is %d.\n"
+msgstr ""
+
+#: command.c:1957
 #, c-format
 msgid "\\pset: unknown option: %s\n"
-msgstr "\\pset: nezn�m� volba: %s\n"
+msgstr "\\pset: neznámá volba: %s\n"
 
-#: command.c:1532
+#: command.c:2011
 msgid "\\!: failed\n"
 msgstr "\\!: selhal\n"
 
-#: common.c:78
+#: common.c:45
 #, c-format
-msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
-msgstr "%s: xstrdup: nelze duplikovat nulov� ukazatel (intern� chyba)\n"
+msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgstr "%s: pg_strdup: nelze duplikovat nulový ukazatel (interní chyba)\n"
 
-#: common.c:123
+#: common.c:90
 msgid "out of memory"
-msgstr "pam� vy�erp�na"
+msgstr "paměť vyčerpána"
 
-#: common.c:298
+#: common.c:343
 msgid "connection to server was lost\n"
-msgstr "spojen� na server bylo ztraceno\n"
+msgstr "spojení na server bylo ztraceno\n"
 
-#: common.c:302
+#: common.c:347
 msgid "The connection to the server was lost. Attempting reset: "
-msgstr "Spojen� na server bylo ztraceno. Zkou�en restart: "
+msgstr "Spojení na server bylo ztraceno. Zkoušen restart: "
 
-#: common.c:307
+#: common.c:352
 msgid "Failed.\n"
-msgstr "Nepoda�ilo se.\n"
+msgstr "Nepodařilo se.\n"
 
-#: common.c:314
+#: common.c:359
 msgid "Succeeded.\n"
-msgstr "Poda�ilo se.\n"
-
-#: common.c:391
-#, c-format
-msgid "INTERNAL ERROR: unexpected statement position \"%s\"\n"
-msgstr "INTERN� CHYBA neo�ek�van� pozice p��kazu \"%s\"\n"
+msgstr "Podařilo se.\n"
 
-#: common.c:527
-#, c-format
-msgid "LINE %d: "
-msgstr "��DKA %d: "
+#: common.c:493 common.c:768
+msgid "You are currently not connected to a database.\n"
+msgstr "Neexistuje spojeni s databází.\n"
 
-#: common.c:544 common.c:553
+#: common.c:499 common.c:506 common.c:794
 #, c-format
-msgid "%s\n"
-msgstr "%s\n"
-
-#: common.c:636 common.c:871
-msgid "You are currently not connected to a database.\n"
-msgstr "Neexistuje spojeni s datab�z�.\n"
+msgid ""
+"********* QUERY **********\n"
+"%s\n"
+"**************************\n"
+"\n"
+msgstr ""
+"********* DOTAZ **********\n"
+"%s\n"
+"**************************\n"
+"\n"
 
-#: common.c:691
+#: common.c:558
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
-msgstr "Asynchronn� upozorn�n� \"%s\" obdr�eno z procesu serveru s PID %d.\n"
+msgstr "Asynchronní upozornění \"%s\" obdrženo z procesu serveru s PID %d.\n"
 
-#: common.c:879
+#: common.c:776
 #, c-format
 msgid ""
 "***(Single step mode: verify command)"
@@ -305,603 +394,801 @@ msgid ""
 "***(press return to proceed or enter x and return to cancel)"
 "********************\n"
 msgstr ""
-"***(Krokovac� m�d: potvr�te p��kaz)"
+"***(Krokovací mód: potvrďte příkaz)"
 "*******************************************\n"
 "%s\n"
-"***(stiskn�te return pro zpracov�n� nebo x pro zru�en�)********************\n"
+"***(stiskněte return pro zpracování nebo x pro zrušení)********************\n"
 
-#: common.c:930
+#: common.c:827
 #, c-format
-msgid "Time: %.3f ms\n"
-msgstr "�as: %.3f ms\n"
+msgid ""
+"The server (version %d.%d) does not support savepoints for "
+"ON_ERROR_ROLLBACK.\n"
+msgstr "Serveru (verze %d.%d) nepodporuje savepoints pro ON_ERROR_ROLLBACK.\n"
 
-#: copy.c:122
+#: copy.c:120
 msgid "\\copy: arguments required\n"
-msgstr "\\copy: argumenty jsou povinn�\n"
+msgstr "\\copy: argumenty jsou povinné\n"
 
-#: copy.c:408
+#: copy.c:399
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: chyba na \"%s\"\n"
 
-#: copy.c:410
+#: copy.c:401
 msgid "\\copy: parse error at end of line\n"
-msgstr "\\copy: chyba na konci ��dku\n"
+msgstr "\\copy: chyba na konci řádku\n"
 
-#: copy.c:541
+#: copy.c:528
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
-msgstr "%s: nelze kop�rovat z/do adres��e\n"
+msgstr "%s: nelze kopírovat z/do adresáře\n"
 
-#: copy.c:562
+#: copy.c:554
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:566
+#: copy.c:558 copy.c:572
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
-msgstr "\\copy: neo�ek�van� odezva (%d)\n"
+msgstr "\\copy: neočekávaná odezva (%d)\n"
+
+#: copy.c:627 copy.c:637
+#, c-format
+msgid "could not write COPY data: %s\n"
+msgstr "nelze zapsat data příkazu COPY: %s\n"
+
+#: copy.c:644
+#, c-format
+msgid "COPY data transfer failed: %s"
+msgstr "přenos dat příkazem COPY selhal: %s"
+
+#: copy.c:692
+msgid "canceled by user"
+msgstr "zrušeno na žádost uživatele"
 
 # common.c:485
-#: copy.c:668
+#: copy.c:707
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
 msgstr ""
-"Vstupn� data budu kop�rov�na od n�sleduj�c� ��dky.\n"
-"Ukon�en� kop�rov�n� pomoc� samostatn� ��dky s lom�tkem (backslash) a te�kou."
+"Vstupní data budu kopírována od následující řádky.\n"
+"Ukončení kopírování pomocí samostatné řádky s lomítkem (backslash) a tečkou."
+
+#: copy.c:819
+msgid "aborted because of read failure"
+msgstr "přerušeno z důvodu chyby čtení"
 
-#: help.c:48
+#: help.c:52
 msgid "on"
 msgstr "zapnuto"
 
-#: help.c:48
+#: help.c:52
 msgid "off"
 msgstr "vypnuto"
 
-#: help.c:70
+#: help.c:74
 #, c-format
 msgid "could not get current user name: %s\n"
-msgstr "nelze z�skat u�ivatelsk� jm�no: %s\n"
+msgstr "nelze získat uživatelské jméno: %s\n"
 
-#: help.c:83
+#: help.c:86
 #, c-format
 msgid ""
-"This is psql %s, the PostgreSQL interactive terminal.\n"
+"psql is the PostgreSQL interactive terminal.\n"
 "\n"
 msgstr ""
-"Toto je psql %s, PostgreSQL interaktivn� termin�l.\n"
+"psql je PostgreSQL interaktivní terminál.\n"
 "\n"
 
-#: help.c:85
-msgid "Usage:"
-msgstr "Pou�it�:"
-
-#: help.c:86
-msgid "  psql [OPTIONS]... [DBNAME [USERNAME]]\n"
-msgstr "  psql [P�EP�NA�E]... [DATAB�ZE [U�IVATEL]]\n"
+#: help.c:87
+#, c-format
+msgid "Usage:\n"
+msgstr "Použití:\n"
 
 #: help.c:88
-msgid "General options:"
-msgstr "Hlavn� p�ep�na�e:"
-
-#: help.c:93
 #, c-format
 msgid ""
-"  -d DBNAME       specify database name to connect to (default: \"%s\")\n"
-msgstr "  -d DATAB�ZE     jm�no datab�ze pro spojen� (implicitn�: \"%s\")\n"
-
-#: help.c:94
-msgid "  -c COMMAND      run only single command (SQL or internal) and exit"
+"  psql [OPTION]... [DBNAME [USERNAME]]\n"
+"\n"
 msgstr ""
-"  -c P��KAZ       provede pouze jeden p��kaz (SQL nebo intern�) a skon��"
+"  psql [PŘEPÍNAČE]... [DATABÁZE [UŽIVATEL]]\n"
+"\n"
+
+#: help.c:90
+#, c-format
+msgid "General options:\n"
+msgstr "Základní přepínače:\n"
 
 #: help.c:95
-msgid "  -f FILENAME     execute commands from file, then exit"
-msgstr "  -f SOUBOR       provede p��kazy ze souboru a skon��"
+#, c-format
+msgid ""
+"  -c, --command=COMMAND    run only single command (SQL or internal) and "
+"exit\n"
+msgstr ""
+"  -c, --command=PŘÍKAZ     provede pouze jeden příkaz (SQL nebo interní) a skončí\n"
 
 #: help.c:96
-msgid "  -l              list available databases, then exit"
-msgstr " -l               vyp��e seznam dostupn�ch datab�z� a skon��"
+#, c-format
+msgid ""
+"  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
+msgstr ""
+"  -d, --dbname=DATABÁZE    jméno databáze pro spojení (implicitně: \"%s\")\n"
 
 #: help.c:97
-msgid "  -v NAME=VALUE   set psql variable NAME to VALUE"
-msgstr "  -v JM�NO=HODNOTA   nastavit psql prom�nnou 'JM�NO' na 'HODNOTA'"
+#, c-format
+msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
+msgstr "  -f, --file=SOUBOR        provede příkazy ze souboru a skončí\n"
 
 #: help.c:98
-msgid "  -X              do not read startup file (~/.psqlrc)"
-msgstr "  -X              ne��st inicializa�n� soubor (~/.psqlrc)"
+#, c-format
+msgid "  -l, --list               list available databases, then exit\n"
+msgstr "  -l, --list               vypíše seznam dostupných databází a skončí\n"
 
 #: help.c:99
-msgid "  --help          show this help, then exit"
-msgstr "  --help          uk�e tuto n�pov�du a skon��"
+#, c-format
+msgid ""
+"  -v, --set=, --variable=NAME=VALUE\n"
+"                           set psql variable NAME to VALUE\n"
+msgstr ""
+"  -v, ..set=, --variable=JMÉNO=HODNOTA\n"
+"                           nastaví psql proměnnou 'JMÉNO' na 'HODNOTA'\n"
 
-#: help.c:100
-msgid "  --version       output version information, then exit"
-msgstr "  --version       uk�e informace o verzi a skon��"
+#: help.c:101
+#, c-format
+msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
+msgstr "  -X, --no-psqlrc          nečíst inicializační soubor (~/.psqlrc)\n"
 
 #: help.c:102
+#, c-format
 msgid ""
-"\n"
-"Input and output options:"
+"  -1 (\"one\"), --single-transaction\n"
+"                           execute command file as a single transaction\n"
 msgstr ""
-"\n"
-"Vstupn� a v�stupn� p�ep�na�e:"
-
-#: help.c:103
-msgid "  -a              echo all input from script"
-msgstr "  -a              uk�e v�echny vstupy ze skriptu"
+"  -1 (\"jedna\"), --single-transaction\n"
+"                           zpracuj soubor v rámci jedné transakce\n"
 
 #: help.c:104
-msgid "  -e              echo commands sent to server"
-msgstr "  -e              uk�e v�echny p��kazy poslan� na server"
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   ukáže tuto nápovědu a skončí\n"
 
 #: help.c:105
-msgid "  -E              display queries that internal commands generate"
-msgstr "  -E              uk�e dotazy, kter� generuj� intern� p��kazy"
-
-#: help.c:106
-msgid "  -q              run quietly (no messages, only query output)"
-msgstr "  -q              tich� chod (bez hl�ek, pouze v�stupy dotaz�)"
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                ukáže informace o verzi a skončí\n"
 
 #: help.c:107
-msgid "  -o FILENAME     send query results to file (or |pipe)"
-msgstr "  -o SOUBOR       zap��e v�sledek dotazu do souboru (nebo |roury)"
+#, c-format
+msgid ""
+"\n"
+"Input and output options:\n"
+msgstr ""
+"\n"
+"Vstupní a výstupní přepínače:\n"
 
 #: help.c:108
-msgid "  -n              disable enhanced command line editing (readline)"
-msgstr ""
-"  -n              vypne edita�n� mo�nosti p��kazov� ��dky (podpora readline)"
+#, c-format
+msgid "  -a, --echo-all           echo all input from script\n"
+msgstr "  -a, --echo-all           ukáže všechny vstupy ze skriptu\n"
 
 #: help.c:109
-msgid "  -s              single-step mode (confirm each query)"
-msgstr "  -s              krokovac� m�d (nutn� potvrzen� ka�d�ho dotazu)"
+#, c-format
+msgid "  -e, --echo-queries       echo commands sent to server\n"
+msgstr "  -e --echo-queries        ukáže všechny příkazy poslané na server\n"
 
 #: help.c:110
-msgid "  -S              single-line mode (end of line terminates SQL command)"
-msgstr "  -S              jedno��dkov� m�d (konec ��dky ukon�uje SQL p��kaz)"
+#, c-format
+msgid ""
+"  -E, --echo-hidden        display queries that internal commands generate\n"
+msgstr "" 
+"  -E, --echo-hidden        ukáže dotazy, které generují interní příkazy\n"
+
+#: help.c:111
+#, c-format
+msgid "  -L, --log-file=FILENAME  send session log to file\n"
+msgstr "  -L, --log-file=FILENAME  uloží záznam sezení do souboru\n"
 
 #: help.c:112
+#, c-format
 msgid ""
-"\n"
-"Output format options:"
+"  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
-"\n"
-"V�stupn� form�t je:"
+"  -n, --no-readline        vypne editační možnosti příkazové řádky (podpora readline)\n"
 
 #: help.c:113
-msgid "  -A              unaligned table output mode (-P format=unaligned)"
-msgstr ""
-"  -A              m�d nezarovnan�ho form�tu tabulky (-P format=unaligned)"
+#, c-format
+msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
+msgstr "  -o,  --output=SOUBOR     zapíše výsledek dotazu do souboru (nebo |roury)\n"
 
 #: help.c:114
-msgid "  -H              HTML table output mode (-P format=html)"
-msgstr "  -H              M�d HTML form�tu tabulky (-P format=html)"
+#, c-format
+msgid ""
+"  -q, --quiet              run quietly (no messages, only query output)\n"
+msgstr ""
+"  -q, --quiet              tichý chod (bez hlášek, pouze výstupy dotazů)\n"
 
 #: help.c:115
-msgid "  -t              print rows only (-P tuples_only)"
-msgstr "  -t              tiskne pouze ��dky (-P tuples_only)"
+#, c-format
+msgid "  -s, --single-step        single-step mode (confirm each query)\n"
+msgstr "  -s, --single-step        krokovací mód (nutné potvrzení každého dotazu)\n"
 
 #: help.c:116
+#, c-format
 msgid ""
-"  -T TEXT         set HTML table tag attributes (width, border) (-P "
-"tableattr=)"
+"  -S, --single-line        single-line mode (end of line terminates SQL "
+"command)\n"
 msgstr ""
-"  -T TEXT         nastaven� atribut� HTML tabulky (width, border) (-P "
-"tableattr=)"
-
-#: help.c:117
-msgid "  -x              turn on expanded table output (-P expanded)"
-msgstr "  -x              v�stupu v roz���en� tabulce (-P expanded)"
+"  -S, --single-line        jednořádkový mód (konec řádky ukončuje SQL příkaz)\n"
 
 #: help.c:118
-msgid "  -P VAR[=ARG]    set printing option VAR to ARG (see \\pset command)"
+#, c-format
+msgid ""
+"\n"
+"Output format options:\n"
 msgstr ""
-"  -P VAR[=ARG]    zobrazovac� parametr 'VAR' nastavit na 'ARG' (viz. p��kaz "
-"\\pset)"
+"\n"
+"Výstupní formát je:\n"
 
 #: help.c:119
 #, c-format
-msgid ""
-"  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"
-msgstr "  -F �ET�ZEC      odd�lova� pol� (implicitn�: \"%s\") (-P fieldsep=)\n"
+msgid "  -A, --no-align           unaligned table output mode\n"
+msgstr "  -A, --no-align           mód nezarovnaného formátu tabulky\n"
 
-#: help.c:121
+#: help.c:120
+#, c-format
 msgid ""
-"  -R STRING       set record separator (default: newline) (-P recordsep=)"
+"  -F, --field-separator=STRING\n"
+"                           set field separator (default: \"%s\")\n"
 msgstr ""
-"  -R �ET�ZEC      odd�lova� z�znam� (implicitn�: newline) (-P recordsep=)"
+"  -F, --field-separator=ŘETĚZEC\n"
+"                           oddělovač polí (implicitně: \"%s\")\n"
 
 #: help.c:123
+#, c-format
+msgid "  -H, --html               HTML table output mode\n"
+msgstr "  -H, --html               Mód HTML formátu tabulky\n"
+
+#: help.c:124
+#, c-format
+msgid ""
+"  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
+"command)\n"
+msgstr ""
+"  -P, --pset=VAR[=ARG]     nastaví zobrazovací parametr 'VAR' na hodnotu 'ARG' (viz. příkaz "
+"\\pset)\n"
+
+#: help.c:125
+#, c-format
+msgid ""
+"  -R, --record-separator=STRING\n"
+"                           set record separator (default: newline)\n"
+msgstr ""
+"  -R, --record-separator=ŘETĚZEC\n"
+"                           oddělovač záznamů (implicitně: newline)\n"
+
+#: help.c:127
+#, c-format
+msgid "  -t, --tuples-only        print rows only\n"
+msgstr "  -t, --tuples-only        tiskne pouze řádky\n"
+
+#: help.c:128
+#, c-format
+msgid ""
+"  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
+"border)\n"
+msgstr ""
+"  -T, --table-attr=TEXT    nastavení atributů HTML tabulky (např. width, border)\n"
+
+#: help.c:129
+#, c-format
+msgid "  -x, --expanded           turn on expanded table output\n"
+msgstr "  -x, --expanded           výstupu v rozšířené tabulce\n"
+
+#: help.c:131
+#, c-format
 msgid ""
 "\n"
-"Connection options:"
+"Connection options:\n"
 msgstr ""
 "\n"
-"P�ep�na�e spojen�:"
+"Parametry spojení:\n"
 
-#: help.c:126
+#: help.c:134
 #, c-format
 msgid ""
-"  -h HOSTNAME     database server host or socket directory (default: \"%s"
-"\")\n"
+"  -h, --host=HOSTNAME      database server host or socket directory "
+"(default: \"%s\")\n"
 msgstr ""
-"  -h HOSTNAME     jm�no datab�zov�ho serveru nebo adres�� se soketem "
-"(implicitn�: \"%s\")\n"
+"  -h, --host=HOSTNAME      jméno databázového serveru nebo adresář se soketem "
+"(implicitně: \"%s\")\n"
 
-#: help.c:127
+#: help.c:135
 msgid "local socket"
-msgstr "lok�ln� soket"
+msgstr "lokální soket"
 
-#: help.c:130
+#: help.c:138
 #, c-format
-msgid "  -p PORT         database server port (default: \"%s\")\n"
+msgid ""
+"  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr ""
-"  -p PORT         specifikuje port datab�zov�ho serveru (implicitn�: \"%s"
+"  -p, --port=PORT          specifikuje port databázového serveru (implicitně: \"%s"
 "\")\n"
 
-#: help.c:136
+#: help.c:144
 #, c-format
-msgid "  -U NAME         database user name (default: \"%s\")\n"
+msgid ""
+"  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr ""
-"  -U JM�NO        specifikuje jm�no datab�zov�ho u�ivatele (implicitn�: \"%s"
+"  -U, --username=JMÉNO     specifikuje jméno databázového uživatele (implicitně: \"%s"
 "\")\n"
 
-#: help.c:137
-msgid "  -W              prompt for password (should happen automatically)"
-msgstr "  -W              dotaz na heslo (m�l by b�t proveden automaticky)"
+#: help.c:145
+#, fu c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        neptá se na heslo\n"
+
+#: help.c:146
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           vynucený dotaz na heslo (měl by být proveden "
+"automaticky)\n"
 
-#: help.c:140
+#: help.c:148
+#, c-format
 msgid ""
 "\n"
-"For more information, type \"\\?\" (for internal commands) or \"\\help\"\n"
-"(for SQL commands) from within psql, or consult the psql section in\n"
-"the PostgreSQL documentation.\n"
+"For more information, type \"\\?\" (for internal commands) or \"\\help"
+"\" (for SQL\n"
+"commands) from within psql, or consult the psql section in the PostgreSQL\n"
+"documentation.\n"
 "\n"
-"Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr ""
 "\n"
-"Pro v�ce informac� pou�ijte \"\\?\" (pro intern� p��kazy) nebo \"\\help\"\n"
-"(pro SQL p��kazy), nebo se pod�vejte do dokumentace PostgreSQL a\n"
-"��sti v�novan� psql.\n"
+"Pro více informací použijte \"\\?\" (pro interní příkazy) nebo \"\\help\"\n"
+"(pro SQL příkazy), nebo se podívejte do dokumentace PostgreSQL a\n"
+"části věnované psql.\n"
 "\n"
-"Chyby pos�lejte na <pgsql-bugs@postgresql.org>."
 
-#: help.c:174
+#: help.c:151
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby posílejte na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: help.c:169
 #, c-format
 msgid "General\n"
-msgstr "Hlavn�\n"
+msgstr "Hlavní\n"
 
-#: help.c:175
+#: help.c:170
 #, c-format
 msgid ""
-"  \\c[onnect] [DBNAME|- [USER]]\n"
-"                 connect to new database (currently \"%s\")\n"
+"  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr ""
-" \\c[onnect] [DATAB�ZE |- [U�IVATEL]]\n"
-"                vytvo�� spojen� do nov� datab�ze (sou�asn� \"%s\")\n"
+"  \\copyright             zobrazí podmínky použití a distribuce PostgreSQL\n"
 
-#: help.c:178
+#: help.c:171
 #, c-format
-msgid "  \\cd [DIR]      change the current working directory\n"
-msgstr " \\cd [ADRES��]  zm�na aktu�ln�ho pracovn�ho adres��\n"
+msgid ""
+"  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
+msgstr ""
+"  \\g [SOUBOR] nebo ;     pošle SQL dotaz na server (a zapíše výsledek do souboru"
+" nebo |roury)\n"
 
-#: help.c:179
+#: help.c:172
 #, c-format
-msgid "  \\copyright     show PostgreSQL usage and distribution terms\n"
-msgstr "  \\copyright     podm�nky pou�it� a distribuce PostgreSQL\n"
+msgid ""
+"  \\h [NAME]              help on syntax of SQL commands, * for all "
+"commands\n"
+msgstr ""
+"  \\h [JMÉNO]             nápověda syntaxe SQL příkazů, * pro všechny příkazy\n"
 
-#: help.c:180
+#: help.c:173
+#, c-format
+msgid "  \\q                     quit psql\n"
+msgstr "  \\q                     ukončení psql\n"
+
+#: help.c:176
+#, c-format
+msgid "Query Buffer\n"
+msgstr "Paměť dotazu\n"
+
+#: help.c:177
 #, c-format
 msgid ""
-"  \\encoding [ENCODING]\n"
-"                 show or set client encoding\n"
+"  \\e [FILE]              edit the query buffer (or file) with external "
+"editor\n"
 msgstr ""
-" \\encoding [K�DOV�N�]\n"
-"                 nastaven� k�dov�n� klienta\n"
+"  \\e [SOUBOR]            editace aktuálního dotazu (nebo souboru) v externím "
+"editoru\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
-msgid "  \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
+msgid ""
+"  \\ef [FUNCNAME]         edit function definition with external editor\n"
 msgstr ""
-" \\h [JM�NO]       n�pov�da syntaxe SQL p��kaz�, * pro v�echny p��kazy\n"
+"  \\ef [JMENOFUNKCE]      editace definice funkce v externím editoru\n"
+
+#: help.c:179
+#, c-format
+msgid "  \\p                     show the contents of the query buffer\n"
+msgstr "  \\p                     ukázat současný obsah paměti s dotazem\n"
 
-#: help.c:183
+#: help.c:180
 #, c-format
-msgid "  \\q             quit psql\n"
-msgstr "  \\q             ukon�en� psql\n"
+msgid "  \\r                     reset (clear) the query buffer\n"
+msgstr "  \\r                     vyprázdnění paměti s dotazy\n"
+
+#: help.c:182
+#, c-format
+msgid "  \\s [FILE]              display history or save it to file\n"
+msgstr "  \\s [SOUBOR]            vytiskne historii nebo ji uloží do souboru\n"
 
 #: help.c:184
 #, c-format
-msgid ""
-"  \\set [NAME [VALUE]]\n"
-"                 set internal variable, or list all if no parameters\n"
-msgstr ""
-" \\set [JM�NO [HODNOTA]]\n"
-"                 nastaven� intern� prom�nn� nebo bez parametr� zobraz� "
-"seznam v�ech prom�nn�ch\n"
+msgid "  \\w FILE                write query buffer to file\n"
+msgstr "  \\w SOUBOR              zapsání paměti s dotazem do souboru\n"
 
-#: help.c:186
+#: help.c:187
 #, c-format
-msgid "  \\timing        toggle timing of commands (currently %s)\n"
-msgstr " \\timing        pou��t sledov�n� �asu u p��kaz� (nyn� %s)\n"
+msgid "Input/Output\n"
+msgstr "Vstup/Výstup\n"
 
 #: help.c:188
 #, c-format
-msgid "  \\unset NAME    unset (delete) internal variable\n"
-msgstr "  \\unset JM�NO   zru�en� intern� prom�nn�\n"
+msgid ""
+"  \\copy ...              perform SQL COPY with data stream to the client "
+"host\n"
+msgstr ""
+"  \\copy ...              provede SQL COPY s tokem dat na klienta\n"
 
 #: help.c:189
 #, c-format
-msgid "  \\! [COMMAND]   execute command in shell or start interactive shell\n"
-msgstr ""
-"  \\! [P��KAZ]    proveden� p��kazu v shellu nebo nastartuje interaktivn� "
-"shell\n"
+msgid "  \\echo [STRING]         write string to standard output\n"
+msgstr "  \\echo [TEXT]           vypsání textu na standardní výstup\n"
 
-#: help.c:192
+#: help.c:190
 #, c-format
-msgid "Query Buffer\n"
-msgstr "Pam� dotazu\n"
+msgid "  \\i FILE                execute commands from file\n"
+msgstr "  \\i SOUBOR              provedení příkazů ze souboru\n"
 
-#: help.c:193
+#: help.c:191
 #, c-format
 msgid ""
-"  \\e [FILE]      edit the query buffer (or file) with external editor\n"
+"  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr ""
-" \\e [SOUBOR]      editace aktu�ln�ho dotazu nebo souboru v extern�m "
-"editoru\n"
+"  \\o [SOUBOR]            přesměrování výsledků dotazu do souboru nebo |roury\n"
 
-#: help.c:194
+#: help.c:192
 #, c-format
 msgid ""
-"  \\g [FILE]      send query buffer to server (and results to file or |"
-"pipe)\n"
+"  \\qecho [STRING]        write string to query output stream (see \\o)\n"
 msgstr ""
-" \\g [SOUBOR]      po�le SQL dotaz na server (a zap��e v�sledek do souboru "
-"to nebo |roury)\n"
+"  \\qecho [ŘETĚZEC]       vypsání textu na výstup dotazů (viz. \\o)\n"
 
 #: help.c:195
 #, c-format
-msgid "  \\p             show the contents of the query buffer\n"
-msgstr " \\p             uk�zat sou�asn� obsah pam�ti s dotazem\n"
+msgid "Informational\n"
+msgstr "Informační\n"
 
 #: help.c:196
 #, c-format
-msgid "  \\r             reset (clear) the query buffer\n"
-msgstr " \\r             vypr�zdn�n� pam�ti s dotazy\n"
+msgid "  (options: S = show system objects, + = additional detail)\n"
+msgstr "  (volby: S = zobraz systémové objekty, + = další detaily)\n"
+
+#: help.c:197
+#, c-format
+msgid "  \\d[S+]                 list tables, views, and sequences\n"
+msgstr "  \\dp[S+]                seznam tabulek, pohledů a sekvencí\n"
 
 #: help.c:198
 #, c-format
-msgid "  \\s [FILE]      display history or save it to file\n"
-msgstr " \\s [SOUBOR]      vytisknut� historie nebo ji ulo�� do souboru\n"
+msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgstr "  \\d[S+]  JMÉNO          popis tabulky, pohledů, sekvence nebo indexu\n"
+
+#: help.c:199
+#, c-format
+msgid "  \\da[+]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[+]  [VZOR]         seznam agregátních funkcí\n"
 
 #: help.c:200
 #, c-format
-msgid "  \\w FILE        write query buffer to file\n"
-msgstr " \\w SOUBOR      zaps�n� pam�ti s dotazem do souboru\n"
+msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
+msgstr "  \\db[+]  [VZOR]         seznam tablespaců\n"
+
+#: help.c:201
+#, c-format
+msgid "  \\dc[S]  [PATTERN]      list conversions\n"
+msgstr "  \\dc[S]  [VZOR]         seznam konverzí\n"
+
+#: help.c:202
+#, c-format
+msgid "  \\dC     [PATTERN]      list casts\n"
+msgstr "  \\dC     [VZOR]         seznam přetypování\n"
 
 #: help.c:203
 #, c-format
-msgid "Input/Output\n"
-msgstr "Vstup/V�stup\n"
+msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
+msgstr "  \\dd[S]  [VZOR]         ukázat komentář k objektu\n"
 
 #: help.c:204
 #, c-format
-msgid "  \\echo [STRING] write string to standard output\n"
-msgstr " \\echo [TEXT]     zapsat text na standardn� v�stup\n"
+msgid "  \\dD[S]  [PATTERN]      list domains\n"
+msgstr "  \\dD[S]  [VZOR]         seznam domén (domain)\n"
 
 #: help.c:205
 #, c-format
-msgid "  \\i FILE        execute commands from file\n"
-msgstr " \\i [SOUBOR]      proveden� p��kaz� ze souboru\n"
+msgid "  \\des[+] [PATTERN]      list foreign servers\n"
+msgstr "  \\des[+] [VZOR]         seznam foreign serverů\n"
 
 #: help.c:206
 #, c-format
-msgid "  \\o [FILE]      send all query results to file or |pipe\n"
-msgstr ""
-" \\o [SOUBOR]      p�esm�rov�n� v�sledk� dotazu do souboru nebo |roury\n"
+msgid "  \\deu[+] [PATTERN]      list user mappings\n"
+msgstr "  \\deu[+] [VZOR]         seznam mapování uživatelů\n"
 
 #: help.c:207
 #, c-format
+msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
+msgstr "  \\dew[+] [VZOR]         seznam foreign-data wrappers\n"
+
+#: help.c:208
+#, c-format
 msgid ""
-"  \\qecho [STRING]\n"
-"                 write string to query output stream (see \\o)\n"
+"  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
 msgstr ""
-" \\qecho [�ET�ZEC]\n"
-"                 zaps�n� textu na v�stup dotaz� (viz. \\o)\n"
+"  \\df[antw][S+] [VZOR]   seznam [pouze agg/normal/trigger/window] funkcí\n"
+
+#: help.c:209
+#, c-format
+msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
+msgstr "  \\dF[+]   [VZOR]        seznam konfigurací fulltextového vyhledávání\n"
+
+#: help.c:210
+#, c-format
+msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
+msgstr "  \\dFd[+] [VZOR]         seznam slovníků fulltextového vyhledávání\n"
 
 #: help.c:211
 #, c-format
-msgid "Informational\n"
-msgstr "Informa�n�\n"
+msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
+msgstr "  \\dFp[+] [VZOR]         seznam parserů fulltextového vyhledávání\n"
 
 #: help.c:212
 #, c-format
-msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
-msgstr " \\d [JM�NO]     popis tabulky (nebo view, indexu nebo sekvence)\n"
+msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
+msgstr "  \\dFt[+] [VZOR]         seznam šablon fulltextového vyhledávání\n"
 
 #: help.c:213
 #, c-format
-msgid ""
-"  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
-"                 list tables/indexes/sequences/views/system tables\n"
-msgstr ""
-"  \\d{t|i|s|v|S} [VZOR] (p�idej \"+\" pro v�ce detail�)\n"
-"                 seznam tabulek/index�/sekvenc�/view/syst�mov�ch tabulek\n"
+msgid "  \\dg     [PATTERN]      list roles (groups)\n"
+msgstr "  \\dg     [VZOR]         seznam rolí (skupin)\n"
+
+#: help.c:214
+#, c-format
+msgid "  \\di[S+] [PATTERN]      list indexes\n"
+msgstr "  \\di[S+] [VZOR]         seznam indexů\n"
 
 #: help.c:215
 #, c-format
-msgid "  \\da [PATTERN]  list aggregate functions\n"
-msgstr " \\da [VZOR]           seznam agreg�tn�ch funkc�\n"
+msgid "  \\dl                    list large objects, same as \\lo_list\n"
+msgstr "  \\dl                    seznam \"large object\" stejné jako \\lo_list\n"
 
 #: help.c:216
 #, c-format
-msgid "  \\db [PATTERN]  list tablespaces (add \"+\" for more detail)\n"
-msgstr "  \\db  [VZOR]  seznam tablespaces (p�idej \"+\" pro v�ce detail�)\n"
+msgid "  \\dn[+]  [PATTERN]      list schemas\n"
+msgstr "  \\dn[+]  [VZOR]         seznam schémat\n"
 
 #: help.c:217
 #, c-format
-msgid "  \\dc [PATTERN]  list conversions\n"
-msgstr "  \\dc [VZOR]  seznam konverz� (conversion)\n"
+msgid "  \\do[S]  [PATTERN]      list operators\n"
+msgstr "  \\do[S]  [VZOR]         seznam operátorů\n"
 
 #: help.c:218
 #, c-format
-msgid "  \\dC            list casts\n"
-msgstr " \\dC            seznam p�etypov�n�\n"
+msgid ""
+"  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
+msgstr ""
+"  \\dp     [VZOR]         seznam přístupových práv tabulek, pohledů a sekvencí\n"
 
 #: help.c:219
 #, c-format
-msgid "  \\dd [PATTERN]  show comment for object\n"
-msgstr "  \\dd [VZOR]  uk�zat koment�� k objektu\n"
+msgid "  \\ds[S+] [PATTERN]      list sequences\n"
+msgstr "  \\ds[S+] [VZOR]         seznam sekvencí\n"
 
 #: help.c:220
 #, c-format
-msgid "  \\dD [PATTERN]  list domains\n"
-msgstr "  \\dD [VZOR]  seznam dom�n (domain)\n"
+msgid "  \\dt[S+] [PATTERN]      list tables\n"
+msgstr "  \\dt[S+] [VZOR]         seznam tabulek\n"
 
 #: help.c:221
 #, c-format
-msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
-msgstr "  \\df [VZOR]  seznam funkc� (p�idej \"+\" pro v�ce detail�)\n"
+msgid "  \\dT[S+] [PATTERN]      list data types\n"
+msgstr "  \\dT[S+] [VZOR]         seznam datových typů\n"
 
 #: help.c:222
 #, c-format
-msgid "  \\dg [PATTERN]  list groups\n"
-msgstr "  \\dg [VZOR]  seznam skupin\n"
+msgid "  \\du     [PATTERN]      list roles (users)\n"
+msgstr "  \\du     [VZOR]         seznam rolí (uživatelů)\n"
 
 #: help.c:223
 #, c-format
-msgid "  \\dn [PATTERN]  list schemas (add \"+\" for more detail)\n"
-msgstr "  \\dn [VZOR]  seznam schemat (p�idej \"+\" pro v�ce detail�)\n"
+msgid "  \\dv[S+] [PATTERN]      list views\n"
+msgstr "  \\dv[S+] [VZOR]         seznam pohledů\n"
 
 #: help.c:224
 #, c-format
-msgid "  \\do [NAME]     list operators\n"
-msgstr " \\do [JM�NO]     sezname oper�tor�\n"
+msgid "  \\l[+]                  list all databases\n"
+msgstr "  \\l[+]                  seznam databázích \n"
 
 #: help.c:225
 #, c-format
-msgid "  \\dl            list large objects, same as \\lo_list\n"
-msgstr " \\dl            seznam \"large object\" stejn� jako \\lo_list\n"
-
-#: help.c:226
-#, c-format
-msgid "  \\dp [PATTERN]  list table, view, and sequence access privileges\n"
-msgstr "  \\dp [VZOR]  seznam p��stupov�ch pr�v tabulek, n�hled� a sekvenc�\n"
-
-#: help.c:227
-#, c-format
-msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
-msgstr "  \\dT [VZOR]  seznam datov�ch typ� (p�idej \"+\" pro v�ce detail�)\n"
+msgid "  \\z      [PATTERN]      same as \\dp\n"
+msgstr "  \\z      [VZOR]         stejné jako \\dp\n"
 
 #: help.c:228
 #, c-format
-msgid "  \\du [PATTERN]  list users\n"
-msgstr "  \\du [VZOR]  seznam u�ivatel�\n"
+msgid "Formatting\n"
+msgstr "Formátování\n"
 
 #: help.c:229
 #, c-format
-msgid "  \\l             list all databases (add \"+\" for more detail)\n"
-msgstr ""
-"  \\l             seznam v�ech datab�z� (p�idej \"+\" pro v�ce detail�)\n"
+msgid ""
+"  \\a                     toggle between unaligned and aligned output mode\n"
+msgstr "" 
+"  \\a                     přepíná mezi 'unaligned' a 'aligned' modem výstupu\n"
 
 #: help.c:230
 #, c-format
+msgid "  \\C [STRING]            set table title, or unset if none\n"
+msgstr ""
+"  \\C [ŘETĚZEC]           nastaví titulek tabulky nebo odnastaví pokud není "
+"definován řetězec\n"
+
+#: help.c:231
+#, c-format
 msgid ""
-"  \\z [PATTERN]   list table, view, and sequence access privileges (same as "
-"\\dp)\n"
+"  \\f [STRING]            show or set field separator for unaligned query "
+"output\n"
 msgstr ""
-"  \\z [VZOR]   seznam p��stupov�ch pr�v tabulek, n�hled� a sekvenc� (stejn� "
-"jako \\dp)\n"
+"  \\f [ŘETĚZEC]           nastaví nebo zobrazí oddělovače polí pro nezarovnaný "
+"výstup dotazů\n"
 
-#: help.c:233
+#: help.c:232
 #, c-format
-msgid "Formatting\n"
-msgstr "Form�tov�n�\n"
+msgid "  \\H                     toggle HTML output mode (currently %s)\n"
+msgstr "  \\H                     zapne HTML mód výstupu (nyní %s)\n"
 
 #: help.c:234
 #, c-format
-msgid "  \\a             toggle between unaligned and aligned output mode\n"
-msgstr "  \\a             p�ep�n� mezi 'unaligned' a 'aligned' modem v�stupu\n"
+msgid ""
+"  \\pset NAME [VALUE]     set table output option\n"
+"                         (NAME := {format|border|expanded|fieldsep|footer|"
+"null|\n"
+"                         numericlocale|recordsep|tuples_only|title|tableattr|"
+"pager})\n"
+msgstr ""
+"  \\pset JMÉNO [HODNOTA]  nastaví parametry výstupní tabulky\n"
+"                         (JMÉNO := {format|border|expanded|fieldsep|footer|null|\n"
+"                         recordsep|tuples_only|title|tableattr|pager})\n"
 
-#: help.c:235
+#: help.c:237
 #, c-format
-msgid "  \\C [STRING]    set table title, or unset if none\n"
-msgstr ""
-"  \\C [�ET�ZEC]    nastav� titulek tabulky nebo odnastav� pokud nen� "
-"definov�n �et�zec\n"
+msgid "  \\t [on|off]            show only rows (currently %s)\n"
+msgstr "  \\t [on|off]            ukazovat pouze řádky (nyní %s)\n"
 
-#: help.c:236
+#: help.c:239
 #, c-format
 msgid ""
-"  \\f [STRING]    show or set field separator for unaligned query output\n"
+"  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
-" \\f [�ET�ZEC]     nastaven� nebo uk�z�n� odd�lova�e pol� pro nezarovnan� "
-"v�stup dotaz�\n"
+"  \\T [ŘETĚZEC]           nastavení atributů HTML tagu <table>\n"
 
-#: help.c:237
+#: help.c:240
 #, c-format
-msgid "  \\H             toggle HTML output mode (currently %s)\n"
-msgstr "  \\H             zapne HTML m�d v�stupu (nyn� %s)\n"
+msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
+msgstr "  \\x [on|off]            zapne rozšířený mód výstupu (nyní %s)\n"
 
-#: help.c:239
+#: help.c:244
+#, c-format
+msgid "Connection\n"
+msgstr "Spojení\n"
+
+#: help.c:245
 #, c-format
 msgid ""
-"  \\pset NAME [VALUE]\n"
-"                 set table output option\n"
-"                 (NAME := {format|border|expanded|fieldsep|footer|null|\n"
-"                 recordsep|tuples_only|title|tableattr|pager})\n"
+"  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
+"                         connect to new database (currently \"%s\")\n"
 msgstr ""
-"  \\pset JM�NO [HODNOTA]\n"
-"                 nastav� parametry v�stupn� tabulky\n"
-"                 (JM�NO := {format|border|expanded|fieldsep|footer|null|\n"
-"                 recordsep|tuples_only|title|tableattr|pager})\n"
+" \\c[onnect] [DATABÁZE|- UŽIVATEL|- HOST|- PORT|-]]\n"
+"                         vytvoří spojení do nové databáze (současná \"%s\")\n"
 
-#: help.c:243
+#: help.c:248
 #, c-format
-msgid "  \\t             show only rows (currently %s)\n"
-msgstr "  \\t             ukazovat pouze ��dky (nyn� %s)\n"
+msgid "  \\encoding [ENCODING]   show or set client encoding\n"
+msgstr "  \\encoding [KÓDOVÁNÍ]   zobrazení nebo nastavení kódování klienta\n"
 
-#: help.c:245
+#: help.c:249
+#, c-format
+msgid "  \\password [USERNAME]   securely change the password for a user\n"
+msgstr "  \\password [UŽIVATEL]   bezpečná změna hesla uživatele\n"
+
+#: help.c:252
 #, c-format
-msgid "  \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
-msgstr " \\T [�ET�ZEC]    nastaven� atribut� HTML tagu table\n"
+msgid "Operating System\n"
+msgstr "Operační systém\n"
 
-#: help.c:246
+#: help.c:253
 #, c-format
-msgid "  \\x             toggle expanded output (currently %s)\n"
-msgstr " \\x             zapne roz���en� m�d v�stupu (nyn� %s)\n"
+msgid "  \\cd [DIR]              change the current working directory\n"
+msgstr "  \\cd [ADRESÁŘ]          změna aktuálního pracovního adresář\n"
 
-#: help.c:250
+#: help.c:254
 #, c-format
-msgid "Copy, Large Object\n"
-msgstr "Kop�rov�n�, Velk� objekty (LO)\n"
+msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
+msgstr "  \\timing [on|off]       použít sledování času u příkazů (nyní %s)\n"
 
-#: help.c:251
+#: help.c:256
 #, c-format
 msgid ""
-"  \\copy ...      perform SQL COPY with data stream to the client host\n"
-msgstr "  \\copy ...      provede SQL COPY s tokem dat na klienta\n"
+"  \\! [COMMAND]           execute command in shell or start interactive "
+"shell\n"
+msgstr ""
+"  \\! [PŘÍKAZ]            provedení příkazu v shellu nebo nastartuje interaktivní "
+"shell\n"
 
-#: help.c:252
+#: help.c:259
+#, c-format
+msgid "Variables\n"
+msgstr "Proměnné\n"
+
+#: help.c:260
+#, c-format
+msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
+msgstr "  \\prompt [TEXT] PROMĚNÁ vyzve uživatele, aby zadal hodnotu proměnné\n"
+
+#: help.c:261
+#, c-format
+msgid ""
+"  \\set [NAME [VALUE]]    set internal variable, or list all if no "
+"parameters\n"
+msgstr ""
+"  \\set [PROMĚNÁ [HODNOTA]]\n"
+"                         nastavení interní proměnné nebo bez parametrů zobrazí\n"
+"                         seznam všech proměnných\n"
+
+#: help.c:262
+#, c-format
+msgid "  \\unset NAME            unset (delete) internal variable\n"
+msgstr "  \\unset JMÉNO           zrušení interní proměnné\n"
+
+#: help.c:265
+#, c-format
+msgid "Large Objects\n"
+msgstr "Velké objekty\n"
+
+#: help.c:266
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
-"  \\lo_import FILE [COMMENT] \n"
+"  \\lo_import FILE [COMMENT]\n"
 "  \\lo_list\n"
-"  \\lo_unlink LOBOID    large object operations\n"
+"  \\lo_unlink LOBOID      large object operations\n"
 msgstr ""
 "  \\lo_export LOBOID SOUBOR\n"
-"  \\lo_import SOUBOR [KOMENT��] \n"
+"  \\lo_import SOUBOR [KOMENTÁŘ]\n"
 "  \\lo_list\n"
-"  \\lo_unlink LOBOID    operace s \"large object\"\n"
+"  \\lo_unlink LOBOID      operace s \"large\" objekty\n"
 
-#: help.c:285
+#: help.c:318
 msgid "Available help:\n"
-msgstr "Dostupn� n�pov�da:\n"
+msgstr "Dostupná nápověda:\n"
 
-#: help.c:344
+#: help.c:407
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -910,582 +1197,875 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"P��kaz:     %s\n"
+"Příkaz:     %s\n"
 "Popis:      %s\n"
 "Syntaxe:\n"
 "%s\n"
 "\n"
 
-#: help.c:357
+#: help.c:423
 #, c-format
 msgid ""
 "No help available for \"%-.*s\".\n"
 "Try \\h with no arguments to see available help.\n"
 msgstr ""
-"N�pov�da pro \"%-.*s\" je nedostupn�.\n"
-"Pomoc� \\h bez parametr� lze z�skat seznam dostupn�ch n�pov�d.\n"
+"Nápověda pro \"%-.*s\" je nedostupná.\n"
+"Pomocí \\h bez parametrů lze získat seznam dostupných nápověd.\n"
+
+#: input.c:187
+#, c-format
+msgid "could not read from input file: %s\n"
+msgstr "nelze číst vstupní soubor: %s\n"
 
-#: input.c:210
+#: input.c:347
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
-msgstr "nelze ulo�it historii do souboru \"%s\": %s\n"
+msgstr "nelze uložit historii do souboru \"%s\": %s\n"
 
-#: input.c:213
+#: input.c:352
 msgid "history is not supported by this installation\n"
-msgstr "historie nen� podporov�na pro tuto instalaci\n"
+msgstr "historie není podporována pro tuto instalaci\n"
 
-#: large_obj.c:36
+#: large_obj.c:66
 #, c-format
 msgid "%s: not connected to a database\n"
-msgstr "%s: nen� spojen� s datab�z�\n"
+msgstr "%s: není spojení s databází\n"
 
-#: large_obj.c:55
+#: large_obj.c:85
 #, c-format
 msgid "%s: current transaction is aborted\n"
-msgstr "%s: sou�asn� transakce je jen nestandardn� ukon�ena (abort)\n"
+msgstr "%s: současná transakce je jen nestandardně ukončena (abort)\n"
 
-#: large_obj.c:58
+#: large_obj.c:88
 #, c-format
 msgid "%s: unknown transaction status\n"
-msgstr "%s: nezn�m� status transakce\n"
+msgstr "%s: neznámý status transakce\n"
 
-#: large_obj.c:256 describe.c:83 describe.c:187 describe.c:260 describe.c:322
-#: describe.c:369 describe.c:469 describe.c:758 describe.c:1488
-#: describe.c:1733
+#: large_obj.c:286
+msgid "ID"
+msgstr ""
+
+#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:337 describe.c:490
+#: describe.c:565 describe.c:636 describe.c:759 describe.c:1237
+#: describe.c:2008 describe.c:2136 describe.c:2428 describe.c:2490
+#: describe.c:2626 describe.c:2665 describe.c:2732 describe.c:2791
+#: describe.c:2800 describe.c:2859
 msgid "Description"
 msgstr "Popis"
 
-#: large_obj.c:264
+#: large_obj.c:295
 msgid "Large objects"
-msgstr "Velk� objekty (LO)"
+msgstr "Velké objekty (LO)"
 
-#: mainloop.c:172
+#: mainloop.c:156
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
-msgstr "Pou�ijte \"\\q\" pro odchod z %s.\n"
+msgstr "Použijte \"\\q\" pro odchod z %s.\n"
+
+#: mainloop.c:182
+msgid "You are using psql, the command-line interface to PostgreSQL."
+msgstr "Používáte psql, řádkový nástroj pro připojení k PostgreSQL."
+
+#: mainloop.c:183
+#, c-format
+msgid ""
+"Type:  \\copyright for distribution terms\n"
+"       \\h for help with SQL commands\n"
+"       \\? for help with psql commands\n"
+"       \\g or terminate with semicolon to execute query\n"
+"       \\q to quit\n"
+msgstr ""
+"Pište: \\copyright pro podmínky distribuce\n"
+"       \\h pro nápovědu k SQL příkazům\n"
+"       \\? pro nápovědu k pgsql příkazům\n"
+"       \\g nebo středník pro ukončení SQL příkazů\n"
+"       \\q pro ukončení programu\n"
 
-#: print.c:428
+#: print.c:973
+#, c-format
 msgid "(No rows)\n"
-msgstr "(��dn� ��dky)\n"
+msgstr "(Žádné řádky)\n"
 
-#: print.c:1200
+#: print.c:1960
 #, c-format
-msgid "(1 row)"
-msgstr "(1 ��dka)"
+msgid "Interrupted\n"
+msgstr ""
 
-#: print.c:1202
+#: print.c:2027
 #, c-format
-msgid "(%d rows)"
-msgstr "(%d ��dek)"
+msgid "Cannot add header to table content: column count of %d exceeded.\n"
+msgstr ""
 
-#: startup.c:132
+#: print.c:2064
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: do�la pam�\n"
+msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
+msgstr ""
 
-#: startup.c:181
-msgid "User name: "
-msgstr "U�ivatelsk� jm�no: "
+#: print.c:2263
+#, c-format
+msgid "invalid output format (internal error): %d"
+msgstr "specifikován neplatný formát výstupu (interní chyba): %d"
 
-#: startup.c:292
+#: print.c:2351
+#, c-format
+msgid "(1 row)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(%lu řádka)"
+msgstr[1] "(%lu řádky)"
+msgstr[2] "(%lu řádek)"
+
+#: startup.c:217
+#, c-format
+msgid "%s: could not open log file \"%s\": %s\n"
+msgstr "%s: nelze otevřít logovací soubor \"%s\": %s\n"
+
+#: startup.c:279
 #, c-format
 msgid ""
-"Welcome to %s %s, the PostgreSQL interactive terminal.\n"
-"\n"
-"Type:  \\copyright for distribution terms\n"
-"       \\h for help with SQL commands\n"
-"       \\? for help with psql commands\n"
-"       \\g or terminate with semicolon to execute query\n"
-"       \\q to quit\n"
+"Type \"help\" for help.\n"
 "\n"
 msgstr ""
-"V�tejte do %s %s, interaktivn�ho termin�lu PostgreSQL.\n"
-"\n"
-"Pi�te: \\copyright pro podm�nky distribuce\n"
-"       \\h pro n�pov�du k SQL p��kaz�m\n"
-"       \\? pro n�pov�du k pgsql p��kaz�m\n"
-"       \\g nebo st�edn�k pro ukon�en� SQL p��kaz�\n"
-"       \\q pro ukon�en� programu\n"
+"Pro získání nápovědy napište \"help\".\n"
 "\n"
 
-#: startup.c:446
+#: startup.c:425
 #, c-format
-msgid "%s: couldn't set printing parameter \"%s\"\n"
-msgstr "%s: nelze nastavit v�stupn� parametr \"%s\"\n"
+msgid "%s: could not set printing parameter \"%s\"\n"
+msgstr "%s: nelze nastavit parametr zobrazení \"%s\"\n"
 
-#: startup.c:492
+#: startup.c:464
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
-msgstr "%s: nelze smazat prom�nn� \"%s\"\n"
+msgstr "%s: nelze smazat proměnná \"%s\"\n"
 
-#: startup.c:502
+#: startup.c:474
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
-msgstr "%s: nelze nastavit prom�nn� \"%s\"\n"
+msgstr "%s: nelze nastavit proměnná \"%s\"\n"
 
-#: startup.c:533 startup.c:539
+#: startup.c:511 startup.c:517
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Zkuste \"%s --help\" pro v�ce informac�.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
 
-#: startup.c:557
+#: startup.c:534
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
-msgstr "%s: varov�n�: zvl�tn� parametr p��kazov� ��dky \"%s\" ignorov�n\n"
+msgstr "%s: varování: zvláštní parametr příkazové řádky \"%s\" ignorován\n"
 
-#: startup.c:564
-#, c-format
-msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
-msgstr "%s: Varov�n�: parametr -u je ji� neplatn�. Pou�ijte -U.\n"
-
-#: startup.c:629
+#: startup.c:599
 msgid "contains support for command-line editing"
-msgstr "obsahuje podporu editaci p��kazov� ��dky "
-
-#: startup.c:652
-#, c-format
-msgid ""
-"SSL connection (cipher: %s, bits: %i)\n"
-"\n"
-msgstr ""
-"SSL spojen� (�ifra: %s, bit�: %i)\n"
-"\n"
+msgstr "obsahuje podporu editaci příkazové řádky "
 
-#: describe.c:82 describe.c:177 describe.c:247 describe.c:320 describe.c:415
-#: describe.c:469 describe.c:1476 describe.c:1585 describe.c:1633
+#: describe.c:68 describe.c:235 describe.c:462 describe.c:560 describe.c:681
+#: describe.c:756 describe.c:2114 describe.c:2234 describe.c:2289
+#: describe.c:2488 describe.c:2715 describe.c:2787 describe.c:2798
+#: describe.c:2857
 msgid "Schema"
-msgstr "Sch�ma"
+msgstr "Schéma"
 
-#: describe.c:82 describe.c:128 describe.c:177 describe.c:247 describe.c:320
-#: describe.c:362 describe.c:415 describe.c:469 describe.c:1476
-#: describe.c:1586 describe.c:1634 describe.c:1727
+#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:561
+#: describe.c:611 describe.c:682 describe.c:757 describe.c:2115
+#: describe.c:2235 describe.c:2290 describe.c:2419 describe.c:2489
+#: describe.c:2716 describe.c:2788 describe.c:2799 describe.c:2858
+#: describe.c:3048 describe.c:3107
 msgid "Name"
-msgstr "Jm�no"
+msgstr "Jméno"
 
-#: describe.c:82
-msgid "(all types)"
-msgstr "(v�echny typy)"
+#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
+msgid "Result data type"
+msgstr "Datový typ výsledku"
 
-#: describe.c:83
-msgid "Data type"
-msgstr "Datov� typ"
+#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
+msgid "Argument data types"
+msgstr "Datový typ parametru"
 
-#: describe.c:97
+#: describe.c:113
 msgid "List of aggregate functions"
-msgstr "Seznam agreg�tn�ch funkc�"
+msgstr "Seznam agregátních funkcí"
 
-#: describe.c:117
+#: describe.c:134
 #, c-format
-msgid "The server version (%d) does not support tablespaces.\n"
-msgstr "Verze serveru (%d) nepodporuje tablespace.\n"
+msgid "The server (version %d.%d) does not support tablespaces.\n"
+msgstr "Server (verze %d.%d) nepodporuje tablespace.\n"
 
-#: describe.c:128 describe.c:186 describe.c:362 describe.c:1478
-#: describe.c:1727
+#: describe.c:146 describe.c:334 describe.c:612 describe.c:2122
+#: describe.c:2420 describe.c:3049 describe.c:3108
 msgid "Owner"
-msgstr "Vlastn�k"
+msgstr "Vlastník"
 
-#: describe.c:128
+#: describe.c:147
 msgid "Location"
-msgstr "Um�st�n�"
-
-#: describe.c:133 describe.c:415 describe.c:1733
-msgid "Access privileges"
-msgstr "P��stupov� pr�va"
+msgstr "Umístění"
 
-#: describe.c:150
+#: describe.c:175
 msgid "List of tablespaces"
 msgstr "Seznam tablespaces"
 
-#: describe.c:177
-msgid "Result data type"
-msgstr "Datov� typ v�sledku"
+#: describe.c:212
+#, c-format
+msgid "\\df only takes [antwS+] as options\n"
+msgstr "pro \\df můžete použít pouze tyto přepínače [antwS+]\n"
 
-#: describe.c:178
-msgid "Argument data types"
-msgstr "Datov� typ parametru"
+#: describe.c:218
+#, c-format
+msgid "\\df does not take a \"w\" option in %d.%d.\n"
+msgstr "pro \\df nelze použít \"w\" ve verzi %d.%d.\n"
+
+#. translator: "agg" is short for "aggregate"
+#: describe.c:251 describe.c:297 describe.c:314
+msgid "agg"
+msgstr ""
+
+#: describe.c:252
+msgid "window"
+msgstr ""
+
+#: describe.c:253 describe.c:298 describe.c:315 describe.c:896
+msgid "trigger"
+msgstr "trigger"
+
+#: describe.c:254 describe.c:299 describe.c:316
+msgid "normal"
+msgstr "normální"
+
+#: describe.c:255 describe.c:300 describe.c:317 describe.c:684 describe.c:1222
+#: describe.c:2121 describe.c:2236 describe.c:3120
+msgid "Type"
+msgstr "Typ"
+
+#: describe.c:330
+#, fuzzy
+msgid "immutable"
+msgstr "tabulka"
+
+#: describe.c:331
+msgid "stable"
+msgstr "stabilní"
 
-#: describe.c:186
+#: describe.c:332
+msgid "volatile"
+msgstr ""
+
+#: describe.c:333
+msgid "Volatility"
+msgstr ""
+
+#: describe.c:335
 msgid "Language"
 msgstr "Jazyk"
 
-#: describe.c:187
+#: describe.c:336
 msgid "Source code"
-msgstr "Zdrojov� k�d"
+msgstr "Zdrojový kód"
 
-#: describe.c:221
+#: describe.c:434
 msgid "List of functions"
-msgstr "Seznam funkc�"
+msgstr "Seznam funkcí"
 
-#: describe.c:257
+#: describe.c:473
 msgid "Internal name"
-msgstr "Intern� jm�no"
+msgstr "Interní jméno"
 
-#: describe.c:257
+#: describe.c:474 describe.c:628 describe.c:2132
 msgid "Size"
 msgstr "Velikost"
 
-#: describe.c:289
+#: describe.c:486
+msgid "Elements"
+msgstr "Prvky"
+
+#: describe.c:529
 msgid "List of data types"
-msgstr "Seznam datov�ch typ�"
+msgstr "Seznam datových typů"
 
-#: describe.c:321
+#: describe.c:562
 msgid "Left arg type"
-msgstr "Typ lev�ho arg."
+msgstr "Typ levého arg."
 
-#: describe.c:321
+#: describe.c:563
 msgid "Right arg type"
-msgstr "Typ prav�ho arg."
+msgstr "Typ pravého arg."
 
-#: describe.c:322
+#: describe.c:564
 msgid "Result type"
-msgstr "Typ v�sledku"
+msgstr "Typ výsledku"
 
-#: describe.c:336
+#: describe.c:583
 msgid "List of operators"
-msgstr "Seznam oper�tor�"
+msgstr "Seznam operátorů"
 
-#: describe.c:365
+#: describe.c:613
 msgid "Encoding"
-msgstr "K�dov�n�"
+msgstr "Kódování"
+
+#: describe.c:618
+msgid "Collation"
+msgstr ""
+
+#: describe.c:619
+#, fuzzy
+msgid "Ctype"
+msgstr "Typ"
 
-#: describe.c:381
+#: describe.c:632
+msgid "Tablespace"
+msgstr "Tablespace"
+
+#: describe.c:649
 msgid "List of databases"
-msgstr "Seznam datab�z�"
+msgstr "Seznam databází"
 
-#: describe.c:415 describe.c:543 describe.c:1477
+#: describe.c:683 describe.c:851 describe.c:2116
 msgid "table"
 msgstr "tabulka"
 
-#: describe.c:415 describe.c:543 describe.c:1477
+#: describe.c:683 describe.c:852 describe.c:2117
 msgid "view"
-msgstr "n�hled"
+msgstr "pohled"
 
-#: describe.c:415 describe.c:543 describe.c:1477
+#: describe.c:683 describe.c:854 describe.c:2119
 msgid "sequence"
 msgstr "sekvence"
 
-#: describe.c:415 describe.c:745 describe.c:1478 describe.c:1587
-msgid "Type"
-msgstr "Typ"
+#: describe.c:695
+#
+msgid "Column access privileges"
+msgstr "Přístupová práva k attributům"
 
-#: describe.c:437
-#, c-format
-msgid "Access privileges for database \"%s\""
-msgstr "P��stupov� pr�va pro datab�zi \"%s\""
+#: describe.c:721 describe.c:3215 describe.c:3219
+msgid "Access privileges"
+msgstr "Přístupová práva"
 
-#: describe.c:469
+#: describe.c:758
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:480
+#: describe.c:770
 msgid "aggregate"
-msgstr "agreg�t"
+msgstr "agregát"
 
-#: describe.c:498
+#: describe.c:790
 msgid "function"
 msgstr "funkce"
 
-#: describe.c:512
+#: describe.c:809
 msgid "operator"
-msgstr "oper�tor"
+msgstr "operátor"
 
-#: describe.c:526
+#: describe.c:828
 msgid "data type"
-msgstr "datov� typ"
+msgstr "datový typ"
 
-#: describe.c:543 describe.c:1477
+#: describe.c:853 describe.c:2118
 msgid "index"
 msgstr "index"
 
-#: describe.c:559
+#: describe.c:875
 msgid "rule"
 msgstr "rule"
 
-#: describe.c:575
-msgid "trigger"
-msgstr "trigger"
-
-#: describe.c:593
+#: describe.c:919
 msgid "Object descriptions"
 msgstr "Popis objektu"
 
-#: describe.c:641
+#: describe.c:972
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
-msgstr "Nelze nal�zt relaci se jm�nem \"%s\".\n"
+msgstr "Nelze nalézt relaci se jménem \"%s\".\n"
 
-#: describe.c:728
+#: describe.c:1109
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
-msgstr "Nelze nal�zt relaci se OID \"%s\".\n"
+msgstr "Nelze nalézt relaci se OID \"%s\".\n"
 
-#: describe.c:744
-msgid "Column"
-msgstr "Sloupec"
-
-#: describe.c:752
-msgid "Modifiers"
-msgstr "Modifik�tory"
-
-#: describe.c:859
+#: describe.c:1184
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabulka \"%s.%s\""
 
-#: describe.c:863
+#: describe.c:1188
 #, c-format
 msgid "View \"%s.%s\""
-msgstr "N�hled \"%s.%s\""
+msgstr "Náhled \"%s.%s\""
 
-#: describe.c:867
+#: describe.c:1192
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sekvence \"%s.%s\""
 
-#: describe.c:871
+#: describe.c:1196
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index \"%s.%s\""
 
-#: describe.c:875
+#: describe.c:1201
 #, c-format
 msgid "Special relation \"%s.%s\""
-msgstr "Speci�ln� relace \"%s.%s\""
+msgstr "Speciální relace \"%s.%s\""
 
-#: describe.c:879
+#: describe.c:1205
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST tabulka \"%s.%s\""
 
-#: describe.c:883
+#: describe.c:1209
 #, c-format
 msgid "Composite type \"%s.%s\""
-msgstr "Slo�en� typ \"%s.%s\""
+msgstr "Složený typ \"%s.%s\""
+
+#: describe.c:1221
+msgid "Column"
+msgstr "Sloupec"
+
+#: describe.c:1227
+msgid "Modifiers"
+msgstr "Modifikátory"
+
+#: describe.c:1232
+msgid "Value"
+msgstr "Hodnota"
+
+#: describe.c:1236
+msgid "Storage"
+msgstr "Úložiště"
 
-#: describe.c:887
+#: describe.c:1278
+msgid "not null"
+msgstr "not null"
+
+#. translator: default values of column definitions
+#: describe.c:1287
 #, c-format
-msgid "?%c? \"%s.%s\""
-msgstr "?%c? \"%s.%s\""
+msgid "default %s"
+msgstr "implicitně %s"
 
-#: describe.c:925
+#: describe.c:1353
 msgid "primary key, "
-msgstr "prim�rn� kl��,"
+msgstr "primární klíč,"
 
-#: describe.c:927
+#: describe.c:1355
 msgid "unique, "
-msgstr "unik�tn�,"
+msgstr "unikátní,"
 
-#: describe.c:933
+#: describe.c:1361
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "pro tabulku \"%s.%s\""
 
-#: describe.c:937
+#: describe.c:1365
 #, c-format
 msgid ", predicate (%s)"
-msgstr ", predik�t (%s)"
+msgstr ", predikát (%s)"
 
-#: describe.c:940
+#: describe.c:1368
 msgid ", clustered"
-msgstr ", klastrov�n"
+msgstr ", klastrován"
 
-#: describe.c:977
-#, c-format
-msgid ""
-"View definition:\n"
-"%s"
-msgstr ""
-"Definice n�hledu:\n"
-"%s"
+#: describe.c:1371
+msgid ", invalid"
+msgstr ", neplatný"
 
-#: describe.c:983 describe.c:1204
+#: describe.c:1385
+msgid "View definition:"
+msgstr "Definice pohledu:"
+
+#: describe.c:1402 describe.c:1655
 msgid "Rules:"
 msgstr "Rule:"
 
-#: describe.c:1138
+#: describe.c:1449
 msgid "Indexes:"
 msgstr "Indexy:"
 
-#: describe.c:1146
-#, c-format
-msgid "    \"%s\""
-msgstr "    \"%s\""
+#: describe.c:1509
+msgid "Check constraints:"
+msgstr "Kontrolní pravidla:"
 
-#: describe.c:1152
-msgid " PRIMARY KEY,"
-msgstr " PRIM�RN� KL��,"
+#: describe.c:1540
+msgid "Foreign-key constraints:"
+msgstr "Podmínky cizího klíče:"
 
-#: describe.c:1154
-msgid " UNIQUE,"
-msgstr " UNIK�TN�,"
+#: describe.c:1571
+msgid "Referenced by:"
+msgstr ""
 
-#: describe.c:1165
-msgid " CLUSTER"
-msgstr " CLUSTER"
+#. translator: the first %s is a FK name, the following are
+#. * a table name and the FK definition
+#: describe.c:1576
+#, c-format
+msgid "  \"%s\" IN %s %s"
+msgstr "  \"%s\" IN %s %s"
 
-#: describe.c:1174
-msgid "Check constraints:"
-msgstr "Kontroln� pravidla:"
+#: describe.c:1658
+msgid "Disabled rules:"
+msgstr "Vypnutá pravidla:"
 
-#: describe.c:1178 describe.c:1193
-#, c-format
-msgid "    \"%s\" %s"
-msgstr "    \"%s\" %s"
+#: describe.c:1661
+msgid "Rules firing always:"
+msgstr "Vždy vykonávaná pravidla:"
 
-#: describe.c:1189
-msgid "Foreign-key constraints:"
-msgstr "Podm�nky ciz�ho kl��e:"
+#: describe.c:1664
+msgid "Rules firing on replica only:"
+msgstr "Pravidla vykonaná jen na replice:"
 
-#: describe.c:1223
+#: describe.c:1760
 msgid "Triggers:"
 msgstr "Triggery:"
 
-#: describe.c:1245
+#: describe.c:1763
+msgid "Disabled triggers:"
+msgstr "Vypnuté triggery:"
+
+#: describe.c:1766
+msgid "Triggers firing always:"
+msgstr "Vždy vykonávané triggery:"
+
+#: describe.c:1769
+msgid "Triggers firing on replica only:"
+msgstr "Triggery vykonávané jen na replice:"
+
+#: describe.c:1802
 msgid "Inherits"
-msgstr "D�d�"
+msgstr "Dědí"
 
-#: describe.c:1259
+#: describe.c:1817
 msgid "Has OIDs"
-msgstr "M� OID"
+msgstr "Má OID"
 
-#: describe.c:1262 describe.c:1637 describe.c:1694
+#: describe.c:1820 describe.c:2293 describe.c:2366
 msgid "yes"
 msgstr "ano"
 
-#: describe.c:1262 describe.c:1638 describe.c:1692
+#: describe.c:1820 describe.c:2293 describe.c:2366
 msgid "no"
 msgstr "ne"
 
-#: describe.c:1342
+#: describe.c:1828 describe.c:3058 describe.c:3122 describe.c:3178
+msgid "Options"
+msgstr "Přepínače"
+
+#: describe.c:1913
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: \"%s\""
 
-#: describe.c:1375
-msgid "User name"
-msgstr "U�ivatelsk� jm�no"
-
-#: describe.c:1375
-msgid "User ID"
-msgstr "ID u�ivatele"
-
-#: describe.c:1376
-msgid "superuser, create database"
-msgstr "super-u�ivatel, create database"
+#. translator: before this string there's an index
+#. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
+#: describe.c:1923
+#, c-format
+msgid ", tablespace \"%s\""
+msgstr ", tablespace: \"%s\""
 
-#: describe.c:1377
-msgid "superuser"
-msgstr "super-u�ivatel"
+#: describe.c:2001
+msgid "List of roles"
+msgstr "Seznam rolí"
 
-#: describe.c:1377
-msgid "create database"
-msgstr "create database"
+#: describe.c:2003
+msgid "Role name"
+msgstr "Jméno role"
 
-#: describe.c:1378
+#: describe.c:2004
 msgid "Attributes"
 msgstr "Atributy"
 
-#: describe.c:1378
-msgid "Groups"
-msgstr "Skupiny"
+#: describe.c:2005
+msgid "Member of"
+msgstr ""
+
+#: describe.c:2016
+msgid "Superuser"
+msgstr "Super-uživatel"
+
+#: describe.c:2019
+msgid "No inheritance"
+msgstr ""
 
-#: describe.c:1391
-msgid "List of database users"
-msgstr "Seznam u�ivatel� datab�ze"
+#: describe.c:2022
+msgid "Create role"
+msgstr "Vytvoř roly"
 
-#: describe.c:1418
-msgid "Group name"
-msgstr "Jm�no skupiny"
+#: describe.c:2025
+msgid "Create DB"
+msgstr "Vytvoř DB"
 
-#: describe.c:1418
-msgid "Group ID"
-msgstr "ID skupiny"
+#: describe.c:2028
+msgid "Cannot login"
+msgstr "Nemohu se přihlásit"
 
-#: describe.c:1431
-msgid "List of database groups"
-msgstr "Seznam skupin"
+#: describe.c:2037
+msgid "No connections"
+msgstr "Není spojení"
 
-#: describe.c:1478
+#: describe.c:2039
+#, c-format
+msgid "1 connection"
+msgid_plural "%d connections"
+msgstr[0] "%d spojení"
+msgstr[1] "%d spojení"
+msgstr[2] "%d spojení"
+
+#: describe.c:2120
 msgid "special"
-msgstr "speci�ln�"
+msgstr "speciální"
 
-#: describe.c:1483
+#: describe.c:2127
 msgid "Table"
 msgstr "Tabulka"
 
-#: describe.c:1542
+#: describe.c:2186
 #, c-format
 msgid "No matching relations found.\n"
-msgstr "Srovnateln� relace nebyla nalezena.\n"
+msgstr "Srovnatelná relace nebyla nalezena.\n"
 
-#: describe.c:1544
+#: describe.c:2188
 #, c-format
 msgid "No relations found.\n"
 msgstr "Relace nebyla nalezena.\n"
 
-#: describe.c:1549
+#: describe.c:2193
 msgid "List of relations"
-msgstr "Seznam relac�"
+msgstr "Seznam relací"
 
-#: describe.c:1588
+#: describe.c:2237
 msgid "Modifier"
-msgstr "Modifik�tor"
+msgstr "Modifikátor"
 
-#: describe.c:1602
+#: describe.c:2238
+msgid "Check"
+msgstr ""
+
+#: describe.c:2256
 msgid "List of domains"
-msgstr "Seznam dom�n"
+msgstr "Seznam domén"
 
-#: describe.c:1635
+#: describe.c:2291
 msgid "Source"
-msgstr "Zdrojov� k�d"
+msgstr "Zdrojový kód"
 
-#: describe.c:1636
+#: describe.c:2292
 msgid "Destination"
-msgstr "C�l"
+msgstr "Cíl"
 
-#: describe.c:1639
+#: describe.c:2294
 msgid "Default?"
-msgstr "Implicitn�?"
+msgstr "Implicitně?"
 
-#: describe.c:1653
+#: describe.c:2312
 msgid "List of conversions"
-msgstr "Seznam konverz�"
+msgstr "Seznam konverzí"
 
-#: describe.c:1688
+#: describe.c:2363
 msgid "Source type"
-msgstr "Zdrojov� typ"
+msgstr "Zdrojový typ"
 
-#: describe.c:1689
+#: describe.c:2364
 msgid "Target type"
-msgstr "C�lov� typ"
-
-#: describe.c:1690
-msgid "(binary compatible)"
-msgstr "(bin�rn� kompatibiln�)"
+msgstr "Cílový typ"
 
-#: describe.c:1691
+#: describe.c:2365 describe.c:2625
 msgid "Function"
 msgstr "Funkce"
 
-#: describe.c:1693
+#: describe.c:2366
 msgid "in assignment"
-msgstr "v zad�n�"
+msgstr "v zadání"
 
-#: describe.c:1695
+#: describe.c:2367
 msgid "Implicit?"
-msgstr "Implicitn�?"
+msgstr "Implicitně?"
 
-#: describe.c:1703
+#: describe.c:2393
 msgid "List of casts"
-msgstr "Seznam p�etypov�n�"
+msgstr "Seznam přetypování"
 
-#: describe.c:1753
+#: describe.c:2448
 msgid "List of schemas"
-msgstr "Seznam sch�mat"
+msgstr "Seznam schémat"
+
+#: describe.c:2471 describe.c:2704 describe.c:2772 describe.c:2840
+#, c-format
+msgid "The server (version %d.%d) does not support full text search.\n"
+msgstr "Server (verze %d.%d) nepodporuje fulltextové vyhledávání.\n"
+
+#: describe.c:2505
+msgid "List of text search parsers"
+msgstr "Seznam fulltextových parserů"
+
+#: describe.c:2548
+#, c-format
+msgid "Did not find any text search parser named \"%s\".\n"
+msgstr "Nelze nalézt fulltextový parser se jménem \"%s\".\n"
+
+#: describe.c:2623
+msgid "Start parse"
+msgstr "Začátek parsování"
+
+#: describe.c:2624
+msgid "Method"
+msgstr "Metoda"
+
+#: describe.c:2628
+msgid "Get next token"
+msgstr "Získej další token"
+
+#: describe.c:2630
+msgid "End parse"
+msgstr "Konec parsování"
+
+#: describe.c:2632
+msgid "Get headline"
+msgstr "Získej záhlaví"
+
+#: describe.c:2634
+msgid "Get token types"
+msgstr "Získej typ tokenu"
+
+#: describe.c:2644
+#, c-format
+msgid "Text search parser \"%s.%s\""
+msgstr "Fulltextový parser \"%s.%s\""
+
+#: describe.c:2646
+#, c-format
+msgid "Text search parser \"%s\""
+msgstr "Fulltextový parser \"%s\""
+
+#: describe.c:2664
+msgid "Token name"
+msgstr "Jméno tokenu"
+
+#: describe.c:2675
+#, c-format
+msgid "Token types for parser \"%s.%s\""
+msgstr "Jméno tokenu pro parser \"%s.%s\""
+
+#: describe.c:2677
+#, c-format
+msgid "Token types for parser \"%s\""
+msgstr "Typ tokenu pro parser \"%s\""
+
+#: describe.c:2726
+msgid "Template"
+msgstr "Šablona"
+
+#: describe.c:2727
+msgid "Init options"
+msgstr "Počáteční nastavení"
+
+#: describe.c:2749
+msgid "List of text search dictionaries"
+msgstr "Seznam fulltextových slovníků"
+
+#: describe.c:2789
+#, fuzzy
+msgid "Init"
+msgstr "???"
+
+#: describe.c:2790
+#, fuzzy
+msgid "Lexize"
+msgstr "???"
+
+#: describe.c:2817
+msgid "List of text search templates"
+msgstr "Seznam fulltextových šablon"
+
+#: describe.c:2874
+msgid "List of text search configurations"
+msgstr "Seznam fulltextových konfigurací"
+
+#: describe.c:2918
+#, c-format
+msgid "Did not find any text search configuration named \"%s\".\n"
+msgstr "Nelze nalézt fulltextovou konfiguraci se jménem \"%s\".\n"
+
+#: describe.c:2984
+msgid "Token"
+msgstr "Token"
+
+#: describe.c:2985
+msgid "Dictionaries"
+msgstr "Slovníky"
+
+#: describe.c:2996
+#, c-format
+msgid "Text search configuration \"%s.%s\""
+msgstr "Fulltextová konfigurace \"%s.%s\""
+
+#: describe.c:2999
+#, c-format
+msgid "Text search configuration \"%s\""
+msgstr "Fulltextová konfigurace \"%s\""
+
+#: describe.c:3003
+#, c-format
+msgid ""
+"\n"
+"Parser: \"%s.%s\""
+msgstr ""
+"\n"
+"Parser: \"%s.%s\""
+
+#: describe.c:3006
+#, c-format
+msgid ""
+"\n"
+"Parser: \"%s\""
+msgstr ""
+"\n"
+"Parser: \"%s\""
+
+#: describe.c:3038
+#, c-format
+msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
+msgstr "Server (verze %d.%d) nepodporuje foreign-data wrappery.\n"
+
+#: describe.c:3050
+msgid "Validator"
+msgstr "Validátor"
+
+#: describe.c:3074
+msgid "List of foreign-data wrappers"
+msgstr "Seznam foreign-data wrapperů"
+
+#: describe.c:3097
+#, c-format
+msgid "The server (version %d.%d) does not support foreign servers.\n"
+msgstr "Server (verze %d.%d) nepodporuje foreign servery.\n"
+
+#: describe.c:3109
+msgid "Foreign-data wrapper"
+msgstr "Foreign-data wrapper"
+
+#: describe.c:3121
+msgid "Version"
+msgstr "Verze"
+
+#: describe.c:3140
+msgid "List of foreign servers"
+msgstr "Seznam foreign serverů"
+
+#: describe.c:3163
+#, c-format
+msgid "The server (version %d.%d) does not support user mappings.\n"
+msgstr "Server (verze %d.%d) nepodporuje mapování uživatelů.\n"
+
+#: describe.c:3172
+msgid "Server"
+msgstr "Server"
+
+#: describe.c:3173
+msgid "User name"
+msgstr "Uživatelské jméno"
+
+#: describe.c:3193
+msgid "List of user mappings"
+msgstr "Seznam mapování uživatelů"
 
-#: sql_help.h:25 sql_help.h:373
+#: sql_help.h:25 sql_help.h:505
 msgid "abort the current transaction"
-msgstr "nestandardn� ukon�en� (abort) sou�asn� transakce"
+msgstr "nestandardní ukončení (abort) současné transakce"
 
 #: sql_help.h:26
 msgid "ABORT [ WORK | TRANSACTION ]"
@@ -1493,17 +2073,18 @@ msgstr "ABORT [ WORK | TRANSACTION ]"
 
 #: sql_help.h:29
 msgid "change the definition of an aggregate function"
-msgstr "zm�na definice agreg�tn� funkce"
+msgstr "změna definice agregátní funkce"
 
 #: sql_help.h:30
 msgid ""
-"ALTER AGGREGATE name ( type ) RENAME TO newname\n"
-"ALTER AGGREGATE name ( type ) OWNER TO newowner"
+"ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
+"ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
+"ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
 msgstr ""
 
 #: sql_help.h:33
 msgid "change the definition of a conversion"
-msgstr "zm�na definice konverze"
+msgstr "změna definice konverze"
 
 #: sql_help.h:34
 msgid ""
@@ -1513,21 +2094,32 @@ msgstr ""
 
 #: sql_help.h:37
 msgid "change a database"
-msgstr "zm�n� datab�zi"
+msgstr "změní databázi"
 
 #: sql_help.h:38
 msgid ""
-"ALTER DATABASE name SET parameter { TO | = } { value | DEFAULT }\n"
-"ALTER DATABASE name RESET parameter\n"
+"ALTER DATABASE name [ [ WITH ] option [ ... ] ]\n"
+"\n"
+"where option can be:\n"
+"\n"
+"    CONNECTION LIMIT connlimit\n"
 "\n"
 "ALTER DATABASE name RENAME TO newname\n"
 "\n"
-"ALTER DATABASE name OWNER TO new_owner"
+"ALTER DATABASE name OWNER TO new_owner\n"
+"\n"
+"ALTER DATABASE name SET TABLESPACE new_tablespace\n"
+"\n"
+"ALTER DATABASE name SET configuration_parameter { TO | = } { value | "
+"DEFAULT }\n"
+"ALTER DATABASE name SET configuration_parameter FROM CURRENT\n"
+"ALTER DATABASE name RESET configuration_parameter\n"
+"ALTER DATABASE name RESET ALL"
 msgstr ""
 
 #: sql_help.h:41
 msgid "change the definition of a domain"
-msgstr "zm�n� definici dom�ny"
+msgstr "změní definici domény"
 
 #: sql_help.h:42
 msgid ""
@@ -1540,69 +2132,88 @@ msgid ""
 "ALTER DOMAIN name\n"
 "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
 "ALTER DOMAIN name\n"
-"    OWNER TO new_owner"
+"    OWNER TO new_owner \n"
+"ALTER DOMAIN name\n"
+"    SET SCHEMA new_schema"
 msgstr ""
 
 #: sql_help.h:45
-msgid "change the definition of a function"
-msgstr "zm�n� definici funkce"
+msgid "change the definition of a foreign-data wrapper"
+msgstr "změní definici foreign-data wrapperu"
 
 #: sql_help.h:46
 msgid ""
-"ALTER FUNCTION name ( [ type [, ...] ] ) RENAME TO newname\n"
-"ALTER FUNCTION name ( [ type [, ...] ] ) OWNER TO newowner"
+"ALTER FOREIGN DATA WRAPPER name\n"
+"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ]) ]\n"
+"ALTER FOREIGN DATA WRAPPER name OWNER TO new_owner"
 msgstr ""
 
 #: sql_help.h:49
-msgid "change a user group"
-msgstr "zm�n� u�ivatelovu skupinu"
+msgid "change the definition of a function"
+msgstr "změní definici funkce"
 
 #: sql_help.h:50
 msgid ""
-"ALTER GROUP groupname ADD USER username [, ... ]\n"
-"ALTER GROUP groupname DROP USER username [, ... ]\n"
+"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+"    action [ ... ] [ RESTRICT ]\n"
+"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+"    RENAME TO new_name\n"
+"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+"    OWNER TO new_owner\n"
+"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+"    SET SCHEMA new_schema\n"
 "\n"
-"ALTER GROUP groupname RENAME TO newname"
+"where action is one of:\n"
+"\n"
+"    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
+"    IMMUTABLE | STABLE | VOLATILE\n"
+"    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
+"    COST execution_cost\n"
+"    ROWS result_rows\n"
+"    SET configuration_parameter { TO | = } { value | DEFAULT }\n"
+"    SET configuration_parameter FROM CURRENT\n"
+"    RESET configuration_parameter\n"
+"    RESET ALL"
 msgstr ""
 
 #: sql_help.h:53
-msgid "change the definition of an index"
-msgstr "zm�n� definici indexu"
+msgid "change role name or membership"
+msgstr ""
 
 #: sql_help.h:54
 msgid ""
-"ALTER INDEX name \n"
-"    action [, ... ]\n"
-"ALTER INDEX name\n"
-"    RENAME TO new_name\n"
-"\n"
-"where action is one of:\n"
+"ALTER GROUP groupname ADD USER username [, ... ]\n"
+"ALTER GROUP groupname DROP USER username [, ... ]\n"
 "\n"
-"    OWNER TO new_owner\n"
-"    SET TABLESPACE indexspace_name"
+"ALTER GROUP groupname RENAME TO newname"
 msgstr ""
 
 #: sql_help.h:57
-msgid "change the definition of a procedural language"
-msgstr "zm�n� definici procedur�ln�ho jazyka"
+msgid "change the definition of an index"
+msgstr "změní definici indexu"
 
 #: sql_help.h:58
-msgid "ALTER LANGUAGE name RENAME TO newname"
+msgid ""
+"ALTER INDEX name RENAME TO new_name\n"
+"ALTER INDEX name SET TABLESPACE tablespace_name\n"
+"ALTER INDEX name SET ( storage_parameter = value [, ... ] )\n"
+"ALTER INDEX name RESET ( storage_parameter [, ... ] )"
 msgstr ""
 
 #: sql_help.h:61
-msgid "change the definition of an operator class"
-msgstr "zm�n� definici t��dy oper�toru"
+msgid "change the definition of a procedural language"
+msgstr "změní definici procedurálního jazyka"
 
 #: sql_help.h:62
 msgid ""
-"ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
-"ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
+"ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
+"ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
 msgstr ""
 
 #: sql_help.h:65
 msgid "change the definition of an operator"
-msgstr "zm�n� definici oper�toru"
+msgstr "změní definici operátoru"
 
 #: sql_help.h:66
 msgid ""
@@ -1611,31 +2222,105 @@ msgid ""
 msgstr ""
 
 #: sql_help.h:69
-msgid "change the definition of a schema"
-msgstr "zm�n� definici sch�matu"
+msgid "change the definition of an operator class"
+msgstr "změní definici třídy operátoru"
 
 #: sql_help.h:70
 msgid ""
+"ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
+"ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
+msgstr ""
+
+#: sql_help.h:73
+msgid "change the definition of an operator family"
+msgstr "změní definici rodiny operátoru"
+
+#: sql_help.h:74
+msgid ""
+"ALTER OPERATOR FAMILY name USING index_method ADD\n"
+"  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
+"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
+"( argument_type [, ...] )\n"
+"  } [, ... ]\n"
+"ALTER OPERATOR FAMILY name USING index_method DROP\n"
+"  {  OPERATOR strategy_number ( op_type [ , op_type ] )\n"
+"   | FUNCTION support_number ( op_type [ , op_type ] )\n"
+"  } [, ... ]\n"
+"ALTER OPERATOR FAMILY name USING index_method RENAME TO newname\n"
+"ALTER OPERATOR FAMILY name USING index_method OWNER TO newowner"
+msgstr ""
+
+#: sql_help.h:77 sql_help.h:125
+msgid "change a database role"
+msgstr "změní roli databáze"
+
+#: sql_help.h:78
+msgid ""
+"ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
+"\n"
+"where option can be:\n"
+"    \n"
+"      SUPERUSER | NOSUPERUSER\n"
+"    | CREATEDB | NOCREATEDB\n"
+"    | CREATEROLE | NOCREATEROLE\n"
+"    | CREATEUSER | NOCREATEUSER\n"
+"    | INHERIT | NOINHERIT\n"
+"    | LOGIN | NOLOGIN\n"
+"    | CONNECTION LIMIT connlimit\n"
+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+"    | VALID UNTIL 'timestamp' \n"
+"\n"
+"ALTER ROLE name RENAME TO newname\n"
+"\n"
+"ALTER ROLE name SET configuration_parameter { TO | = } { value | DEFAULT }\n"
+"ALTER ROLE name SET configuration_parameter FROM CURRENT\n"
+"ALTER ROLE name RESET configuration_parameter\n"
+"ALTER ROLE name RESET ALL"
+msgstr ""
+
+#: sql_help.h:81
+msgid "change the definition of a schema"
+msgstr "změní definici schématu"
+
+#: sql_help.h:82
+msgid ""
 "ALTER SCHEMA name RENAME TO newname\n"
 "ALTER SCHEMA name OWNER TO newowner"
 msgstr ""
 
-#: sql_help.h:73
+#: sql_help.h:85
 msgid "change the definition of a sequence generator"
-msgstr "zm�n� definici gener�toru sekvenc�"
+msgstr "změní definici generátoru sekvencí"
 
-#: sql_help.h:74
+#: sql_help.h:86
 msgid ""
 "ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ RESTART [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]"
+"    [ START [ WITH ] start ]\n"
+"    [ RESTART [ [ WITH ] restart ] ]\n"
+"    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
+"    [ OWNED BY { table.column | NONE } ]\n"
+"ALTER SEQUENCE name OWNER TO new_owner\n"
+"ALTER SEQUENCE name RENAME TO new_name\n"
+"ALTER SEQUENCE name SET SCHEMA new_schema"
 msgstr ""
 
-#: sql_help.h:77
+#: sql_help.h:89
+msgid "change the definition of a foreign server"
+msgstr "změní definici foreign serveru"
+
+#: sql_help.h:90
+msgid ""
+"ALTER SERVER servername [ VERSION 'newversion' ]\n"
+"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ]\n"
+"ALTER SERVER servername OWNER TO new_owner"
+msgstr ""
+
+#: sql_help.h:93
 msgid "change the definition of a table"
-msgstr "zm�n� definici tabulky"
+msgstr "změní definici tabulky"
 
-#: sql_help.h:78
+#: sql_help.h:94
 msgid ""
 "ALTER TABLE [ ONLY ] name [ * ]\n"
 "    action [, ... ]\n"
@@ -1643,12 +2328,14 @@ msgid ""
 "    RENAME [ COLUMN ] column TO new_column\n"
 "ALTER TABLE name\n"
 "    RENAME TO new_name\n"
+"ALTER TABLE name\n"
+"    SET SCHEMA new_schema\n"
 "\n"
 "where action is one of:\n"
 "\n"
 "    ADD [ COLUMN ] column type [ column_constraint [ ... ] ]\n"
 "    DROP [ COLUMN ] column [ RESTRICT | CASCADE ]\n"
-"    ALTER [ COLUMN ] column TYPE type [ USING expression ]\n"
+"    ALTER [ COLUMN ] column [ SET DATA ] TYPE type [ USING expression ]\n"
 "    ALTER [ COLUMN ] column SET DEFAULT expression\n"
 "    ALTER [ COLUMN ] column DROP DEFAULT\n"
 "    ALTER [ COLUMN ] column { SET | DROP } NOT NULL\n"
@@ -1657,73 +2344,166 @@ msgid ""
 "MAIN }\n"
 "    ADD table_constraint\n"
 "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
+"    DISABLE TRIGGER [ trigger_name | ALL | USER ]\n"
+"    ENABLE TRIGGER [ trigger_name | ALL | USER ]\n"
+"    ENABLE REPLICA TRIGGER trigger_name\n"
+"    ENABLE ALWAYS TRIGGER trigger_name\n"
+"    DISABLE RULE rewrite_rule_name\n"
+"    ENABLE RULE rewrite_rule_name\n"
+"    ENABLE REPLICA RULE rewrite_rule_name\n"
+"    ENABLE ALWAYS RULE rewrite_rule_name\n"
 "    CLUSTER ON index_name\n"
 "    SET WITHOUT CLUSTER\n"
+"    SET WITH OIDS\n"
 "    SET WITHOUT OIDS\n"
+"    SET ( storage_parameter = value [, ... ] )\n"
+"    RESET ( storage_parameter [, ... ] )\n"
+"    INHERIT parent_table\n"
+"    NO INHERIT parent_table\n"
 "    OWNER TO new_owner\n"
-"    SET TABLESPACE tablespace_name"
+"    SET TABLESPACE new_tablespace"
 msgstr ""
 
-#: sql_help.h:81
+#: sql_help.h:97
 msgid "change the definition of a tablespace"
-msgstr "zm�n� definici tablespace"
+msgstr "změní definici tablespace"
 
-#: sql_help.h:82
+#: sql_help.h:98
 msgid ""
 "ALTER TABLESPACE name RENAME TO newname\n"
 "ALTER TABLESPACE name OWNER TO newowner"
 msgstr ""
 
-#: sql_help.h:85
+#: sql_help.h:101
+msgid "change the definition of a text search configuration"
+msgstr "změní definici konfigurace fulltextového vyhledávání"
+
+#: sql_help.h:102
+msgid ""
+"ALTER TEXT SEARCH CONFIGURATION name\n"
+"    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
+"ALTER TEXT SEARCH CONFIGURATION name\n"
+"    ALTER MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
+"ALTER TEXT SEARCH CONFIGURATION name\n"
+"    ALTER MAPPING REPLACE old_dictionary WITH new_dictionary\n"
+"ALTER TEXT SEARCH CONFIGURATION name\n"
+"    ALTER MAPPING FOR token_type [, ... ] REPLACE old_dictionary WITH "
+"new_dictionary\n"
+"ALTER TEXT SEARCH CONFIGURATION name\n"
+"    DROP MAPPING [ IF EXISTS ] FOR token_type [, ... ]\n"
+"ALTER TEXT SEARCH CONFIGURATION name RENAME TO newname\n"
+"ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner"
+msgstr ""
+
+#: sql_help.h:105
+msgid "change the definition of a text search dictionary"
+msgstr "změní definici slovníku pro fulltextové vyhledávání"
+
+#: sql_help.h:106
+msgid ""
+"ALTER TEXT SEARCH DICTIONARY name (\n"
+"    option [ = value ] [, ... ]\n"
+")\n"
+"ALTER TEXT SEARCH DICTIONARY name RENAME TO newname\n"
+"ALTER TEXT SEARCH DICTIONARY name OWNER TO newowner"
+msgstr ""
+
+#: sql_help.h:109
+msgid "change the definition of a text search parser"
+msgstr "změní definici parseru pro fulltextové vyhledávání"
+
+#: sql_help.h:110
+msgid "ALTER TEXT SEARCH PARSER name RENAME TO newname"
+msgstr ""
+
+#: sql_help.h:113
+msgid "change the definition of a text search template"
+msgstr "změní definici šablony pro fulltextové vyhledávání"
+
+#: sql_help.h:114
+msgid "ALTER TEXT SEARCH TEMPLATE name RENAME TO newname"
+msgstr ""
+
+#: sql_help.h:117
 msgid "change the definition of a trigger"
-msgstr "zm�n� definici triggeru"
+msgstr "změní definici triggeru"
 
-#: sql_help.h:86
+#: sql_help.h:118
 msgid "ALTER TRIGGER name ON table RENAME TO newname"
 msgstr ""
 
-#: sql_help.h:89
+#: sql_help.h:121
 msgid "change the definition of a type"
-msgstr "zm�n� definici datov�ho typu"
+msgstr "změní definici datového typu"
 
-#: sql_help.h:90
-msgid "ALTER TYPE name OWNER TO new_owner"
+#: sql_help.h:122
+msgid ""
+"ALTER TYPE name RENAME TO new_name\n"
+"ALTER TYPE name OWNER TO new_owner \n"
+"ALTER TYPE name SET SCHEMA new_schema"
 msgstr ""
 
-#: sql_help.h:93
-msgid "change a database user account"
-msgstr "provede zm�ny v nastaven� datab�zov�ho ��tu u�ivatele"
-
-#: sql_help.h:94
+#: sql_help.h:126
 msgid ""
 "ALTER USER name [ [ WITH ] option [ ... ] ]\n"
 "\n"
 "where option can be:\n"
-"\n"
-"    CREATEDB | NOCREATEDB\n"
-"    | CREATEUSER | NOCREATEUSER \n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' \n"
-"    | VALID UNTIL 'abstime'\n"
+"    \n"
+"      SUPERUSER | NOSUPERUSER\n"
+"    | CREATEDB | NOCREATEDB\n"
+"    | CREATEROLE | NOCREATEROLE\n"
+"    | CREATEUSER | NOCREATEUSER\n"
+"    | INHERIT | NOINHERIT\n"
+"    | LOGIN | NOLOGIN\n"
+"    | CONNECTION LIMIT connlimit\n"
+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+"    | VALID UNTIL 'timestamp' \n"
 "\n"
 "ALTER USER name RENAME TO newname\n"
 "\n"
-"ALTER USER name SET parameter { TO | = } { value | DEFAULT }\n"
-"ALTER USER name RESET parameter"
+"ALTER USER name SET configuration_parameter { TO | = } { value | DEFAULT }\n"
+"ALTER USER name SET configuration_parameter FROM CURRENT\n"
+"ALTER USER name RESET configuration_parameter\n"
+"ALTER USER name RESET ALL"
 msgstr ""
 
-#: sql_help.h:97
+#: sql_help.h:129
+msgid "change the definition of a user mapping"
+msgstr "změní definici mapování uživatelů"
+
+#: sql_help.h:130
+msgid ""
+"ALTER USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
+"    SERVER servername\n"
+"    OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] )"
+msgstr ""
+
+#: sql_help.h:133
+msgid "change the definition of a view"
+msgstr "změní definici pohledu"
+
+#: sql_help.h:134
+msgid ""
+"ALTER VIEW name ALTER [ COLUMN ] column SET DEFAULT expression\n"
+"ALTER VIEW name ALTER [ COLUMN ] column DROP DEFAULT\n"
+"ALTER VIEW name OWNER TO new_owner\n"
+"ALTER VIEW name RENAME TO new_name\n"
+"ALTER VIEW name SET SCHEMA new_schema"
+msgstr ""
+
+#: sql_help.h:137
 msgid "collect statistics about a database"
-msgstr "shrom�d� statistick� informace o datab�zi"
+msgstr "shromáždí statistické informace o databázi"
 
-#: sql_help.h:98
-msgid "ANALYZE [ VERBOSE ] [ table [ (column [, ...] ) ] ]"
+#: sql_help.h:138
+msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
 msgstr ""
 
-#: sql_help.h:101 sql_help.h:413
+#: sql_help.h:141 sql_help.h:553
 msgid "start a transaction block"
-msgstr "nastartuje nov� transak�n� blok"
+msgstr "nastartuje nový transakční blok"
 
-#: sql_help.h:102
+#: sql_help.h:142
 msgid ""
 "BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
 "\n"
@@ -1734,121 +2514,148 @@ msgid ""
 "    READ WRITE | READ ONLY"
 msgstr ""
 
-#: sql_help.h:105
+#: sql_help.h:145
 msgid "force a transaction log checkpoint"
-msgstr ""
+msgstr "vynutí checkpoint transakčního logu"
 
-#: sql_help.h:106
+#: sql_help.h:146
 msgid "CHECKPOINT"
 msgstr ""
 
-#: sql_help.h:109
+#: sql_help.h:149
 msgid "close a cursor"
-msgstr "uzav�e kursor"
+msgstr "uzavře kursor"
 
-#: sql_help.h:110
-msgid "CLOSE name"
+#: sql_help.h:150
+msgid "CLOSE { name | ALL }"
 msgstr ""
 
-#: sql_help.h:113
+#: sql_help.h:153
 msgid "cluster a table according to an index"
-msgstr "p�erovn� obsah tabulky dle indexu"
+msgstr "přerovná obsah tabulky dle indexu"
 
-#: sql_help.h:114
+#: sql_help.h:154
 msgid ""
-"CLUSTER indexname ON tablename\n"
-"CLUSTER tablename\n"
-"CLUSTER"
+"CLUSTER [VERBOSE] tablename [ USING indexname ]\n"
+"CLUSTER [VERBOSE]"
 msgstr ""
 
-#: sql_help.h:117
+#: sql_help.h:157
 msgid "define or change the comment of an object"
-msgstr "definuje nebo zm�n� koment�� objektu"
+msgstr "definuje nebo změní komentář objektu"
 
-#: sql_help.h:118
+#: sql_help.h:158
 msgid ""
 "COMMENT ON\n"
 "{\n"
 "  TABLE object_name |\n"
 "  COLUMN table_name.column_name |\n"
-"  AGGREGATE agg_name (agg_type) |\n"
+"  AGGREGATE agg_name (agg_type [, ...] ) |\n"
 "  CAST (sourcetype AS targettype) |\n"
 "  CONSTRAINT constraint_name ON table_name |\n"
 "  CONVERSION object_name |\n"
 "  DATABASE object_name |\n"
 "  DOMAIN object_name |\n"
-"  FUNCTION func_name (arg1_type, arg2_type, ...) |\n"
+"  FUNCTION func_name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) |\n"
 "  INDEX object_name |\n"
 "  LARGE OBJECT large_object_oid |\n"
 "  OPERATOR op (leftoperand_type, rightoperand_type) |\n"
 "  OPERATOR CLASS object_name USING index_method |\n"
+"  OPERATOR FAMILY object_name USING index_method |\n"
 "  [ PROCEDURAL ] LANGUAGE object_name |\n"
+"  ROLE object_name |\n"
 "  RULE rule_name ON table_name |\n"
 "  SCHEMA object_name |\n"
 "  SEQUENCE object_name |\n"
+"  TABLESPACE object_name |\n"
+"  TEXT SEARCH CONFIGURATION object_name |\n"
+"  TEXT SEARCH DICTIONARY object_name |\n"
+"  TEXT SEARCH PARSER object_name |\n"
+"  TEXT SEARCH TEMPLATE object_name |\n"
 "  TRIGGER trigger_name ON table_name |\n"
 "  TYPE object_name |\n"
 "  VIEW object_name\n"
 "} IS 'text'"
 msgstr ""
 
-#: sql_help.h:121 sql_help.h:309
+#: sql_help.h:161 sql_help.h:433
 msgid "commit the current transaction"
-msgstr "standardn� ukon�en� aktu�ln� transakce"
+msgstr "potvrzení aktuální transakce"
 
-#: sql_help.h:122
+#: sql_help.h:162
 msgid "COMMIT [ WORK | TRANSACTION ]"
 msgstr ""
 
-#: sql_help.h:125
+#: sql_help.h:165
+msgid "commit a transaction that was earlier prepared for two-phase commit"
+msgstr "potvrzení aktuáln?i transakce, která byla již dříve připravena pro dvojfázový commit"
+
+#: sql_help.h:166
+msgid "COMMIT PREPARED transaction_id"
+msgstr ""
+
+#: sql_help.h:169
 msgid "copy data between a file and a table"
-msgstr "kop�ruje data mezi souborem a tabulkou"
+msgstr "kopíruje data mezi souborem a tabulkou"
 
-#: sql_help.h:126
+#: sql_help.h:170
 msgid ""
 "COPY tablename [ ( column [, ...] ) ]\n"
 "    FROM { 'filename' | STDIN }\n"
 "    [ [ WITH ] \n"
-"          [ BINARY ] \n"
+"          [ BINARY ]\n"
 "          [ OIDS ]\n"
 "          [ DELIMITER [ AS ] 'delimiter' ]\n"
 "          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ QUOTE [ AS ] 'quote' ] \n"
+"          [ CSV [ HEADER ]\n"
+"                [ QUOTE [ AS ] 'quote' ] \n"
 "                [ ESCAPE [ AS ] 'escape' ]\n"
 "                [ FORCE NOT NULL column [, ...] ]\n"
 "\n"
-"COPY tablename [ ( column [, ...] ) ]\n"
+"COPY { tablename [ ( column [, ...] ) ] | ( query ) }\n"
 "    TO { 'filename' | STDOUT }\n"
 "    [ [ WITH ] \n"
 "          [ BINARY ]\n"
 "          [ OIDS ]\n"
 "          [ DELIMITER [ AS ] 'delimiter' ]\n"
 "          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ QUOTE [ AS ] 'quote' ] \n"
+"          [ CSV [ HEADER ]\n"
+"                [ QUOTE [ AS ] 'quote' ] \n"
 "                [ ESCAPE [ AS ] 'escape' ]\n"
 "                [ FORCE QUOTE column [, ...] ]"
 msgstr ""
 
-#: sql_help.h:129
+#: sql_help.h:173
 msgid "define a new aggregate function"
-msgstr "definuje novou agreg�tn� funkci"
+msgstr "definuje novou agregátní funkci"
 
-#: sql_help.h:130
+#: sql_help.h:174
 msgid ""
+"CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
+"    SFUNC = sfunc,\n"
+"    STYPE = state_data_type\n"
+"    [ , FINALFUNC = ffunc ]\n"
+"    [ , INITCOND = initial_condition ]\n"
+"    [ , SORTOP = sort_operator ]\n"
+")\n"
+"\n"
+"or the old syntax\n"
+"\n"
 "CREATE AGGREGATE name (\n"
-"    BASETYPE = input_data_type,\n"
+"    BASETYPE = base_type,\n"
 "    SFUNC = sfunc,\n"
 "    STYPE = state_data_type\n"
 "    [ , FINALFUNC = ffunc ]\n"
 "    [ , INITCOND = initial_condition ]\n"
+"    [ , SORTOP = sort_operator ]\n"
 ")"
 msgstr ""
 
-#: sql_help.h:133
+#: sql_help.h:177
 msgid "define a new cast"
-msgstr "definuje nov� p�etypov�n�"
+msgstr "definuje nové přetypování"
 
-#: sql_help.h:134
+#: sql_help.h:178
 msgid ""
 "CREATE CAST (sourcetype AS targettype)\n"
 "    WITH FUNCTION funcname (argtypes)\n"
@@ -1856,51 +2663,62 @@ msgid ""
 "\n"
 "CREATE CAST (sourcetype AS targettype)\n"
 "    WITHOUT FUNCTION\n"
+"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
+"\n"
+"CREATE CAST (sourcetype AS targettype)\n"
+"    WITH INOUT\n"
 "    [ AS ASSIGNMENT | AS IMPLICIT ]"
 msgstr ""
 
-#: sql_help.h:137
+#: sql_help.h:181
 msgid "define a new constraint trigger"
-msgstr ""
+msgstr "defunuje nový constraint trigger"
 
-#: sql_help.h:138
+#: sql_help.h:182
 msgid ""
 "CREATE CONSTRAINT TRIGGER name\n"
-"    AFTER events ON\n"
-"    tablename constraint attributes\n"
-"    FOR EACH ROW EXECUTE PROCEDURE funcname ( args )"
+"    AFTER event [ OR ... ]\n"
+"    ON table_name\n"
+"    [ FROM referenced_table_name ]\n"
+"    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY "
+"DEFERRED } }\n"
+"    FOR EACH ROW\n"
+"    EXECUTE PROCEDURE funcname ( arguments )"
 msgstr ""
 
-#: sql_help.h:141
-msgid "define a new conversion"
-msgstr "definuje novou konverzi"
+#: sql_help.h:185
+msgid "define a new encoding conversion"
+msgstr "definuje novou konverzi kódování"
 
-#: sql_help.h:142
+#: sql_help.h:186
 msgid ""
-"CREATE [DEFAULT] CONVERSION name\n"
+"CREATE [ DEFAULT ] CONVERSION name\n"
 "    FOR source_encoding TO dest_encoding FROM funcname"
 msgstr ""
 
-#: sql_help.h:145
+#: sql_help.h:189
 msgid "create a new database"
-msgstr "vytvo�� novou datab�zi"
+msgstr "vytvoří novou databázi"
 
-#: sql_help.h:146
+#: sql_help.h:190
 msgid ""
 "CREATE DATABASE name\n"
 "    [ [ WITH ] [ OWNER [=] dbowner ]\n"
 "           [ TEMPLATE [=] template ]\n"
 "           [ ENCODING [=] encoding ]\n"
-"           [ TABLESPACE [=] tablespace ] ]"
+"           [ LC_COLLATE [=] lc_collate ]\n"
+"           [ LC_CTYPE [=] lc_ctype ]\n"
+"           [ TABLESPACE [=] tablespace ]\n"
+"           [ CONNECTION LIMIT [=] connlimit ] ]"
 msgstr ""
 
-#: sql_help.h:149
+#: sql_help.h:193
 msgid "define a new domain"
-msgstr "definuje novou atributovou dom�nu"
+msgstr "definuje novou atributovou doménu"
 
-#: sql_help.h:150
+#: sql_help.h:194
 msgid ""
-"CREATE DOMAIN name [AS] data_type\n"
+"CREATE DOMAIN name [ AS ] data_type\n"
 "    [ DEFAULT expression ]\n"
 "    [ constraint [ ... ] ]\n"
 "\n"
@@ -1910,80 +2728,98 @@ msgid ""
 "{ NOT NULL | NULL | CHECK (expression) }"
 msgstr ""
 
-#: sql_help.h:153
+#: sql_help.h:197
+msgid "define a new foreign-data wrapper"
+msgstr "definuje nový foreign-data wrapper"
+
+#: sql_help.h:198
+msgid ""
+"CREATE FOREIGN DATA WRAPPER name\n"
+"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+"    [ OPTIONS ( option 'value' [, ... ] ) ]"
+msgstr ""
+
+#: sql_help.h:201
 msgid "define a new function"
 msgstr "definuje novou funkci"
 
-#: sql_help.h:154
+#: sql_help.h:202
 msgid ""
-"CREATE [ OR REPLACE ] FUNCTION name ( [ [ argname ] argtype [, ...] ] )\n"
-"    RETURNS rettype\n"
+"CREATE [ OR REPLACE ] FUNCTION\n"
+"    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] "
+"[, ...] ] )\n"
+"    [ RETURNS rettype\n"
+"      | RETURNS TABLE ( colname coltype [, ...] ) ]\n"
 "  { LANGUAGE langname\n"
+"    | WINDOW\n"
 "    | IMMUTABLE | STABLE | VOLATILE\n"
 "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
 "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
+"    | COST execution_cost\n"
+"    | ROWS result_rows\n"
+"    | SET configuration_parameter { TO value | = value | FROM CURRENT }\n"
 "    | AS 'definition'\n"
 "    | AS 'obj_file', 'link_symbol'\n"
 "  } ...\n"
 "    [ WITH ( attribute [, ...] ) ]"
 msgstr ""
 
-#: sql_help.h:157
-msgid "define a new user group"
-msgstr "definuje novou u�ivatelskou skupinu"
+#: sql_help.h:205 sql_help.h:229 sql_help.h:285
+msgid "define a new database role"
+msgstr "definuje novou databázovou roli"
 
-#: sql_help.h:158
+#: sql_help.h:206
 msgid ""
 "CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
 "\n"
 "where option can be:\n"
-"\n"
-"     SYSID gid\n"
-"   | USER  username [, ...]"
+"    \n"
+"      SUPERUSER | NOSUPERUSER\n"
+"    | CREATEDB | NOCREATEDB\n"
+"    | CREATEROLE | NOCREATEROLE\n"
+"    | CREATEUSER | NOCREATEUSER\n"
+"    | INHERIT | NOINHERIT\n"
+"    | LOGIN | NOLOGIN\n"
+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+"    | VALID UNTIL 'timestamp' \n"
+"    | IN ROLE rolename [, ...]\n"
+"    | IN GROUP rolename [, ...]\n"
+"    | ROLE rolename [, ...]\n"
+"    | ADMIN rolename [, ...]\n"
+"    | USER rolename [, ...]\n"
+"    | SYSID uid"
 msgstr ""
 
-#: sql_help.h:161
+#: sql_help.h:209
 msgid "define a new index"
-msgstr "definuje nov� index"
+msgstr "definuje nový index"
 
-#: sql_help.h:162
+#: sql_help.h:210
 msgid ""
-"CREATE [ UNIQUE ] INDEX name ON table [ USING method ]\n"
-"    ( { column | ( expression ) } [ opclass ] [, ...] )\n"
+"CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
+"    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS { FIRST "
+"| LAST } ] [, ...] )\n"
+"    [ WITH ( storage_parameter = value [, ... ] ) ]\n"
 "    [ TABLESPACE tablespace ]\n"
 "    [ WHERE predicate ]"
 msgstr ""
 
-#: sql_help.h:165
+#: sql_help.h:213
 msgid "define a new procedural language"
-msgstr "definuje nov� procedur�ln� jazyk"
+msgstr "definuje nový procedurální jazyk"
 
-#: sql_help.h:166
+#: sql_help.h:214
 msgid ""
+"CREATE [ PROCEDURAL ] LANGUAGE name\n"
 "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
 "    HANDLER call_handler [ VALIDATOR valfunction ]"
 msgstr ""
 
-#: sql_help.h:169
-msgid "define a new operator class"
-msgstr "definuje novou oper�torovou t��du"
-
-#: sql_help.h:170
-msgid ""
-"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type USING index_method "
-"AS\n"
-"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ] "
-"[ RECHECK ]\n"
-"   | FUNCTION support_number funcname ( argument_type [, ...] )\n"
-"   | STORAGE storage_type\n"
-"  } [, ... ]"
-msgstr ""
-
-#: sql_help.h:173
+#: sql_help.h:217
 msgid "define a new operator"
-msgstr "definuje novy oper�tor"
+msgstr "definuje nový operátor"
 
-#: sql_help.h:174
+#: sql_help.h:218
 msgid ""
 "CREATE OPERATOR name (\n"
 "    PROCEDURE = funcname\n"
@@ -1991,59 +2827,117 @@ msgid ""
 "    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
 "    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
 "    [, HASHES ] [, MERGES ]\n"
-"    [, SORT1 = left_sort_op ] [, SORT2 = right_sort_op ]\n"
-"    [, LTCMP = less_than_op ] [, GTCMP = greater_than_op ]\n"
 ")"
 msgstr ""
 
-#: sql_help.h:177
+#: sql_help.h:221
+msgid "define a new operator class"
+msgstr "definuje novou operátorovou třídu"
+
+#: sql_help.h:222
+msgid ""
+"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
+"  USING index_method [ FAMILY family_name ] AS\n"
+"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ]\n"
+"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
+"( argument_type [, ...] )\n"
+"   | STORAGE storage_type\n"
+"  } [, ... ]"
+msgstr ""
+
+#: sql_help.h:225
+msgid "define a new operator family"
+msgstr "definuje novou rodinu operátorů"
+
+#: sql_help.h:226
+msgid "CREATE OPERATOR FAMILY name USING index_method"
+msgstr ""
+
+#: sql_help.h:230
+msgid ""
+"CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
+"\n"
+"where option can be:\n"
+"    \n"
+"      SUPERUSER | NOSUPERUSER\n"
+"    | CREATEDB | NOCREATEDB\n"
+"    | CREATEROLE | NOCREATEROLE\n"
+"    | CREATEUSER | NOCREATEUSER\n"
+"    | INHERIT | NOINHERIT\n"
+"    | LOGIN | NOLOGIN\n"
+"    | CONNECTION LIMIT connlimit\n"
+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+"    | VALID UNTIL 'timestamp' \n"
+"    | IN ROLE rolename [, ...]\n"
+"    | IN GROUP rolename [, ...]\n"
+"    | ROLE rolename [, ...]\n"
+"    | ADMIN rolename [, ...]\n"
+"    | USER rolename [, ...]\n"
+"    | SYSID uid"
+msgstr ""
+
+#: sql_help.h:233
 msgid "define a new rewrite rule"
-msgstr "definuje nov� pravidlo pro rewrite syst�m"
+msgstr "definuje nové pravidlo pro rewrite systém"
 
-#: sql_help.h:178
+#: sql_help.h:234
 msgid ""
 "CREATE [ OR REPLACE ] RULE name AS ON event\n"
 "    TO table [ WHERE condition ]\n"
 "    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }"
 msgstr ""
 
-#: sql_help.h:181
+#: sql_help.h:237
 msgid "define a new schema"
-msgstr "definuje nov� sch�ma"
+msgstr "definuje nové schéma"
 
-#: sql_help.h:182
+#: sql_help.h:238
 msgid ""
-"CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ TABLESPACE "
-"tablespace ] [ schema_element [ ... ] ]\n"
-"CREATE SCHEMA AUTHORIZATION username [ TABLESPACE tablespace ] "
-"[ schema_element [ ... ] ]"
+"CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element "
+"[ ... ] ]\n"
+"CREATE SCHEMA AUTHORIZATION username [ schema_element [ ... ] ]"
 msgstr ""
 
-#: sql_help.h:185
+#: sql_help.h:241
 msgid "define a new sequence generator"
-msgstr "definuje nov� gener�tor sekvenc�"
+msgstr "definuje nový generátor sekvencí"
 
-#: sql_help.h:186
+#: sql_help.h:242
 msgid ""
 "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]"
+"    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
+"    [ OWNED BY { table.column | NONE } ]"
 msgstr ""
 
-#: sql_help.h:189
+#: sql_help.h:245
+msgid "define a new foreign server"
+msgstr "definuje nový foreign server"
+
+#: sql_help.h:246
+msgid ""
+"CREATE SERVER servername [ TYPE 'servertype' ] [ VERSION 'serverversion' ]\n"
+"    FOREIGN DATA WRAPPER fdwname\n"
+"    [ OPTIONS ( option 'value' [, ... ] ) ]"
+msgstr ""
+
+#: sql_help.h:249
 msgid "define a new table"
 msgstr "definuje novou tabulku"
 
-#: sql_help.h:190
+#: sql_help.h:250
 msgid ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (\n"
+"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [\n"
 "  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "
 "[ ... ] ]\n"
 "    | table_constraint\n"
-"    | LIKE parent_table [ { INCLUDING | EXCLUDING } DEFAULTS ] }  [, ... ]\n"
-")\n"
+"    | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS "
+"| INDEXES } ] ... }\n"
+"    [, ... ]\n"
+"] )\n"
 "[ INHERITS ( parent_table [, ... ] ) ]\n"
-"[ WITH OIDS | WITHOUT OIDS ]\n"
+"[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
+"OIDS ]\n"
 "[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 "[ TABLESPACE tablespace ]\n"
 "\n"
@@ -2052,9 +2946,9 @@ msgid ""
 "[ CONSTRAINT constraint_name ]\n"
 "{ NOT NULL | \n"
 "  NULL | \n"
-"  UNIQUE [ USING INDEX TABLESPACE tablespace ] |\n"
-"  PRIMARY KEY [ USING INDEX TABLESPACE tablespace ] |\n"
-"  CHECK (expression) |\n"
+"  UNIQUE index_parameters |\n"
+"  PRIMARY KEY index_parameters |\n"
+"  CHECK ( expression ) |\n"
 "  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | MATCH "
 "SIMPLE ]\n"
 "    [ ON DELETE action ] [ ON UPDATE action ] }\n"
@@ -2064,313 +2958,498 @@ msgid ""
 "and table_constraint is:\n"
 "\n"
 "[ CONSTRAINT constraint_name ]\n"
-"{ UNIQUE ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] |\n"
-"  PRIMARY KEY ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] "
-"|\n"
+"{ UNIQUE ( column_name [, ... ] ) index_parameters |\n"
+"  PRIMARY KEY ( column_name [, ... ] ) index_parameters |\n"
 "  CHECK ( expression ) |\n"
 "  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "
 "[, ... ] ) ]\n"
 "    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] [ ON "
 "UPDATE action ] }\n"
-"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]"
+"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
+"IMMEDIATE ]\n"
+"\n"
+"index_parameters in UNIQUE and PRIMARY KEY constraints are:\n"
+"\n"
+"[ WITH ( storage_parameter [= value] [, ... ] ) ]\n"
+"[ USING INDEX TABLESPACE tablespace ]"
 msgstr ""
 
-#: sql_help.h:193 sql_help.h:389
+#: sql_help.h:253 sql_help.h:525
 msgid "define a new table from the results of a query"
-msgstr "definuje novou tabulku dle v�sledku dotazu"
+msgstr "definuje novou tabulku dle výsledku dotazu"
 
-#: sql_help.h:194
+#: sql_help.h:254
 msgid ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name "
-"[ (column_name [, ...] ) ] [ [ WITH | WITHOUT ] OIDS ]\n"
-"    AS query"
+"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name\n"
+"    [ (column_name [, ...] ) ]\n"
+"    [ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
+"OIDS ]\n"
+"    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
+"    [ TABLESPACE tablespace ]\n"
+"    AS query\n"
+"    [ WITH [ NO ] DATA ]"
 msgstr ""
 
-#: sql_help.h:197
+#: sql_help.h:257
 msgid "define a new tablespace"
-msgstr "definuje nov� tablespace"
+msgstr "definuje nový tablespace"
 
-#: sql_help.h:198
+#: sql_help.h:258
 msgid ""
 "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
 msgstr ""
 
-#: sql_help.h:201
+#: sql_help.h:261
+msgid "define a new text search configuration"
+msgstr "definuje novou konfiguraci fulltextového vyhledávání"
+
+#: sql_help.h:262
+msgid ""
+"CREATE TEXT SEARCH CONFIGURATION name (\n"
+"    PARSER = parser_name |\n"
+"    COPY = source_config\n"
+")"
+msgstr ""
+
+#: sql_help.h:265
+msgid "define a new text search dictionary"
+msgstr "definuje nový slovník pro fulltextové vyhledávání"
+
+#: sql_help.h:266
+msgid ""
+"CREATE TEXT SEARCH DICTIONARY name (\n"
+"    TEMPLATE = template\n"
+"    [, option = value [, ... ]]\n"
+")"
+msgstr ""
+
+#: sql_help.h:269
+msgid "define a new text search parser"
+msgstr "definuje nový parser pro fulltextové vyhledávání"
+
+#: sql_help.h:270
+msgid ""
+"CREATE TEXT SEARCH PARSER name (\n"
+"    START = start_function ,\n"
+"    GETTOKEN = gettoken_function ,\n"
+"    END = end_function ,\n"
+"    LEXTYPES = lextypes_function\n"
+"    [, HEADLINE = headline_function ]\n"
+")"
+msgstr ""
+
+#: sql_help.h:273
+msgid "define a new text search template"
+msgstr "definuje novou šablonu pro fulltextové vyhledávání"
+
+#: sql_help.h:274
+msgid ""
+"CREATE TEXT SEARCH TEMPLATE name (\n"
+"    [ INIT = init_function , ]\n"
+"    LEXIZE = lexize_function\n"
+")"
+msgstr ""
+
+#: sql_help.h:277
 msgid "define a new trigger"
-msgstr "definuje nov� trigger"
+msgstr "definuje nový trigger"
 
-#: sql_help.h:202
+#: sql_help.h:278
 msgid ""
 "CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
 "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
 "    EXECUTE PROCEDURE funcname ( arguments )"
 msgstr ""
 
-#: sql_help.h:205
+#: sql_help.h:281
 msgid "define a new data type"
-msgstr "definuje nov� datov� typ"
+msgstr "definuje nový datový typ"
 
-#: sql_help.h:206
+#: sql_help.h:282
 msgid ""
 "CREATE TYPE name AS\n"
 "    ( attribute_name data_type [, ... ] )\n"
 "\n"
+"CREATE TYPE name AS ENUM\n"
+"    ( 'label' [, ... ] )\n"
+"\n"
 "CREATE TYPE name (\n"
 "    INPUT = input_function,\n"
 "    OUTPUT = output_function\n"
 "    [ , RECEIVE = receive_function ]\n"
 "    [ , SEND = send_function ]\n"
+"    [ , TYPMOD_IN = type_modifier_input_function ]\n"
+"    [ , TYPMOD_OUT = type_modifier_output_function ]\n"
 "    [ , ANALYZE = analyze_function ]\n"
 "    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"
 "    [ , PASSEDBYVALUE ]\n"
 "    [ , ALIGNMENT = alignment ]\n"
 "    [ , STORAGE = storage ]\n"
+"    [ , LIKE = like_type ]\n"
+"    [ , CATEGORY = category ]\n"
+"    [ , PREFERRED = preferred ]\n"
 "    [ , DEFAULT = default ]\n"
 "    [ , ELEMENT = element ]\n"
 "    [ , DELIMITER = delimiter ]\n"
-")"
+")\n"
+"\n"
+"CREATE TYPE name"
 msgstr ""
 
-#: sql_help.h:209
-msgid "define a new database user account"
-msgstr "definuje nov� datab�zov� u�ivatelsk� ��et"
-
-#: sql_help.h:210
+#: sql_help.h:286
 msgid ""
 "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
 "\n"
 "where option can be:\n"
 "    \n"
-"      SYSID uid \n"
+"      SUPERUSER | NOSUPERUSER\n"
 "    | CREATEDB | NOCREATEDB\n"
+"    | CREATEROLE | NOCREATEROLE\n"
 "    | CREATEUSER | NOCREATEUSER\n"
-"    | IN GROUP groupname [, ...]\n"
+"    | INHERIT | NOINHERIT\n"
+"    | LOGIN | NOLOGIN\n"
+"    | CONNECTION LIMIT connlimit\n"
 "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'abstime'"
+"    | VALID UNTIL 'timestamp' \n"
+"    | IN ROLE rolename [, ...]\n"
+"    | IN GROUP rolename [, ...]\n"
+"    | ROLE rolename [, ...]\n"
+"    | ADMIN rolename [, ...]\n"
+"    | USER rolename [, ...]\n"
+"    | SYSID uid"
 msgstr ""
 
-#: sql_help.h:213
+#: sql_help.h:289
+msgid "define a new mapping of a user to a foreign server"
+msgstr ""
+
+#: sql_help.h:290
+msgid ""
+"CREATE USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
+"    SERVER servername\n"
+"    [ OPTIONS ( option 'value' [ , ... ] ) ]"
+msgstr ""
+
+#: sql_help.h:293
 msgid "define a new view"
-msgstr "definuje nov� n�hled"
+msgstr "definuje nový náhled"
 
-#: sql_help.h:214
-msgid "CREATE [ OR REPLACE ] VIEW name [ ( column_name [, ...] ) ] AS query"
+#: sql_help.h:294
+msgid ""
+"CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name "
+"[, ...] ) ]\n"
+"    AS query"
 msgstr ""
 
-#: sql_help.h:217
+#: sql_help.h:297
 msgid "deallocate a prepared statement"
-msgstr "dealokuje ulo�en� p��kaz"
+msgstr "dealokuje uložený příkaz"
 
-#: sql_help.h:218
-msgid "DEALLOCATE [ PREPARE ] plan_name"
+#: sql_help.h:298
+msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
 msgstr ""
 
-#: sql_help.h:221
+#: sql_help.h:301
 msgid "define a cursor"
 msgstr "definuje kursor"
 
-#: sql_help.h:222
+#: sql_help.h:302
 msgid ""
 "DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
-"    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query\n"
-"    [ FOR { READ ONLY | UPDATE [ OF column [, ...] ] } ]"
+"    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
 msgstr ""
 
-#: sql_help.h:225
+#: sql_help.h:305
 msgid "delete rows of a table"
-msgstr "sma�e ��dky z takulky"
+msgstr "smaže řádky z takulky"
 
-#: sql_help.h:226
-msgid "DELETE FROM [ ONLY ] table [ WHERE condition ]"
+#: sql_help.h:306
+msgid ""
+"DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
+"    [ USING usinglist ]\n"
+"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
+"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 msgstr ""
 
-#: sql_help.h:229
+#: sql_help.h:309
+msgid "discard session state"
+msgstr ""
+
+#: sql_help.h:310
+msgid "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
+msgstr ""
+
+#: sql_help.h:313
 msgid "remove an aggregate function"
-msgstr "odstran� agreg�tn� funkci"
+msgstr "odstraní agregátní funkci"
 
-#: sql_help.h:230
-msgid "DROP AGGREGATE name ( type ) [ CASCADE | RESTRICT ]"
+#: sql_help.h:314
+msgid ""
+"DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:233
+#: sql_help.h:317
 msgid "remove a cast"
-msgstr "odstran� definici p�etypov�n�"
+msgstr "odstraní definici přetypování"
 
-#: sql_help.h:234
-msgid "DROP CAST (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
+#: sql_help.h:318
+msgid ""
+"DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:237
+#: sql_help.h:321
 msgid "remove a conversion"
-msgstr "odstran� konverzi"
+msgstr "odstraní konverzi"
 
-#: sql_help.h:238
-msgid "DROP CONVERSION name [ CASCADE | RESTRICT ]"
+#: sql_help.h:322
+msgid "DROP CONVERSION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:241
+#: sql_help.h:325
 msgid "remove a database"
-msgstr "odstran� datab�zi"
+msgstr "odstraní databázi"
 
-#: sql_help.h:242
-msgid "DROP DATABASE name"
+#: sql_help.h:326
+msgid "DROP DATABASE [ IF EXISTS ] name"
 msgstr ""
 
-#: sql_help.h:245
+#: sql_help.h:329
 msgid "remove a domain"
-msgstr "odstran� atributovou dom�nu"
+msgstr "odstraní atributovou doménu"
 
-#: sql_help.h:246
-msgid "DROP DOMAIN name [, ...]  [ CASCADE | RESTRICT ]"
+#: sql_help.h:330
+msgid "DROP DOMAIN [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:249
+#: sql_help.h:333
+msgid "remove a foreign-data wrapper"
+msgstr "odstraní foreign-data wrapper"
+
+#: sql_help.h:334
+msgid "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:337
 msgid "remove a function"
-msgstr "odstran� funkci"
+msgstr "odstraní funkci"
 
-#: sql_help.h:250
-msgid "DROP FUNCTION name ( [ type [, ...] ] ) [ CASCADE | RESTRICT ]"
+#: sql_help.h:338
+msgid ""
+"DROP FUNCTION [ IF EXISTS ] name ( [ [ argmode ] [ argname ] argtype "
+"[, ...] ] )\n"
+"    [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:253
-msgid "remove a user group"
-msgstr "odstran� u�ivatelskou skupinu"
+#: sql_help.h:341 sql_help.h:369 sql_help.h:421
+msgid "remove a database role"
+msgstr "odstraní databázovou roli"
 
-#: sql_help.h:254
-msgid "DROP GROUP name"
+#: sql_help.h:342
+msgid "DROP GROUP [ IF EXISTS ] name [, ...]"
 msgstr ""
 
-#: sql_help.h:257
+#: sql_help.h:345
 msgid "remove an index"
-msgstr "odstran� index"
+msgstr "odstraní index"
 
-#: sql_help.h:258
-msgid "DROP INDEX name [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:346
+msgid "DROP INDEX [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:261
+#: sql_help.h:349
 msgid "remove a procedural language"
-msgstr "odstran� procedur�ln� jazyk"
+msgstr "odstraní procedurální jazyk"
 
-#: sql_help.h:262
-msgid "DROP [ PROCEDURAL ] LANGUAGE name [ CASCADE | RESTRICT ]"
+#: sql_help.h:350
+msgid "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:265
+#: sql_help.h:353
+msgid "remove an operator"
+msgstr "odstraní operátor"
+
+#: sql_help.h:354
+msgid ""
+"DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | "
+"NONE } ) [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:357
 msgid "remove an operator class"
-msgstr "odstran� oper�torovou t��du"
+msgstr "odstraní operátorovou třídu"
 
-#: sql_help.h:266
-msgid "DROP OPERATOR CLASS name USING index_method [ CASCADE | RESTRICT ]"
+#: sql_help.h:358
+msgid ""
+"DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | "
+"RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:269
-msgid "remove an operator"
-msgstr "odstran� oper�tor"
+#: sql_help.h:361
+msgid "remove an operator family"
+msgstr "odstraní rodinu operátorů"
 
-#: sql_help.h:270
+#: sql_help.h:362
 msgid ""
-"DROP OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) [ CASCADE "
-"| RESTRICT ]"
+"DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | "
+"RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:273
+#: sql_help.h:365
+msgid "remove database objects owned by a database role"
+msgstr "odstraní objekty vlastněné databázovou rolí"
+
+#: sql_help.h:366
+msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:370
+msgid "DROP ROLE [ IF EXISTS ] name [, ...]"
+msgstr ""
+
+#: sql_help.h:373
 msgid "remove a rewrite rule"
-msgstr "odstran� pravidlo pro rewrite syst�m"
+msgstr "odstraní pravidlo pro rewrite systém"
 
-#: sql_help.h:274
-msgid "DROP RULE name ON relation [ CASCADE | RESTRICT ]"
+#: sql_help.h:374
+msgid "DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:277
+#: sql_help.h:377
 msgid "remove a schema"
-msgstr "odstran� sch�ma"
+msgstr "odstraní schéma"
 
-#: sql_help.h:278
-msgid "DROP SCHEMA name [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:378
+msgid "DROP SCHEMA [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:281
+#: sql_help.h:381
 msgid "remove a sequence"
-msgstr "odstran� sekvenc�"
+msgstr "odstraní sekvencí"
 
-#: sql_help.h:282
-msgid "DROP SEQUENCE name [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:382
+msgid "DROP SEQUENCE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:385
+msgid "remove a foreign server descriptor"
+msgstr "odstraní deskriptor foreign serveru"
+
+#: sql_help.h:386
+msgid "DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:285
+#: sql_help.h:389
 msgid "remove a table"
-msgstr "odstran� tabulku"
+msgstr "odstraní tabulku"
 
-#: sql_help.h:286
-msgid "DROP TABLE name [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:390
+msgid "DROP TABLE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:289
+#: sql_help.h:393
 msgid "remove a tablespace"
-msgstr "odstran� tablespace"
+msgstr "odstraní tablespace"
 
-#: sql_help.h:290
-msgid "DROP TABLESPACE tablespacename"
+#: sql_help.h:394
+msgid "DROP TABLESPACE [ IF EXISTS ] tablespacename"
 msgstr ""
 
-#: sql_help.h:293
+#: sql_help.h:397
+msgid "remove a text search configuration"
+msgstr "odstraní konfiguraci fulltextového vyhledávání"
+
+#: sql_help.h:398
+msgid ""
+"DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:401
+msgid "remove a text search dictionary"
+msgstr "odstraní slovn?ik pro fulltextové vyhledávání"
+
+#: sql_help.h:402
+msgid "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:405
+msgid "remove a text search parser"
+msgstr "odstraní parser pro fulltextové vyhledávání"
+
+#: sql_help.h:406
+msgid "DROP TEXT SEARCH PARSER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:409
+msgid "remove a text search template"
+msgstr "odstraní Šablonu fulltextového vyhledávání"
+
+#: sql_help.h:410
+msgid "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+msgstr ""
+
+#: sql_help.h:413
 msgid "remove a trigger"
-msgstr "odstran� trigger"
+msgstr "odstraní trigger"
 
-#: sql_help.h:294
-msgid "DROP TRIGGER name ON table [ CASCADE | RESTRICT ]"
+#: sql_help.h:414
+msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:297
+#: sql_help.h:417
 msgid "remove a data type"
-msgstr "odstran� datov� typ"
+msgstr "odstraní datový typ"
 
-#: sql_help.h:298
-msgid "DROP TYPE name [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:418
+msgid "DROP TYPE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:301
-msgid "remove a database user account"
-msgstr "odstran� datab�zov� u�ivatelsk� ��et"
+#: sql_help.h:422
+msgid "DROP USER [ IF EXISTS ] name [, ...]"
+msgstr ""
 
-#: sql_help.h:302
-msgid "DROP USER name"
+#: sql_help.h:425
+msgid "remove a user mapping for a foreign server"
+msgstr "odstraní mapování uživatele z foreign serveru"
+
+#: sql_help.h:426
+msgid ""
+"DROP USER MAPPING [ IF EXISTS ] FOR { username | USER | CURRENT_USER | "
+"PUBLIC } SERVER servername"
 msgstr ""
 
-#: sql_help.h:305
+#: sql_help.h:429
 msgid "remove a view"
-msgstr "odstran� n�hled"
+msgstr "odstraní náhled"
 
-#: sql_help.h:306
-msgid "DROP VIEW name [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:430
+msgid "DROP VIEW [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:310
+#: sql_help.h:434
 msgid "END [ WORK | TRANSACTION ]"
 msgstr ""
 
-#: sql_help.h:313
+#: sql_help.h:437
 msgid "execute a prepared statement"
-msgstr "provede ulo�en� p��kaz"
+msgstr "provede uložený příkaz"
 
-#: sql_help.h:314
-msgid "EXECUTE plan_name [ (parameter [, ...] ) ]"
+#: sql_help.h:438
+msgid "EXECUTE name [ ( parameter [, ...] ) ]"
 msgstr ""
 
-#: sql_help.h:317
+#: sql_help.h:441
 msgid "show the execution plan of a statement"
-msgstr "uk�e prov�d�c� pl�n dotazu"
+msgstr "ukáže prováděcí plán dotazu"
 
-#: sql_help.h:318
+#: sql_help.h:442
 msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
 msgstr ""
 
-#: sql_help.h:321
+#: sql_help.h:445
 msgid "retrieve rows from a query using a cursor"
-msgstr "za�le ��dky v�sledku z dotazu kursoru"
+msgstr "zašle řádky výsledku z dotazu kursoru"
 
-#: sql_help.h:322
+#: sql_help.h:446
 msgid ""
 "FETCH [ direction { FROM | IN } ] cursorname\n"
 "\n"
@@ -2392,76 +3471,96 @@ msgid ""
 "    BACKWARD ALL"
 msgstr ""
 
-#: sql_help.h:325
+#: sql_help.h:449
 msgid "define access privileges"
-msgstr "definuje p��stupov� pr�va"
+msgstr "definuje přístupová práva"
 
-#: sql_help.h:326
+#: sql_help.h:450
 msgid ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"
+"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+"TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] tablename [, ...]\n"
-"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "
-"OPTION ]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
-"GRANT { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
+"GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
+"    ON [ TABLE ] tablename [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT { { USAGE | SELECT | UPDATE }\n"
+"    [,...] | ALL [ PRIVILEGES ] }\n"
+"    ON SEQUENCE sequencename [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
+"[ PRIVILEGES ] }\n"
 "    ON DATABASE dbname [, ...]\n"
-"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "
-"OPTION ]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
-"GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespacename [, ...]\n"
-"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "
-"OPTION ]\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER servername [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
 "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funcname ([type, ...]) [, ...]\n"
-"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "
-"OPTION ]\n"
+"    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
+"[, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
 "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
 "    ON LANGUAGE langname [, ...]\n"
-"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "
-"OPTION ]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
 "GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON SCHEMA schemaname [, ...]\n"
-"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT OPTION ]"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
+"    ON TABLESPACE tablespacename [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
 msgstr ""
 
-#: sql_help.h:329
+#: sql_help.h:453
 msgid "create new rows in a table"
-msgstr "p�id� nov� ��dky do tabulky"
+msgstr "přidá nové řádky do tabulky"
 
-#: sql_help.h:330
+#: sql_help.h:454
 msgid ""
 "INSERT INTO table [ ( column [, ...] ) ]\n"
-"    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) | query }"
+"    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | "
+"query }\n"
+"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 msgstr ""
 
-#: sql_help.h:333
+#: sql_help.h:457
 msgid "listen for a notification"
-msgstr "naslouch� upozorn�n�m"
+msgstr "naslouchá upozorněním"
 
-#: sql_help.h:334
+#: sql_help.h:458
 msgid "LISTEN name"
 msgstr ""
 
-#: sql_help.h:337
+#: sql_help.h:461
 msgid "load or reload a shared library file"
-msgstr "na�te nebo op�tovn� na�te sd�lenou knihovnu"
+msgstr "načte nebo opětovně načte sdílenou knihovnu"
 
-#: sql_help.h:338
+#: sql_help.h:462
 msgid "LOAD 'filename'"
 msgstr ""
 
-#: sql_help.h:341
+#: sql_help.h:465
 msgid "lock a table"
 msgstr "uzamkne tabulku"
 
-#: sql_help.h:342
+#: sql_help.h:466
 msgid ""
-"LOCK [ TABLE ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
+"LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
 "\n"
 "where lockmode is one of:\n"
 "\n"
@@ -2469,201 +3568,284 @@ msgid ""
 "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
 msgstr ""
 
-#: sql_help.h:345
+#: sql_help.h:469
 msgid "position a cursor"
-msgstr "p�em�st� kursor"
+msgstr "přemístí kursor"
 
-#: sql_help.h:346
+#: sql_help.h:470
 msgid "MOVE [ direction { FROM | IN } ] cursorname"
 msgstr ""
 
-#: sql_help.h:349
+#: sql_help.h:473
 msgid "generate a notification"
-msgstr "generuje upozorn�n�"
+msgstr "generuje upozornění"
 
-#: sql_help.h:350
+#: sql_help.h:474
 msgid "NOTIFY name"
 msgstr ""
 
-#: sql_help.h:353
+#: sql_help.h:477
 msgid "prepare a statement for execution"
-msgstr "p�iprav� a ulo�� p��kaz pro proveden�"
+msgstr "připraví a uloží příkaz pro provedení"
 
-#: sql_help.h:354
-msgid "PREPARE plan_name [ (datatype [, ...] ) ] AS statement"
+#: sql_help.h:478
+msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
 msgstr ""
 
-#: sql_help.h:357
+#: sql_help.h:481
+msgid "prepare the current transaction for two-phase commit"
+msgstr "přípraví aktuální transakci pro dvoufázoví commit"
+
+#: sql_help.h:482
+msgid "PREPARE TRANSACTION transaction_id"
+msgstr ""
+
+#: sql_help.h:485
+msgid "change the ownership of database objects owned by a database role"
+msgstr "změní vlastníka databázových objektů vlastněných databázovou rolí"
+
+#: sql_help.h:486
+msgid "REASSIGN OWNED BY old_role [, ...] TO new_role"
+msgstr ""
+
+#: sql_help.h:489
 msgid "rebuild indexes"
-msgstr "znovuvytvo�� indexy"
+msgstr "znovuvytvoří indexy"
 
-#: sql_help.h:358
-msgid "REINDEX { DATABASE | TABLE | INDEX } name [ FORCE ]"
+#: sql_help.h:490
+msgid "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ]"
 msgstr ""
 
-#: sql_help.h:361
+#: sql_help.h:493
 msgid "destroy a previously defined savepoint"
-msgstr "odstran� d��ve vytvo�en� savepoint"
+msgstr "odstraní dříve vytvořený savepoint"
 
-#: sql_help.h:362
+#: sql_help.h:494
 msgid "RELEASE [ SAVEPOINT ] savepoint_name"
 msgstr ""
 
-#: sql_help.h:365
+#: sql_help.h:497
 msgid "restore the value of a run-time parameter to the default value"
-msgstr "p�enastav� parametr b�hu na implicitn� hodnotu"
+msgstr "přenastaví parametr běhu na implicitní hodnotu"
 
-#: sql_help.h:366
+#: sql_help.h:498
 msgid ""
-"RESET name\n"
+"RESET configuration_parameter\n"
 "RESET ALL"
 msgstr ""
 
-#: sql_help.h:369
+#: sql_help.h:501
 msgid "remove access privileges"
-msgstr "odstran� p��stupov� pr�va"
+msgstr "odstraní přístupová práva"
 
-#: sql_help.h:370
+#: sql_help.h:502
 msgid ""
 "REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"
+"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+"TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] tablename [, ...]\n"
-"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
+"    { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
+"    ON [ TABLE ] tablename [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
+"    { { USAGE | SELECT | UPDATE }\n"
+"    [,...] | ALL [ PRIVILEGES ] }\n"
+"    ON SEQUENCE sequencename [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
-"    { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
+"    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON DATABASE dbname [, ...]\n"
-"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
-"    { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespacename [, ...]\n"
-"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER servername [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
 "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funcname ([type, ...]) [, ...]\n"
-"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"
+"    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
+"[, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
 "    { USAGE | ALL [ PRIVILEGES ] }\n"
 "    ON LANGUAGE langname [, ...]\n"
-"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
 "    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON SCHEMA schemaname [, ...]\n"
-"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
+"    { CREATE | ALL [ PRIVILEGES ] }\n"
+"    ON TABLESPACE tablespacename [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ ADMIN OPTION FOR ]\n"
+"    role [, ...] FROM rolename [, ...]\n"
 "    [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:374
+#: sql_help.h:506
 msgid "ROLLBACK [ WORK | TRANSACTION ]"
 msgstr ""
 
-#: sql_help.h:377
+#: sql_help.h:509
+msgid "cancel a transaction that was earlier prepared for two-phase commit"
+msgstr "zruší transakci, která byla připravena pro dvoufázový commit"
+
+#: sql_help.h:510
+msgid "ROLLBACK PREPARED transaction_id"
+msgstr ""
+
+#: sql_help.h:513
 msgid "roll back to a savepoint"
-msgstr "vr�t� se na savepoint"
+msgstr "vrátí se na savepoint"
 
-#: sql_help.h:378
+#: sql_help.h:514
 msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
 msgstr ""
 
-#: sql_help.h:381
+#: sql_help.h:517
 msgid "define a new savepoint within the current transaction"
-msgstr "definuje nov� savepoint uvnit� aktu�ln� transakce"
+msgstr "definuje nový savepoint uvnitř aktuální transakce"
 
-#: sql_help.h:382
+#: sql_help.h:518
 msgid "SAVEPOINT savepoint_name"
 msgstr ""
 
-#: sql_help.h:385
+#: sql_help.h:521 sql_help.h:557 sql_help.h:581
 msgid "retrieve rows from a table or view"
-msgstr "vybere ��dky z tabulky nebo n�hledu"
+msgstr "vybere řádky z tabulky nebo náhledu"
 
-#: sql_help.h:386
+#: sql_help.h:522 sql_help.h:558 sql_help.h:582
 msgid ""
+"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ AS output_name ] [, ...]\n"
+"    * | expression [ [ AS ] output_name ] [, ...]\n"
 "    [ FROM from_item [, ...] ]\n"
 "    [ WHERE condition ]\n"
 "    [ GROUP BY expression [, ...] ]\n"
 "    [ HAVING condition [, ...] ]\n"
+"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [, ...] ]\n"
+"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
+"LAST } ] [, ...] ]\n"
 "    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start ]\n"
-"    [ FOR UPDATE [ OF table_name [, ...] ] ]\n"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
+"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]\n"
 "\n"
 "where from_item can be one of:\n"
 "\n"
 "    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
 "    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
+"    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
 "    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "
 "[, ...] | column_definition [, ...] ) ]\n"
 "    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"
 "    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
-"( join_column [, ...] ) ]"
+"( join_column [, ...] ) ]\n"
+"\n"
+"and with_query is:\n"
+"\n"
+"    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
+"\n"
+"TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
 msgstr ""
 
-#: sql_help.h:390
+#: sql_help.h:526
 msgid ""
+"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ AS output_name ] [, ...]\n"
+"    * | expression [ [ AS ] output_name ] [, ...]\n"
 "    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
 "    [ FROM from_item [, ...] ]\n"
 "    [ WHERE condition ]\n"
 "    [ GROUP BY expression [, ...] ]\n"
 "    [ HAVING condition [, ...] ]\n"
+"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [, ...] ]\n"
+"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
+"LAST } ] [, ...] ]\n"
 "    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start ]\n"
-"    [ FOR UPDATE [ OF tablename [, ...] ] ]"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
+"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
 msgstr ""
 
-#: sql_help.h:393
+#: sql_help.h:529
 msgid "change a run-time parameter"
-msgstr "zm�n� parametry b�hu"
+msgstr "změní parametry běhu"
 
-#: sql_help.h:394
+#: sql_help.h:530
 msgid ""
-"SET [ SESSION | LOCAL ] name { TO | = } { value | 'value' | DEFAULT }\n"
+"SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | 'value' "
+"| DEFAULT }\n"
 "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
 msgstr ""
 
-#: sql_help.h:397
+#: sql_help.h:533
 msgid "set constraint checking modes for the current transaction"
-msgstr ""
+msgstr "nastaví constraint checking mód pro aktuální transakci"
 
-#: sql_help.h:398
+#: sql_help.h:534
 msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
 msgstr ""
 
-#: sql_help.h:401
+#: sql_help.h:537
+msgid "set the current user identifier of the current session"
+msgstr ""
+
+#: sql_help.h:538
+msgid ""
+"SET [ SESSION | LOCAL ] ROLE rolename\n"
+"SET [ SESSION | LOCAL ] ROLE NONE\n"
+"RESET ROLE"
+msgstr ""
+
+#: sql_help.h:541
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
-msgstr ""
+msgstr "" 
 
-#: sql_help.h:402
+#: sql_help.h:542
 msgid ""
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
 "RESET SESSION AUTHORIZATION"
 msgstr ""
 
-#: sql_help.h:405
+#: sql_help.h:545
 msgid "set the characteristics of the current transaction"
-msgstr ""
+msgstr "nastaví charakteristiku pro aktualní trasakci"
 
-#: sql_help.h:406
+#: sql_help.h:546
 msgid ""
 "SET TRANSACTION transaction_mode [, ...]\n"
 "SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
@@ -2675,17 +3857,17 @@ msgid ""
 "    READ WRITE | READ ONLY"
 msgstr ""
 
-#: sql_help.h:409
+#: sql_help.h:549
 msgid "show the value of a run-time parameter"
-msgstr ""
+msgstr "zobrazí hodnoty run-time parametrů"
 
-#: sql_help.h:410
+#: sql_help.h:550
 msgid ""
 "SHOW name\n"
 "SHOW ALL"
 msgstr ""
 
-#: sql_help.h:414
+#: sql_help.h:554
 msgid ""
 "START TRANSACTION [ transaction_mode [, ...] ]\n"
 "\n"
@@ -2696,40 +3878,115 @@ msgid ""
 "    READ WRITE | READ ONLY"
 msgstr ""
 
-#: sql_help.h:417
-msgid "empty a table"
-msgstr "pr�zdn� tabulka"
+#: sql_help.h:561
+msgid "empty a table or set of tables"
+msgstr "zruší obsah tabulky nebo skupiny tabulek"
 
-#: sql_help.h:418
-msgid "TRUNCATE [ TABLE ] name"
+#: sql_help.h:562
+msgid ""
+"TRUNCATE [ TABLE ] [ ONLY ] name [, ... ]\n"
+"    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
 msgstr ""
 
-#: sql_help.h:421
+#: sql_help.h:565
 msgid "stop listening for a notification"
-msgstr "ukon�� naslouch�n� p�ipom�nk�m"
+msgstr "ukončí naslouchání připomínkám"
 
-#: sql_help.h:422
+#: sql_help.h:566
 msgid "UNLISTEN { name | * }"
 msgstr ""
 
-#: sql_help.h:425
+#: sql_help.h:569
 msgid "update rows of a table"
-msgstr "aktualizuje ��dky tabulky"
+msgstr "aktualizuje řádky tabulky"
 
-#: sql_help.h:426
+#: sql_help.h:570
 msgid ""
-"UPDATE [ ONLY ] table SET column = { expression | DEFAULT } [, ...]\n"
+"UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
+"    SET { column = { expression | DEFAULT } |\n"
+"          ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } "
+"[, ...]\n"
 "    [ FROM fromlist ]\n"
-"    [ WHERE condition ]"
+"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
+"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 msgstr ""
 
-#: sql_help.h:429
+#: sql_help.h:573
 msgid "garbage-collect and optionally analyze a database"
-msgstr "provede �klid a p��padn� anal�zu datab�ze"
+msgstr "provede úklid a případně analýzu databáze"
 
-#: sql_help.h:430
+#: sql_help.h:574
 msgid ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
 "[, ...] ) ] ]"
 msgstr ""
+
+#: sql_help.h:577
+msgid "compute a set of rows"
+msgstr "spočítá množinu řádek"
+
+#: sql_help.h:578
+msgid ""
+"VALUES ( expression [, ...] ) [, ...]\n"
+"    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
+"    [ LIMIT { count | ALL } ]\n"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
+msgstr ""
+
+#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nelze získat aktuální adresář: %s"
+
+#: ../../port/exec.c:214
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "neplatný binární soubor\"%s\""
+
+#: ../../port/exec.c:263
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nelze číst binární soubor \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nelze najít spustitelný soubor \"%s\""
+
+#: ../../port/exec.c:325 ../../port/exec.c:361
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nelze změnit adresář na \"%s\""
+
+#: ../../port/exec.c:340
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nelze číst symbolický link \"%s\""
+
+#: ../../port/exec.c:586
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "potomek skončil s návratovým kódem %d"
+
+#: ../../port/exec.c:590
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "potomek byl ukončen vyjímkou 0x%X"
+
+#: ../../port/exec.c:599
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "potomek byl ukončen signálem %s"
+
+#: ../../port/exec.c:602
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "potomek byl ukončen signálem %d"
+
+#: ../../port/exec.c:606
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "potomek skončil s nerozponaným stavem %d"
+
diff --git a/src/bin/psql/po/de.po b/src/bin/psql/po/de.po
index ec30f7aec7..ac891a490d 100644
--- a/src/bin/psql/po/de.po
+++ b/src/bin/psql/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-11 14:02+0300\n"
-"PO-Revision-Date: 2009-04-11 17:10+0300\n"
+"POT-Creation-Date: 2009-06-10 17:09+0000\n"
+"PO-Revision-Date: 2009-06-11 00:20+0300\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
@@ -48,150 +48,152 @@ msgstr "\\%s: konnte nicht in das Verzeichnis �%s� wechseln: %s\n"
 msgid "Time: %.3f ms\n"
 msgstr "Zeit: %.3f ms\n"
 
-#: command.c:454 command.c:482 command.c:1021
+#: command.c:468 command.c:496 command.c:1035
 msgid "no query buffer\n"
 msgstr "kein Anfragepuffer\n"
 
-#: command.c:524
+#: command.c:538
 msgid "No changes"
 msgstr "keine �nderungen"
 
-#: command.c:578
+#: command.c:592
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: ung�ltiger Kodierungsname oder Umwandlungsprozedur nicht gefunden\n"
 
-#: command.c:646 command.c:680 command.c:694 command.c:711 command.c:815
-#: command.c:865 command.c:1001 command.c:1032
+#: command.c:660 command.c:694 command.c:708 command.c:725 command.c:829
+#: command.c:879 command.c:1015 command.c:1046
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: notwendiges Argument fehlt\n"
 
-#: command.c:743
+#: command.c:757
 msgid "Query buffer is empty."
 msgstr "Anfragepuffer ist leer."
 
-#: command.c:753
+#: command.c:767
 msgid "Enter new password: "
 msgstr "Neues Passwort eingeben: "
 
-#: command.c:754
+#: command.c:768
 msgid "Enter it again: "
 msgstr "Geben Sie es noch einmal ein: "
 
-#: command.c:758
+#: command.c:772
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Passw�rter stimmten nicht �berein.\n"
 
-#: command.c:776
+#: command.c:790
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Passwortverschl�sselung ist fehlgeschlagen.\n"
 
-#: command.c:844 command.c:945 command.c:1006
+#: command.c:858 command.c:959 command.c:1020
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: Fehler\n"
 
-#: command.c:885
+#: command.c:899
 msgid "Query buffer reset (cleared)."
 msgstr "Anfragepuffer wurde gel�scht."
 
-#: command.c:898
+#: command.c:912
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "Befehlsgeschichte in Datei �%s/%s� geschrieben.\n"
 
-#: command.c:936 common.c:52 common.c:66 input.c:198 mainloop.c:69
+#: command.c:950 common.c:52 common.c:66 input.c:198 mainloop.c:69
 #: mainloop.c:227 print.c:61 print.c:75
 #, c-format
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: command.c:986
+#: command.c:1000
 msgid "Timing is on."
 msgstr "Zeitmessung ist an."
 
-#: command.c:988
+#: command.c:1002
 msgid "Timing is off."
 msgstr "Zeitmessung ist aus."
 
-#: command.c:1049 command.c:1069 command.c:1567 command.c:1574 command.c:1583
-#: command.c:1593 command.c:1602 command.c:1616 command.c:1633 command.c:1666
-#: common.c:137 copy.c:521 copy.c:585
+#: command.c:1063 command.c:1083 command.c:1581 command.c:1588 command.c:1597
+#: command.c:1607 command.c:1616 command.c:1630 command.c:1647 command.c:1680
+#: common.c:137 copy.c:517 copy.c:581
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1151 startup.c:159
+#: command.c:1165 startup.c:159
 msgid "Password: "
 msgstr "Passwort: "
 
-#: command.c:1158 startup.c:162 startup.c:164
+#: command.c:1172 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "Passwort f�r Benutzer %s: "
 
-#: command.c:1254 command.c:2096 common.c:183 common.c:460 common.c:525
-#: common.c:811 common.c:836 common.c:920 copy.c:656 copy.c:701 copy.c:830
+#: command.c:1268 command.c:2110 common.c:183 common.c:460 common.c:525
+#: common.c:811 common.c:836 common.c:920 copy.c:652 copy.c:697 copy.c:826
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1258
+#: command.c:1272
 msgid "Previous connection kept\n"
 msgstr "Vorherige Verbindung wurde behalten\n"
 
-#: command.c:1262
+#: command.c:1276
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1286
+#: command.c:1300
 #, c-format
 msgid "You are now connected to database \"%s\""
 msgstr "Sie sind jetzt verbunden mit der Datenbank �%s�"
 
-#: command.c:1289
+#: command.c:1303
 #, c-format
 msgid " on host \"%s\""
 msgstr " auf Host �%s�"
 
-#: command.c:1292
+#: command.c:1306
 #, c-format
 msgid " at port \"%s\""
 msgstr " auf Port �%s�"
 
-#: command.c:1295
+#: command.c:1309
 #, c-format
 msgid " as user \"%s\""
 msgstr " als Benutzer �%s�"
 
-#: command.c:1330
+#: command.c:1344
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, Server %s)\n"
 
-#: command.c:1337
+#: command.c:1351
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
 "         Some psql features might not work.\n"
 msgstr ""
+"WARNUNG: %s-Version %d.%d, Serverversion %d.%d.\n"
+"         Einige Features von psql werden eventuell nicht funktionieren.\n"
 
-#: command.c:1367
+#: command.c:1381
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "SSL-Verbindung (Verschl�sselungsmethode: %s, Bits: %i)\n"
 
-#: command.c:1376
+#: command.c:1390
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "SSL-Verbindung (unbekannte Verschl�sselungsmethode)\n"
 
-#: command.c:1397
+#: command.c:1411
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -203,26 +205,26 @@ msgstr ""
 "         richtig. Einzelheiten finden Sie auf der psql-Handbuchseite unter\n"
 "         �Notes for Windows users�.\n"
 
-#: command.c:1486
+#: command.c:1500
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "konnte Editor �%s� nicht starten\n"
 
-#: command.c:1488
+#: command.c:1502
 msgid "could not start /bin/sh\n"
 msgstr "konnte /bin/sh nicht starten\n"
 
-#: command.c:1525
+#: command.c:1539
 #, c-format
 msgid "cannot locate temporary directory: %s"
 msgstr "konnte tempor�res Verzeichnis nicht finden: %s"
 
-#: command.c:1552
+#: command.c:1566
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "konnte tempor�re Datei �%s� nicht �ffnen: %s\n"
 
-#: command.c:1750
+#: command.c:1764
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
@@ -230,113 +232,113 @@ msgstr ""
 "\\pset: zul�ssige Formate sind unaligned, aligned, wrapped, html, latex, "
 "troff-ms\n"
 
-#: command.c:1755
+#: command.c:1769
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Ausgabeformat ist �%s�.\n"
 
-#: command.c:1765
+#: command.c:1779
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Rahmenstil ist %d.\n"
 
-#: command.c:1777
+#: command.c:1791
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Erweiterte Anzeige ist an.\n"
 
-#: command.c:1778
+#: command.c:1792
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Erweiterte Anzeige ist aus.\n"
 
-#: command.c:1791
+#: command.c:1805
 msgid "Showing locale-adjusted numeric output."
 msgstr "Zeige numerische Daten in lokalisiertem Format."
 
-#: command.c:1793
+#: command.c:1807
 msgid "Locale-adjusted numeric output is off."
 msgstr "Lokalisiertes Format f�r numerische Daten ist aus."
 
-#: command.c:1806
+#: command.c:1820
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null-Anzeige ist �%s�.\n"
 
-#: command.c:1818
+#: command.c:1832
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Feldtrennzeichen ist �%s�.\n"
 
-#: command.c:1832
+#: command.c:1846
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "Satztrennzeichen ist <newline>."
 
-#: command.c:1834
+#: command.c:1848
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Satztrennzeichen ist �%s�.\n"
 
-#: command.c:1848
+#: command.c:1862
 msgid "Showing only tuples."
 msgstr "Zeige nur Datenzeilen."
 
-#: command.c:1850
+#: command.c:1864
 msgid "Tuples only is off."
 msgstr "Nur Datenzeilen ist aus."
 
-#: command.c:1866
+#: command.c:1880
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Titel ist �%s�.\n"
 
-#: command.c:1868
+#: command.c:1882
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Titel ist nicht gesetzt.\n"
 
-#: command.c:1884
+#: command.c:1898
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Tabellenattribut ist �%s�.\n"
 
-#: command.c:1886
+#: command.c:1900
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Tabellenattribute sind nicht gesetzt.\n"
 
-#: command.c:1907
+#: command.c:1921
 msgid "Pager is used for long output."
 msgstr "Pager wird f�r lange Ausgaben verwendet."
 
-#: command.c:1909
+#: command.c:1923
 msgid "Pager is always used."
 msgstr "Pager wird immer verwendet."
 
-#: command.c:1911
+#: command.c:1925
 msgid "Pager usage is off."
 msgstr "Pager-Verwendung ist aus."
 
-#: command.c:1925
+#: command.c:1939
 msgid "Default footer is on."
 msgstr "Standardfu�zeile ist an."
 
-#: command.c:1927
+#: command.c:1941
 msgid "Default footer is off."
 msgstr "Standardfu�zeile ist aus."
 
-#: command.c:1938
+#: command.c:1952
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
-msgstr ""
+msgstr "Zielbreite f�r Format �wrapped� ist %d.\n"
 
-#: command.c:1943
+#: command.c:1957
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: unbekannte Option: %s\n"
 
-#: command.c:1997
+#: command.c:2011
 msgid "\\!: failed\n"
 msgstr "\\!: fehlgeschlagen\n"
 
@@ -407,54 +409,55 @@ msgstr ""
 #: common.c:827
 #, c-format
 msgid ""
-"The server version (%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+"The server (version %d.%d) does not support savepoints for "
+"ON_ERROR_ROLLBACK.\n"
 msgstr ""
-"Diese Serverversion (%d) unterst�tzt keine Sicherungspunkte f�r "
+"Der Server (Version %d.%d) unterst�tzt keine Sicherungspunkte f�r "
 "ON_ERROR_ROLLBACK.\n"
 
-#: copy.c:124
+#: copy.c:120
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: ben�tigt Argumente\n"
 
-#: copy.c:403
+#: copy.c:399
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: Parse-Fehler bei �%s�\n"
 
-#: copy.c:405
+#: copy.c:401
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: Parse-Fehler am Zeilenende\n"
 
-#: copy.c:532
+#: copy.c:528
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: ein Verzeichnis kann nicht kopiert werden\n"
 
-#: copy.c:558
+#: copy.c:554
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:562 copy.c:576
+#: copy.c:558 copy.c:572
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: unerwartete Antwort (%d)\n"
 
-#: copy.c:631 copy.c:641
+#: copy.c:627 copy.c:637
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "konnte COPY-Daten nicht schreiben: %s\n"
 
-#: copy.c:648
+#: copy.c:644
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "Datentransfer mit COPY fehlgeschlagen: %s"
 
-#: copy.c:696
+#: copy.c:692
 msgid "canceled by user"
 msgstr "vom Benutzer abgebrochen"
 
-#: copy.c:711
+#: copy.c:707
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -462,7 +465,7 @@ msgstr ""
 "Geben Sie die zu kopierenden Daten ein, gefolgt von einem Zeilenende.\n"
 "Beenden Sie mit einem Backslash und einem Punkt alleine auf einer Zeile."
 
-#: copy.c:823
+#: copy.c:819
 msgid "aborted because of read failure"
 msgstr "abgebrochen wegen Lesenfehlers"
 
@@ -823,11 +826,11 @@ msgstr ""
 "bearbeiten\n"
 
 #: help.c:178
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"  \\ef [FUNCNAME]         edit a function definition with external editor\n"
+"  \\ef [FUNCNAME]         edit function definition with external editor\n"
 msgstr ""
-"  \\e [DATEI]             Anfragepuffer (oder Datei) mit externem Editor "
+"  \\ef [FUNKNAME]         Funktionsdefinition mit externem Editor "
 "bearbeiten\n"
 
 #: help.c:179
@@ -915,8 +918,8 @@ msgstr ""
 
 #: help.c:199
 #, c-format
-msgid "  \\da[S]  [PATTERN]      list aggregate functions\n"
-msgstr "  \\da[S]  [MUSTER]       Aggregatfunktionen auflisten\n"
+msgid "  \\da[+]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[+]  [MUSTER]       Aggregatfunktionen auflisten\n"
 
 #: help.c:200
 #, c-format
@@ -960,8 +963,11 @@ msgstr "  \\dew[+] [MUSTER]       Fremddaten-Wrapper auflisten\n"
 
 #: help.c:208
 #, c-format
-msgid "  \\df[S+] [PATTERN]      list functions\n"
-msgstr "  \\df[S+] [MUSTER]       Funktionen auflisten\n"
+msgid ""
+"  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
+msgstr ""
+"  \\df[antw][S+] [MUSTR]  Funktionen [nur Agg/normale/Trigger/Window] "
+"auflisten\n"
 
 #: help.c:209
 #, c-format
@@ -1268,11 +1274,11 @@ msgstr "%s: unbekannter Transaktionsstatus\n"
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:267 describe.c:350
-#: describe.c:425 describe.c:496 describe.c:619 describe.c:1097
-#: describe.c:1868 describe.c:1996 describe.c:2288 describe.c:2350
-#: describe.c:2486 describe.c:2525 describe.c:2592 describe.c:2651
-#: describe.c:2660 describe.c:2719
+#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:337 describe.c:490
+#: describe.c:565 describe.c:636 describe.c:759 describe.c:1237
+#: describe.c:2008 describe.c:2139 describe.c:2431 describe.c:2493
+#: describe.c:2629 describe.c:2668 describe.c:2735 describe.c:2794
+#: describe.c:2803 describe.c:2862
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1287,7 +1293,7 @@ msgstr "Verwenden Sie �\\q�, um %s zu verlassen.\n"
 
 #: mainloop.c:182
 msgid "You are using psql, the command-line interface to PostgreSQL."
-msgstr ""
+msgstr "Dies ist psql, die Kommandozeilenschnittstelle f�r PostgreSQL."
 
 #: mainloop.c:183
 #, c-format
@@ -1317,23 +1323,23 @@ msgstr "Unterbrochen\n"
 #: print.c:2027
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
-msgstr ""
+msgstr "Kann keinen weiteren Spaltenkopf zur Tabelle hinzuf�gen: Spaltenzahl %d �berschritten.\n"
 
 #: print.c:2064
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
-msgstr ""
+msgstr "Cann keine weitere Zelle zur Tabelle hinzuf�gen: Zellengesamtzahl %d �berschritten.\n"
 
 #: print.c:2263
-#, fuzzy, c-format
-msgid "invalid fout format (internal error): %d"
+#, c-format
+msgid "invalid output format (internal error): %d"
 msgstr "ung�ltiges Ausgabeformat (interner Fehler): %d"
 
-#: print.c:2351
+#: print.c:2352
 #, c-format
-msgid "(1 row)"
+msgid "(%lu row)"
 msgid_plural "(%lu rows)"
-msgstr[0] "(1 Zeile)"
+msgstr[0] "(%lu Zeile)"
 msgstr[1] "(%lu Zeilen)"
 
 #: startup.c:217
@@ -1379,26 +1385,26 @@ msgstr "%s: Warnung: �berfl�ssiges Kommandozeilenargument �%s� ignoriert\n"
 msgid "contains support for command-line editing"
 msgstr "enth�lt Unterst�tzung f�r Kommandozeilenbearbeitung"
 
-#: describe.c:68 describe.c:200 describe.c:322 describe.c:420 describe.c:541
-#: describe.c:616 describe.c:1974 describe.c:2094 describe.c:2149
-#: describe.c:2348 describe.c:2575 describe.c:2647 describe.c:2658
-#: describe.c:2717
+#: describe.c:68 describe.c:235 describe.c:462 describe.c:560 describe.c:681
+#: describe.c:756 describe.c:2117 describe.c:2237 describe.c:2292
+#: describe.c:2491 describe.c:2718 describe.c:2790 describe.c:2801
+#: describe.c:2860
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:69 describe.c:145 describe.c:201 describe.c:323 describe.c:421
-#: describe.c:471 describe.c:542 describe.c:617 describe.c:1975
-#: describe.c:2095 describe.c:2150 describe.c:2279 describe.c:2349
-#: describe.c:2576 describe.c:2648 describe.c:2659 describe.c:2718
-#: describe.c:2908 describe.c:2967
+#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:561
+#: describe.c:611 describe.c:682 describe.c:757 describe.c:2118
+#: describe.c:2238 describe.c:2293 describe.c:2422 describe.c:2492
+#: describe.c:2719 describe.c:2791 describe.c:2802 describe.c:2861
+#: describe.c:3051 describe.c:3110
 msgid "Name"
 msgstr "Name"
 
-#: describe.c:70 describe.c:207 describe.c:242 describe.c:249
+#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
 msgid "Result data type"
 msgstr "Ergebnisdatentyp"
 
-#: describe.c:84 describe.c:88 describe.c:208 describe.c:243 describe.c:250
+#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
 msgid "Argument data types"
 msgstr "Argumentdatentypen"
 
@@ -1411,8 +1417,8 @@ msgstr "Liste der Aggregatfunktionen"
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr "Der Server (Version %d.%d) unterst�tzt keine Tablespaces.\n"
 
-#: describe.c:146 describe.c:264 describe.c:472 describe.c:1982
-#: describe.c:2280 describe.c:2909 describe.c:2968
+#: describe.c:146 describe.c:334 describe.c:612 describe.c:2125
+#: describe.c:2423 describe.c:3052 describe.c:3111
 msgid "Owner"
 msgstr "Eigent�mer"
 
@@ -1424,562 +1430,597 @@ msgstr "Pfad"
 msgid "List of tablespaces"
 msgstr "Liste der Tablespaces"
 
-#: describe.c:263
+#: describe.c:212
+#, c-format
+msgid "\\df only takes [antwS+] as options\n"
+msgstr "\\df akzeptiert nur [antwS+] als Optionen\n"
+
+#: describe.c:218
+#, c-format
+msgid "\\df does not take a \"w\" option in %d.%d.\n"
+msgstr ""
+
+#. translator: "agg" is short for "aggregate"
+#: describe.c:251 describe.c:297 describe.c:314
+msgid "agg"
+msgstr "Agg"
+
+#: describe.c:252
+msgid "window"
+msgstr "Window"
+
+#: describe.c:253 describe.c:298 describe.c:315 describe.c:896
+msgid "trigger"
+msgstr "Trigger"
+
+#: describe.c:254 describe.c:299 describe.c:316
+msgid "normal"
+msgstr "normal"
+
+#: describe.c:255 describe.c:300 describe.c:317 describe.c:684 describe.c:1222
+#: describe.c:2124 describe.c:2239 describe.c:3123
+msgid "Type"
+msgstr "Typ"
+
+#: describe.c:330
+msgid "immutable"
+msgstr "unver�nderlich"
+
+#: describe.c:331
+msgid "stable"
+msgstr "stabil"
+
+#: describe.c:332
+msgid "volatile"
+msgstr "volatil"
+
+#: describe.c:333
 msgid "Volatility"
 msgstr "Volatilit�t"
 
-#: describe.c:265
+#: describe.c:335
 msgid "Language"
 msgstr "Sprache"
 
-#: describe.c:266
+#: describe.c:336
 msgid "Source code"
 msgstr "Quelltext"
 
-#: describe.c:295
+#: describe.c:434
 msgid "List of functions"
 msgstr "Liste der Funktionen"
 
-#: describe.c:333
+#: describe.c:473
 msgid "Internal name"
 msgstr "Interner Name"
 
-#: describe.c:334 describe.c:488 describe.c:1992
+#: describe.c:474 describe.c:628 describe.c:2135
 msgid "Size"
 msgstr "Gr��e"
 
-#: describe.c:346
+#: describe.c:486
 msgid "Elements"
 msgstr "Elemente"
 
-#: describe.c:389
+#: describe.c:529
 msgid "List of data types"
 msgstr "Liste der Datentypen"
 
-#: describe.c:422
+#: describe.c:562
 msgid "Left arg type"
 msgstr "Linker Typ"
 
-#: describe.c:423
+#: describe.c:563
 msgid "Right arg type"
 msgstr "Rechter Typ"
 
-#: describe.c:424
+#: describe.c:564
 msgid "Result type"
 msgstr "Ergebnistyp"
 
-#: describe.c:443
+#: describe.c:583
 msgid "List of operators"
 msgstr "Liste der Operatoren"
 
-#: describe.c:473
+#: describe.c:613
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: describe.c:478
+#: describe.c:618
 msgid "Collation"
 msgstr "Sortierfolge"
 
-#: describe.c:479
+#: describe.c:619
 msgid "Ctype"
 msgstr "Zeichentyp"
 
-#: describe.c:492
+#: describe.c:632
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:509
+#: describe.c:649
 msgid "List of databases"
 msgstr "Liste der Datenbanken"
 
-#: describe.c:543 describe.c:711 describe.c:1976
+#: describe.c:683 describe.c:851 describe.c:2119
 msgid "table"
 msgstr "Tabelle"
 
-#: describe.c:543 describe.c:712 describe.c:1977
+#: describe.c:683 describe.c:852 describe.c:2120
 msgid "view"
 msgstr "Sicht"
 
-#: describe.c:543 describe.c:714 describe.c:1979
+#: describe.c:683 describe.c:854 describe.c:2122
 msgid "sequence"
 msgstr "Sequenz"
 
-#: describe.c:544 describe.c:1082 describe.c:1981 describe.c:2096
-#: describe.c:2980
-msgid "Type"
-msgstr "Typ"
-
-#: describe.c:555
+#: describe.c:695
 msgid "Column access privileges"
 msgstr "Spalten-Zugriffsprivilegien"
 
-#: describe.c:581 describe.c:3075 describe.c:3079
+#: describe.c:721 describe.c:3218 describe.c:3222
 msgid "Access privileges"
 msgstr "Zugriffsrechte"
 
-#: describe.c:618
+#: describe.c:758
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:630
+#: describe.c:770
 msgid "aggregate"
 msgstr "Aggregat"
 
-#: describe.c:650
+#: describe.c:790
 msgid "function"
 msgstr "Funktion"
 
-#: describe.c:669
+#: describe.c:809
 msgid "operator"
 msgstr "Operator"
 
-#: describe.c:688
+#: describe.c:828
 msgid "data type"
 msgstr "Datentyp"
 
-#: describe.c:713 describe.c:1978
+#: describe.c:853 describe.c:2121
 msgid "index"
 msgstr "Index"
 
-#: describe.c:735
+#: describe.c:875
 msgid "rule"
 msgstr "Rule"
 
-#: describe.c:756
-msgid "trigger"
-msgstr "Trigger"
-
-#: describe.c:779
+#: describe.c:919
 msgid "Object descriptions"
 msgstr "Objektbeschreibungen"
 
-#: describe.c:832
+#: describe.c:972
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Keine Relationen namens �%s� gefunden\n"
 
-#: describe.c:969
+#: describe.c:1109
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Keine Relation mit OID %s gefunden.\n"
 
-#: describe.c:1044
+#: describe.c:1184
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabelle �%s.%s�"
 
-#: describe.c:1048
+#: describe.c:1188
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Sicht �%s.%s�"
 
-#: describe.c:1052
+#: describe.c:1192
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sequenz �%s.%s�"
 
-#: describe.c:1056
+#: describe.c:1196
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index �%s.%s�"
 
-#: describe.c:1061
+#: describe.c:1201
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Spezielle Relation �%s.%s�"
 
-#: describe.c:1065
+#: describe.c:1205
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-Tabelle �%s.%s�"
 
-#: describe.c:1069
+#: describe.c:1209
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Zusammengesetzter Typ �%s.%s�"
 
-#: describe.c:1081
+#: describe.c:1221
 msgid "Column"
 msgstr "Spalte"
 
-#: describe.c:1087
+#: describe.c:1227
 msgid "Modifiers"
 msgstr "Attribute"
 
-#: describe.c:1092
+#: describe.c:1232
 msgid "Value"
 msgstr "Wert"
 
-#: describe.c:1096
+#: describe.c:1236
 msgid "Storage"
 msgstr "Speicherung"
 
-#: describe.c:1138
+#: describe.c:1278
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1147
+#: describe.c:1287
 #, c-format
 msgid "default %s"
 msgstr "Vorgabewert %s"
 
-#: describe.c:1213
+#: describe.c:1353
 msgid "primary key, "
 msgstr "Prim�rschl�ssel, "
 
-#: describe.c:1215
+#: describe.c:1355
 msgid "unique, "
 msgstr "eindeutig, "
 
-#: describe.c:1221
+#: describe.c:1361
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "f�r Tabelle �%s.%s�"
 
-#: describe.c:1225
+#: describe.c:1365
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", Pr�dikat (%s)"
 
-#: describe.c:1228
+#: describe.c:1368
 msgid ", clustered"
 msgstr ", geclustert"
 
-#: describe.c:1231
+#: describe.c:1371
 msgid ", invalid"
 msgstr ", ung�ltig"
 
-#: describe.c:1245
+#: describe.c:1385
 msgid "View definition:"
 msgstr "Sichtdefinition:"
 
-#: describe.c:1262 describe.c:1515
+#: describe.c:1402 describe.c:1655
 msgid "Rules:"
 msgstr "Regeln:"
 
-#: describe.c:1309
+#: describe.c:1449
 msgid "Indexes:"
 msgstr "Indexe:"
 
-#: describe.c:1369
+#: describe.c:1509
 msgid "Check constraints:"
 msgstr "Check-Constraints:"
 
-#: describe.c:1400
+#: describe.c:1540
 msgid "Foreign-key constraints:"
 msgstr "Fremdschl�ssel-Constraints:"
 
-#: describe.c:1431
+#: describe.c:1571
 msgid "Referenced by:"
 msgstr "Fremdschl�sselverweise von:"
 
 #. translator: the first %s is a FK name, the following are
 #. * a table name and the FK definition
-#: describe.c:1436
+#: describe.c:1576
 #, fuzzy, c-format
 msgid "  \"%s\" IN %s %s"
 msgstr "    �%s� %s"
 
-#: describe.c:1518
+#: describe.c:1658
 msgid "Disabled rules:"
 msgstr "Abgeschaltete Regeln:"
 
-#: describe.c:1521
+#: describe.c:1661
 msgid "Rules firing always:"
 msgstr "Regeln, die immer aktiv werden:"
 
-#: describe.c:1524
+#: describe.c:1664
 msgid "Rules firing on replica only:"
 msgstr "Regeln, die nur im Replikat aktiv werden:"
 
-#: describe.c:1620
+#: describe.c:1760
 msgid "Triggers:"
 msgstr "Trigger:"
 
-#: describe.c:1623
+#: describe.c:1763
 msgid "Disabled triggers:"
 msgstr "Abgeschaltete Trigger:"
 
-#: describe.c:1626
+#: describe.c:1766
 msgid "Triggers firing always:"
 msgstr "Trigger, die immer aktiv werden:"
 
-#: describe.c:1629
+#: describe.c:1769
 msgid "Triggers firing on replica only:"
 msgstr "Trigger, die nur im Replikat aktiv werden:"
 
-#: describe.c:1662
+#: describe.c:1802
 msgid "Inherits"
 msgstr "Erbt von"
 
-#: describe.c:1677
+#: describe.c:1817
 msgid "Has OIDs"
 msgstr "Hat OIDs"
 
-#: describe.c:1680 describe.c:2153 describe.c:2226
+#: describe.c:1820 describe.c:2296 describe.c:2369
 msgid "yes"
 msgstr "ja"
 
-#: describe.c:1680 describe.c:2153 describe.c:2226
+#: describe.c:1820 describe.c:2296 describe.c:2369
 msgid "no"
 msgstr "nein"
 
-#: describe.c:1688 describe.c:2918 describe.c:2982 describe.c:3038
+#: describe.c:1828 describe.c:3061 describe.c:3125 describe.c:3181
 msgid "Options"
 msgstr "Optionen"
 
-#: describe.c:1773
+#: describe.c:1913
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: �%s�"
 
 #. translator: before this string there's an index
 #. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:1783
+#: describe.c:1923
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", Tablespace �%s�"
 
-#: describe.c:1861
+#: describe.c:2001
 msgid "List of roles"
 msgstr "Liste der Rollen"
 
-#: describe.c:1863
+#: describe.c:2003
 msgid "Role name"
 msgstr "Rollenname"
 
-#: describe.c:1864
+#: describe.c:2004
 msgid "Attributes"
 msgstr "Attribute"
 
-#: describe.c:1865
+#: describe.c:2005
 msgid "Member of"
 msgstr "Mitglied von"
 
-#: describe.c:1876
+#: describe.c:2016
 msgid "Superuser"
 msgstr "Superuser"
 
-#: describe.c:1879
+#: describe.c:2019
 msgid "No inheritance"
 msgstr "keine Vererbung"
 
-#: describe.c:1882
+#: describe.c:2022
 msgid "Create role"
 msgstr "Rolle erzeugen"
 
-#: describe.c:1885
+#: describe.c:2025
 msgid "Create DB"
 msgstr "DB erzeugen"
 
-#: describe.c:1888
+#: describe.c:2028
 msgid "Cannot login"
 msgstr "kann nicht einloggen"
 
-#: describe.c:1897
+#: describe.c:2037
 msgid "No connections"
 msgstr "keine Verbindungen"
 
-#: describe.c:1899
+#: describe.c:2039
 #, c-format
-msgid "1 connection"
+msgid "%d connection"
 msgid_plural "%d connections"
-msgstr[0] "1 Verbindung"
+msgstr[0] "%d Verbindung"
 msgstr[1] "%d Verbindungen"
 
-#: describe.c:1980
+#: describe.c:2123
 msgid "special"
 msgstr "speziell"
 
-#: describe.c:1987
+#: describe.c:2130
 msgid "Table"
 msgstr "Tabelle"
 
-#: describe.c:2046
+#: describe.c:2189
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Keine passenden Relationen gefunden\n"
 
-#: describe.c:2048
+#: describe.c:2191
 #, c-format
 msgid "No relations found.\n"
 msgstr "Keine Relationen gefunden\n"
 
-#: describe.c:2053
+#: describe.c:2196
 msgid "List of relations"
 msgstr "Liste der Relationen"
 
-#: describe.c:2097
+#: describe.c:2240
 msgid "Modifier"
 msgstr "Attribut"
 
-#: describe.c:2098
+#: describe.c:2241
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:2116
+#: describe.c:2259
 msgid "List of domains"
 msgstr "Liste der Dom�nen"
 
-#: describe.c:2151
+#: describe.c:2294
 msgid "Source"
 msgstr "Quelle"
 
-#: describe.c:2152
+#: describe.c:2295
 msgid "Destination"
 msgstr "Ziel"
 
-#: describe.c:2154
+#: describe.c:2297
 msgid "Default?"
 msgstr "Standard?"
 
-#: describe.c:2172
+#: describe.c:2315
 msgid "List of conversions"
 msgstr "Liste der Konversionen"
 
-#: describe.c:2223
+#: describe.c:2366
 msgid "Source type"
 msgstr "Quelltyp"
 
-#: describe.c:2224
+#: describe.c:2367
 msgid "Target type"
 msgstr "Zieltyp"
 
-#: describe.c:2225 describe.c:2485
+#: describe.c:2368 describe.c:2628
 msgid "Function"
 msgstr "Funktion"
 
-#: describe.c:2226
+#: describe.c:2369
 msgid "in assignment"
 msgstr "in Zuweisung"
 
-#: describe.c:2227
+#: describe.c:2370
 msgid "Implicit?"
 msgstr "Implizit?"
 
-#: describe.c:2253
+#: describe.c:2396
 msgid "List of casts"
 msgstr "Liste der Typumwandlungen"
 
-#: describe.c:2308
+#: describe.c:2451
 msgid "List of schemas"
 msgstr "Liste der Schemas"
 
-#: describe.c:2331 describe.c:2564 describe.c:2632 describe.c:2700
+#: describe.c:2474 describe.c:2707 describe.c:2775 describe.c:2843
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "Der Server (Version %d.%d) unterst�tzt keine Volltextsuche.\n"
 
-#: describe.c:2365
+#: describe.c:2508
 msgid "List of text search parsers"
 msgstr "Liste der Textsucheparser"
 
-#: describe.c:2408
+#: describe.c:2551
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "Kein Textsucheparser namens �%s� gefunden\n"
 
-#: describe.c:2483
+#: describe.c:2626
 msgid "Start parse"
 msgstr "Parsen starten"
 
-#: describe.c:2484
+#: describe.c:2627
 msgid "Method"
 msgstr "Methode"
 
-#: describe.c:2488
+#: describe.c:2631
 msgid "Get next token"
 msgstr "N�chstes Token lesen"
 
-#: describe.c:2490
+#: describe.c:2633
 msgid "End parse"
 msgstr "Parsen beenden"
 
-#: describe.c:2492
+#: describe.c:2635
 msgid "Get headline"
 msgstr "�berschrift ermitteln"
 
-#: describe.c:2494
+#: describe.c:2637
 msgid "Get token types"
 msgstr "Tokentypen ermitteln"
 
-#: describe.c:2504
+#: describe.c:2647
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Textsucheparser �%s.%s�"
 
-#: describe.c:2506
+#: describe.c:2649
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Textsucheparser �%s�"
 
-#: describe.c:2524
+#: describe.c:2667
 msgid "Token name"
 msgstr "Tokenname"
 
-#: describe.c:2535
+#: describe.c:2678
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tokentypen f�r Parser �%s.%s�"
 
-#: describe.c:2537
+#: describe.c:2680
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tokentypen f�r Parser �%s�"
 
-#: describe.c:2586
+#: describe.c:2729
 msgid "Template"
 msgstr "Vorlage"
 
-#: describe.c:2587
+#: describe.c:2730
 msgid "Init options"
 msgstr "Initialisierungsoptionen:"
 
-#: describe.c:2609
+#: describe.c:2752
 msgid "List of text search dictionaries"
 msgstr "Liste der Textsuchew�rterb�cher"
 
-#: describe.c:2649
+#: describe.c:2792
 msgid "Init"
 msgstr "Init"
 
-#: describe.c:2650
+#: describe.c:2793
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:2677
+#: describe.c:2820
 msgid "List of text search templates"
 msgstr "Liste der Textsuchevorlagen"
 
-#: describe.c:2734
+#: describe.c:2877
 msgid "List of text search configurations"
 msgstr "Liste der Textsuchekonfigurationen"
 
-#: describe.c:2778
+#: describe.c:2921
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Keine Textsuchekonfiguration namens �%s� gefunden\n"
 
-#: describe.c:2844
+#: describe.c:2987
 msgid "Token"
 msgstr "Token"
 
-#: describe.c:2845
+#: describe.c:2988
 msgid "Dictionaries"
 msgstr "W�rterb�cher"
 
-#: describe.c:2856
+#: describe.c:2999
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Textsuchekonfiguration �%s.%s�"
 
-#: describe.c:2859
+#: describe.c:3002
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Textsuchekonfiguration �%s�"
 
-#: describe.c:2863
+#: describe.c:3006
 #, c-format
 msgid ""
 "\n"
@@ -1988,7 +2029,7 @@ msgstr ""
 "\n"
 "Parser: �%s.%s�"
 
-#: describe.c:2866
+#: describe.c:3009
 #, c-format
 msgid ""
 "\n"
@@ -1997,50 +2038,50 @@ msgstr ""
 "\n"
 "Parser: �%s�"
 
-#: describe.c:2898
+#: describe.c:3041
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "Der Server (Version %d.%d) unterst�tzt keine Fremddaten-Wrapper.\n"
 
-#: describe.c:2910
+#: describe.c:3053
 msgid "Validator"
 msgstr "Validator"
 
-#: describe.c:2934
+#: describe.c:3077
 msgid "List of foreign-data wrappers"
 msgstr "Liste der Fremddaten-Wrapper"
 
-#: describe.c:2957
+#: describe.c:3100
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "Der Server (Version %d.%d) unterst�tzt keine Fremdserver.\n"
 
-#: describe.c:2969
+#: describe.c:3112
 msgid "Foreign-data wrapper"
 msgstr "Fremddaten-Wrapper"
 
-#: describe.c:2981
+#: describe.c:3124
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:3000
+#: describe.c:3143
 msgid "List of foreign servers"
 msgstr "Liste der Fremdserver"
 
-#: describe.c:3023
+#: describe.c:3166
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "Der Server (Version %d.%d) unterst�tzt keine Benutzerabbildungen.\n"
 
-#: describe.c:3032
+#: describe.c:3175
 msgid "Server"
 msgstr "Server"
 
-#: describe.c:3033
+#: describe.c:3176
 msgid "User name"
 msgstr "Benutzername"
 
-#: describe.c:3053
+#: describe.c:3196
 msgid "List of user mappings"
 msgstr "Liste der Benutzerabbildungen"
 
@@ -2114,7 +2155,8 @@ msgstr ""
 "\n"
 "ALTER DATABASE name SET TABLESPACE neuer_tablespace\n"
 "\n"
-"ALTER DATABASE name SET konfigurationsparameter { TO | = } { wert | DEFAULT }\n"
+"ALTER DATABASE name SET konfigurationsparameter { TO | = } { wert | "
+"DEFAULT }\n"
 "ALTER DATABASE name SET konfigurationsparameter FROM CURRENT\n"
 "ALTER DATABASE name RESET konfigurationsparameter\n"
 "ALTER DATABASE name RESET ALL"
@@ -2303,7 +2345,8 @@ msgid ""
 msgstr ""
 "ALTER OPERATOR FAMILY name USING indexmethode ADD\n"
 "  {  OPERATOR strategienummer operatorname ( optyp, optyp )\n"
-"   | FUNCTION supportnummer [ ( optyp [ , optyp ] ) ] funkname ( argumenttyp [, ...] )\n"
+"   | FUNCTION supportnummer [ ( optyp [ , optyp ] ) ] funkname ( argumenttyp "
+"[, ...] )\n"
 "  } [, ... ]\n"
 "ALTER OPERATOR FAMILY name USING indexmethode DROP\n"
 "  {  OPERATOR strategienummer ( optyp [ , optyp ] )\n"
@@ -2417,7 +2460,6 @@ msgid "change the definition of a table"
 msgstr "�ndert die Definition einer Tabelle"
 
 #: sql_help.h:94
-#, fuzzy
 msgid ""
 "ALTER TABLE [ ONLY ] name [ * ]\n"
 "    action [, ... ]\n"
@@ -2473,13 +2515,12 @@ msgstr ""
 "\n"
 "    ADD [ COLUMN ] spalte typ [ spalten_constraint [ ... ] ]\n"
 "    DROP [ COLUMN ] spalte [ RESTRICT | CASCADE ]\n"
-"    ALTER [ COLUMN ] spalte TYPE typ [ USING ausdruck ]\n"
+"    ALTER [ COLUMN ] spalte [ SET DATA ] TYPE typ [ USING ausdruck ]\n"
 "    ALTER [ COLUMN ] spalte SET DEFAULT ausdruck\n"
 "    ALTER [ COLUMN ] spalte DROP DEFAULT\n"
 "    ALTER [ COLUMN ] spalte { SET | DROP } NOT NULL\n"
 "    ALTER [ COLUMN ] spalte SET STATISTICS integer\n"
-"    ALTER [ COLUMN ] spalte SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "
-"MAIN }\n"
+"    ALTER [ COLUMN ] spalte SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }\n"
 "    ADD tabellen_constraint\n"
 "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
 "    DISABLE TRIGGER [ trigger_name | ALL | USER ]\n"
@@ -2827,7 +2868,6 @@ msgid "copy data between a file and a table"
 msgstr "kopiert Daten zwischen einer Datei und einer Tabelle"
 
 #: sql_help.h:170
-#, fuzzy
 msgid ""
 "COPY tablename [ ( column [, ...] ) ]\n"
 "    FROM { 'filename' | STDIN }\n"
@@ -2869,7 +2909,6 @@ msgstr ""
 "    TO { 'dateiname' | STDOUT }\n"
 "    [ [ WITH ] \n"
 "          [ BINARY ]\n"
-"          [ HEADER ]\n"
 "          [ OIDS ]\n"
 "          [ DELIMITER [ AS ] 'trennzeichen' ]\n"
 "          [ NULL [ AS ] 'null-zeichenkette' ]\n"
@@ -3055,7 +3094,6 @@ msgid "define a new function"
 msgstr "definiert eine neue Funktion"
 
 #: sql_help.h:202
-#, fuzzy
 msgid ""
 "CREATE [ OR REPLACE ] FUNCTION\n"
 "    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] "
@@ -3076,9 +3114,12 @@ msgid ""
 "    [ WITH ( attribute [, ...] ) ]"
 msgstr ""
 "CREATE [ OR REPLACE ] FUNCTION\n"
-"    name ( [ [ argmode ] [ argname ] argtyp [, ...] ] )\n"
-"    [ RETURNS r�ckgabetyp ]\n"
+"    name ( [ [ argmode ] [ argname ] argtyp [ { DEFAULT | = } def_ausdruck] "
+"[, ...] ] )\n"
+"    [ RETURNS r�ckgabetyp\n"
+"      | RETURNS TABLE ( spaltenname spaltentyp [, ...] ) ]\n"
 "  { LANGUAGE sprachname\n"
+"    | WINDOW\n"
 "    | IMMUTABLE | STABLE | VOLATILE\n"
 "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
 "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
@@ -3207,7 +3248,8 @@ msgstr ""
 "CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE datentyp\n"
 "  USING indexmethode [ FAMILY familienname ] AS\n"
 "  {  OPERATOR strategienummer operatorname [ ( optyp, optyp ) ]\n"
-"   | FUNCTION unterst_nummer [ ( optyp [, optyp ] ) ] funcname ( argumenttyp [, ...] )\n"
+"   | FUNCTION unterst_nummer [ ( optyp [, optyp ] ) ] funcname ( argumenttyp "
+"[, ...] )\n"
 "   | STORAGE storage_typ\n"
 "  } [, ... ]"
 
@@ -3433,7 +3475,8 @@ msgid ""
 msgstr ""
 "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tabellenname\n"
 "    [ (spaltenname [, ...] ) ]\n"
-"    [ WITH ( storage_parameter [= wert] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
+"    [ WITH ( storage_parameter [= wert] [, ... ] ) | WITH OIDS | WITHOUT "
+"OIDS ]\n"
 "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 "    [ TABLESPACE tablespace ]\n"
 "    AS anfrage\n"
@@ -4038,7 +4081,6 @@ msgid "define access privileges"
 msgstr "definiert Zugriffsprivilegien"
 
 #: sql_help.h:450
-#, fuzzy
 msgid ""
 "GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
 "TRIGGER }\n"
@@ -4088,24 +4130,35 @@ msgid ""
 "\n"
 "GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
 msgstr ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
+"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] tabellenname [, ...]\n"
 "    TO { [ GROUP ] rollenname | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
+"GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( spalte [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( spalte [, ...] ) }\n"
+"    ON [ TABLE ] tabellenname [, ...]\n"
+"    TO { [ GROUP ] rollenname | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
 "GRANT { { USAGE | SELECT | UPDATE }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON SEQUENCE sequenzname [, ...]\n"
 "    TO { [ GROUP ] rollenname | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
-"GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
-"[ PRIVILEGES ] }\n"
+"GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON DATABASE datenbankname [, ...]\n"
 "    TO { [ GROUP ] rollenname | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    TO { [ GROUP ] rollenname | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER servername [, ...]\n"
+"    TO { [ GROUP ] rollenname | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
 "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funktionsname ( [ [ argmodus ] [ argname ] argtyp "
-"[, ...] ] ) [, ...]\n"
+"    ON FUNCTION funktionsname ( [ [ argmodus ] [ argname ] argtyp [, ...] ] ) [, ...]\n"
 "    TO { [ GROUP ] rollenname | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
 "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
@@ -4247,7 +4300,6 @@ msgid "remove access privileges"
 msgstr "entfernt Zugriffsprivilegien"
 
 #: sql_help.h:502
-#, fuzzy
 msgid ""
 "REVOKE [ GRANT OPTION FOR ]\n"
 "    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
@@ -4319,13 +4371,20 @@ msgid ""
 "    [ CASCADE | RESTRICT ]"
 msgstr ""
 "REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
+"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] tabellenname [, ...]\n"
 "    FROM { [ GROUP ] rollenname | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
+"    { { SELECT | INSERT | UPDATE | REFERENCES } ( spalte [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( spalte [, ...] ) }\n"
+"    ON [ TABLE ] tabellenname [, ...]\n"
+"    FROM { [ GROUP ] rollenname | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
 "    { { USAGE | SELECT | UPDATE }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON SEQUENCE sequenzname [, ...]\n"
@@ -4339,9 +4398,20 @@ msgstr ""
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER servername [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
 "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funktionsname ( [ [ argmodus ] [ argname ] argtyp "
-"[, ...] ] ) [, ...]\n"
+"    ON FUNCTION funktionsname ( [ [ argmodus ] [ argname ] argtyp [, ...] ] ) [, ...]\n"
 "    FROM { [ GROUP ] rollenname | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
@@ -4402,7 +4472,6 @@ msgid "retrieve rows from a table or view"
 msgstr "liest Zeilen aus einer Tabelle oder Sicht"
 
 #: sql_help.h:522 sql_help.h:558 sql_help.h:582
-#, fuzzy
 msgid ""
 "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
@@ -4437,32 +4506,37 @@ msgid ""
 "\n"
 "TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
 msgstr ""
+"[ WITH [ RECURSIVE ] with_anfrage [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( ausdruck [, ...] ) ] ]\n"
 "    * | ausdruck [ AS ausgabename ] [, ...]\n"
 "    [ FROM from_element [, ...] ]\n"
 "    [ WHERE bedingung ]\n"
 "    [ GROUP BY ausdruck [, ...] ]\n"
 "    [ HAVING bedingung [, ...] ]\n"
+"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY ausdruck [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
-"LAST } ] [, ...] ]\n"
+"    [ ORDER BY ausdruck [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
 "    [ LIMIT { anzahl | ALL } ]\n"
-"    [ OFFSET start ]\n"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF tabellenname [, ...] ] [ NOWAIT ] [...] ]\n"
 "\n"
 "wobei from_element Folgendes sein kann:\n"
 "\n"
-"    [ ONLY ] tabellenname [ * ] [ [ AS ] alias [ ( spaltenalias "
-"[, ...] ) ] ]\n"
+"    [ ONLY ] tabellenname [ * ] [ [ AS ] alias [ ( spaltenalias [, ...] ) ] ]\n"
 "    ( select ) [ AS ] alias [ ( spaltenalias [, ...] ) ]\n"
-"    funktionsname ( [ argument [, ...] ] ) [ AS ] alias [ ( spaltenalias "
-"[, ...] | spaltendefinition [, ...] ) ]\n"
+"    with_anfragenname [ [ AS ] alias [ ( spaltenalias [, ...] ) ] ]\n"
+"    funktionsname ( [ argument [, ...] ] ) [ AS ] alias [ ( spaltenalias [, ...] | spaltendefinition [, ...] ) ]\n"
 "    funktionsname ( [ argument [, ...] ] ) AS ( spaltendefinition [, ...] )\n"
-"    from_element [ NATURAL ] verbundtyp from_element [ ON verbundbedingung | "
-"USING ( verbundspalte [, ...] ) ]"
+"    from_element [ NATURAL ] verbundtyp from_element [ ON verbundbedingung | USING ( verbundspalte [, ...] ) ]\n"
+"\n"
+"und with_anfrage ist:\n"
+"\n"
+"    with_anfragenname [ ( spaltenname [, ...] ) ] AS ( select )\n"
+"\n"
+"TABLE { [ ONLY ] tabellenname [ * ] | with_anfragenname }"
 
 #: sql_help.h:526
-#, fuzzy
 msgid ""
 "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
@@ -4481,6 +4555,7 @@ msgid ""
 "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
 msgstr ""
+"[ WITH [ RECURSIVE ] with_anfrage [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( ausdruck [, ...] ) ] ]\n"
 "    * | ausdruck [ AS ausgabename ] [, ...]\n"
 "    INTO [ TEMPORARY | TEMP ] [ TABLE ] neue_tabelle\n"
@@ -4488,11 +4563,12 @@ msgstr ""
 "    [ WHERE bedingung ]\n"
 "    [ GROUP BY ausdruck [, ...] ]\n"
 "    [ HAVING bedingung [, ...] ]\n"
+"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY ausdruck [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
-"LAST } ] [, ...] ]\n"
+"    [ ORDER BY ausdruck [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
 "    [ LIMIT { anzahl | ALL } ]\n"
-"    [ OFFSET start ]\n"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF tabellenname [, ...] ] [ NOWAIT ] [...] ]"
 
 #: sql_help.h:529
diff --git a/src/bin/psql/po/es.po b/src/bin/psql/po/es.po
index 8289013abb..a468e50f84 100644
--- a/src/bin/psql/po/es.po
+++ b/src/bin/psql/po/es.po
@@ -3,14 +3,14 @@
 # (c) Diego A. Gil <diego@adminsa.com>, 2005
 #
 # pgtranslation Id: psql.po,v 1.12 2009/04/16 16:53:56 alvherre Exp $
-# $PostgreSQL: pgsql/src/bin/psql/po/es.po,v 1.18 2009/05/14 21:41:52 alvherre Exp $
+# $PostgreSQL: pgsql/src/bin/psql/po/es.po,v 1.19 2009/06/10 23:42:43 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: psql (PostgreSQL 8.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-14 15:12+0000\n"
-"PO-Revision-Date: 2009-04-16 12:52-0400\n"
+"POT-Creation-Date: 2009-06-10 17:09+0000\n"
+"PO-Revision-Date: 2009-05-18 00:33-0500\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Espa�ol <pgsql-es-ayuda@postgresql.org>\n"
 "MIME-Version: 1.0\n"
@@ -49,185 +49,185 @@ msgstr "\\%s: no se pudo cambiar directorio a �%s�: %s\n"
 msgid "Time: %.3f ms\n"
 msgstr "Duraci�n: %.3f ms\n"
 
-#: command.c:454 command.c:482 command.c:1021
+#: command.c:468 command.c:496 command.c:1035
 msgid "no query buffer\n"
 msgstr "no hay b�fer de consulta\n"
 
-#: command.c:524
+#: command.c:538
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: command.c:578
+#: command.c:592
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: nombre de codificaci�n no v�lido o procedimiento de conversi�n\n"
 "no encontrado\n"
 
-#: command.c:646 command.c:680 command.c:694 command.c:711 command.c:815
-#: command.c:865 command.c:1001 command.c:1032
+#: command.c:660 command.c:694 command.c:708 command.c:725 command.c:829
+#: command.c:879 command.c:1015 command.c:1046
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: falta argumento requerido\n"
 
-#: command.c:743
+#: command.c:757
 msgid "Query buffer is empty."
 msgstr "El b�fer de consulta est� vac�o."
 
-#: command.c:753
+#: command.c:767
 msgid "Enter new password: "
 msgstr "Ingrese la nueva contrase�a: "
 
-#: command.c:754
+#: command.c:768
 msgid "Enter it again: "
 msgstr "Ingr�sela nuevamente: "
 
-#: command.c:758
+#: command.c:772
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Las constrase�as no coinciden.\n"
 
-#: command.c:776
+#: command.c:790
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "El cifrado de la contrase�a fall�.\n"
 
-#: command.c:844 command.c:945 command.c:1006
+#: command.c:858 command.c:959 command.c:1020
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: error\n"
 
-#: command.c:885
+#: command.c:899
 msgid "Query buffer reset (cleared)."
 msgstr "El b�fer de consulta ha sido reiniciado (limpiado)."
 
-#: command.c:898
+#: command.c:912
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "Se escribi� la historia en el archivo \"%s/%s\".\n"
 
-#: command.c:936 common.c:52 common.c:66 input.c:198 mainloop.c:69
+#: command.c:950 common.c:52 common.c:66 input.c:198 mainloop.c:69
 #: mainloop.c:227 print.c:61 print.c:75
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
 
-#: command.c:986
+#: command.c:1000
 msgid "Timing is on."
 msgstr "El despliegue de duraci�n est� activado."
 
-#: command.c:988
+#: command.c:1002
 msgid "Timing is off."
 msgstr "El despliegue de duraci�n est� desactivado."
 
-#: command.c:1049 command.c:1069 command.c:1567 command.c:1574 command.c:1583
-#: command.c:1593 command.c:1602 command.c:1616 command.c:1633 command.c:1666
-#: common.c:137 copy.c:521 copy.c:585
+#: command.c:1063 command.c:1083 command.c:1581 command.c:1588 command.c:1597
+#: command.c:1607 command.c:1616 command.c:1630 command.c:1647 command.c:1680
+#: common.c:137 copy.c:517 copy.c:581
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1151 startup.c:159
+#: command.c:1165 startup.c:159
 msgid "Password: "
 msgstr "Contrase�a: "
 
-#: command.c:1158 startup.c:162 startup.c:164
+#: command.c:1172 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "Contrase�a para usuario %s: "
 
-#: command.c:1254 command.c:2096 common.c:183 common.c:460 common.c:525
-#: common.c:811 common.c:836 common.c:920 copy.c:656 copy.c:701 copy.c:830
+#: command.c:1268 command.c:2110 common.c:183 common.c:460 common.c:525
+#: common.c:811 common.c:836 common.c:920 copy.c:652 copy.c:697 copy.c:826
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1258
+#: command.c:1272
 msgid "Previous connection kept\n"
 msgstr "Se ha mantenido la conexi�n anterior\n"
 
-#: command.c:1262
+#: command.c:1276
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1286
+#: command.c:1300
 #, c-format
 msgid "You are now connected to database \"%s\""
 msgstr "Ahora est� conectado a la base de datos �%s�"
 
-#: command.c:1289
+#: command.c:1303
 #, c-format
 msgid " on host \"%s\""
 msgstr " en el servidor �%s�"
 
-#: command.c:1292
+#: command.c:1306
 #, c-format
 msgid " at port \"%s\""
 msgstr " en el puerto �%s�"
 
-#: command.c:1295
+#: command.c:1309
 #, c-format
 msgid " as user \"%s\""
 msgstr " como el usuario �%s�"
 
-#: command.c:1330
+#: command.c:1344
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, servidor %s)\n"
 
-#: command.c:1337
+#: command.c:1351
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
 "         Some psql features might not work.\n"
 msgstr ""
-"ATENCI�N: %s versi�n %d.%d, servidor versi�n %d.%d.\n"
+"ADVERTENCIA: %s versi�n %d.%d, servidor versi�n %d.%d.\n"
 "          Algunas caracter�sticas de psql pueden no funcionar.\n"
 
-#: command.c:1367
+#: command.c:1381
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "conexi�n SSL (cifrado: %s, bits: %i)\n"
 
-#: command.c:1376
+#: command.c:1390
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "conexi�n SSL (cifrado desconocido)\n"
 
-#: command.c:1397
+#: command.c:1411
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
 "         8-bit characters might not work correctly. See psql reference\n"
 "         page \"Notes for Windows users\" for details.\n"
 msgstr ""
-"Precauci�n: El c�digo de p�gina de la consola (%u) difiere del c�digo\n"
+"ADVERTENCIA: El c�digo de p�gina de la consola (%u) difiere del c�digo\n"
 "            de p�gina de Windows (%u).\n"
 "            Los caracteres de 8 bits pueden funcionar incorrectamente.\n"
 "            Vea la p�gina de referencia de psql �Notes for Windows users�\n"
 "            para obtener m�s detalles.\n"
 
-#: command.c:1486
+#: command.c:1500
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "no se pudo iniciar el editor �%s�\n"
 
-#: command.c:1488
+#: command.c:1502
 msgid "could not start /bin/sh\n"
 msgstr "no se pudo iniciar /bin/sh\n"
 
-#: command.c:1525
+#: command.c:1539
 #, c-format
 msgid "cannot locate temporary directory: %s"
 msgstr "no se encontr� el directorio temporal: %s"
 
-#: command.c:1552
+#: command.c:1566
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "no se pudo abrir archivo temporal �%s�: %s\n"
 
-#: command.c:1750
+#: command.c:1764
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
@@ -235,113 +235,113 @@ msgstr ""
 "\\pset: formatos permitidos son unaligned, aligned, wrapped, html, latex, "
 "troff-ms\n"
 
-#: command.c:1755
+#: command.c:1769
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "El formato de salida es %s.\n"
 
-#: command.c:1765
+#: command.c:1779
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "El estilo de borde es %d.\n"
 
-#: command.c:1777
+#: command.c:1791
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Se ha activado el despliegue expandido.\n"
 
-#: command.c:1778
+#: command.c:1792
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Se ha desactivado el despliegue expandido.\n"
 
-#: command.c:1791
+#: command.c:1805
 msgid "Showing locale-adjusted numeric output."
 msgstr "Mostrando salida num�rica ajustada localmente"
 
-#: command.c:1793
+#: command.c:1807
 msgid "Locale-adjusted numeric output is off."
 msgstr "La salida num�rica ajustada localmente est� deshabilitada. "
 
-#: command.c:1806
+#: command.c:1820
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Despliegue de nulos es �%s�.\n"
 
-#: command.c:1818
+#: command.c:1832
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "El separador de campos es �%s�.\n"
 
-#: command.c:1832
+#: command.c:1846
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "El separador de filas es <salto de l�nea>."
 
-#: command.c:1834
+#: command.c:1848
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "El separador de filas es �%s�.\n"
 
-#: command.c:1848
+#: command.c:1862
 msgid "Showing only tuples."
 msgstr "Mostrando s�lo filas."
 
-#: command.c:1850
+#: command.c:1864
 msgid "Tuples only is off."
 msgstr "Mostrar s�lo filas est� desactivado."
 
-#: command.c:1866
+#: command.c:1880
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "El t�tulo es �%s�.\n"
 
-#: command.c:1868
+#: command.c:1882
 #, c-format
 msgid "Title is unset.\n"
 msgstr "El t�tulo ha sido indefinido.\n"
 
-#: command.c:1884
+#: command.c:1898
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Los atributos de tabla son �%s�.\n"
 
-#: command.c:1886
+#: command.c:1900
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Los atributos de tabla han sido indefinidos.\n"
 
-#: command.c:1907
+#: command.c:1921
 msgid "Pager is used for long output."
 msgstr "El paginador se usar� para salida larga."
 
-#: command.c:1909
+#: command.c:1923
 msgid "Pager is always used."
 msgstr "El paginador se usar� siempre."
 
-#: command.c:1911
+#: command.c:1925
 msgid "Pager usage is off."
 msgstr "El paginador no se usar�."
 
-#: command.c:1925
+#: command.c:1939
 msgid "Default footer is on."
 msgstr "El pie por omisi�n est� activo."
 
-#: command.c:1927
+#: command.c:1941
 msgid "Default footer is off."
 msgstr "El pie de p�gina por omisi�n est� desactivado."
 
-#: command.c:1938
+#: command.c:1952
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr "El ancho para el formato �wrapped� es %d.\n"
 
-#: command.c:1943
+#: command.c:1957
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: opci�n desconocida: %s\n"
 
-#: command.c:1997
+#: command.c:2011
 msgid "\\!: failed\n"
 msgstr "\\!: fall�\n"
 
@@ -417,49 +417,49 @@ msgid ""
 msgstr ""
 "El servidor (versi�n %d.%d) no soporta savepoints para ON_ERROR_ROLLBACK.\n"
 
-#: copy.c:124
+#: copy.c:120
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: argumentos requeridos\n"
 
-#: copy.c:403
+#: copy.c:399
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: error de procesamiento en �%s�\n"
 
-#: copy.c:405
+#: copy.c:401
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: error de procesamiento al final de la l�nea\n"
 
-#: copy.c:532
+#: copy.c:528
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: no se puede copiar desde/hacia un directorio\n"
 
-#: copy.c:558
+#: copy.c:554
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:562 copy.c:576
+#: copy.c:558 copy.c:572
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: respuesta inesperada (%d)\n"
 
-#: copy.c:631 copy.c:641
+#: copy.c:627 copy.c:637
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "no se pudo escribir datos COPY: %s\n"
 
-#: copy.c:648
+#: copy.c:644
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "fall� la transferencia de datos COPY: %s"
 
-#: copy.c:696
+#: copy.c:692
 msgid "canceled by user"
 msgstr "cancelada por el usuario"
 
-#: copy.c:711
+#: copy.c:707
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -467,7 +467,7 @@ msgstr ""
 "Ingrese los datos a ser copiados seguidos de un fin de l�nea.\n"
 "Termine con un backslash y un punto."
 
-#: copy.c:823
+#: copy.c:819
 msgid "aborted because of read failure"
 msgstr "se abort� por un error de lectura"
 
@@ -901,8 +901,8 @@ msgstr "  \\d[S+]  NOMBRE    describir tabla, �ndice, secuencia o vista\n"
 
 #: help.c:199
 #, c-format
-msgid "  \\da[S]  [PATTERN]      list aggregate functions\n"
-msgstr "  \\da[S]  [PATR�N]  listar funciones de agregaci�n\n"
+msgid "  \\da[+]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[+]  [PATR�N]  listar funciones de agregaci�n\n"
 
 #: help.c:200
 #, c-format
@@ -942,12 +942,15 @@ msgstr "  \\deu[+] [PATR�N]  listar mapeos de usuario\n"
 #: help.c:207
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [PATR�N]  listar conectores de datos externos\n"
+msgstr ""
+"  \\dew[+] [PATR�N]  listar conectores de datos externos\n"
 
 #: help.c:208
 #, c-format
-msgid "  \\df[S+] [PATTERN]      list functions\n"
-msgstr "  \\df[S+] [PATR�N]  listar funciones\n"
+msgid ""
+"  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
+msgstr ""
+"  \\df[antw][S+] [PATR�N]  listar funciones de agregaci�n\n"
 
 #: help.c:209
 #, c-format
@@ -1258,11 +1261,11 @@ msgstr "%s: estado de transacci�n desconocido\n"
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:267 describe.c:350
-#: describe.c:425 describe.c:496 describe.c:619 describe.c:1097
-#: describe.c:1868 describe.c:1996 describe.c:2288 describe.c:2350
-#: describe.c:2486 describe.c:2525 describe.c:2592 describe.c:2651
-#: describe.c:2660 describe.c:2719
+#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:337 describe.c:490
+#: describe.c:565 describe.c:636 describe.c:759 describe.c:1237
+#: describe.c:2008 describe.c:2139 describe.c:2431 describe.c:2493
+#: describe.c:2629 describe.c:2668 describe.c:2735 describe.c:2794
+#: describe.c:2803 describe.c:2862
 msgid "Description"
 msgstr "Descripci�n"
 
@@ -1323,11 +1326,11 @@ msgstr ""
 msgid "invalid output format (internal error): %d"
 msgstr "formato de salida no v�lido (error interno): %d"
 
-#: print.c:2351
+#: print.c:2352
 #, c-format
-msgid "(1 row)"
+msgid "(%lu row)"
 msgid_plural "(%lu rows)"
-msgstr[0] "(1 fila)"
+msgstr[0] "(%lu fila)"
 msgstr[1] "(%lu filas)"
 
 #: startup.c:217
@@ -1373,26 +1376,26 @@ msgstr "%s: atenci�n: se ignor� argumento extra �%s� en l�nea de �rdenes\n"
 msgid "contains support for command-line editing"
 msgstr "incluye soporte para edici�n de l�nea de �rdenes"
 
-#: describe.c:68 describe.c:200 describe.c:322 describe.c:420 describe.c:541
-#: describe.c:616 describe.c:1974 describe.c:2094 describe.c:2149
-#: describe.c:2348 describe.c:2575 describe.c:2647 describe.c:2658
-#: describe.c:2717
+#: describe.c:68 describe.c:235 describe.c:462 describe.c:560 describe.c:681
+#: describe.c:756 describe.c:2117 describe.c:2237 describe.c:2292
+#: describe.c:2491 describe.c:2718 describe.c:2790 describe.c:2801
+#: describe.c:2860
 msgid "Schema"
-msgstr "Schema"
+msgstr "Esquema"
 
-#: describe.c:69 describe.c:145 describe.c:201 describe.c:323 describe.c:421
-#: describe.c:471 describe.c:542 describe.c:617 describe.c:1975
-#: describe.c:2095 describe.c:2150 describe.c:2279 describe.c:2349
-#: describe.c:2576 describe.c:2648 describe.c:2659 describe.c:2718
-#: describe.c:2908 describe.c:2967
+#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:561
+#: describe.c:611 describe.c:682 describe.c:757 describe.c:2118
+#: describe.c:2238 describe.c:2293 describe.c:2422 describe.c:2492
+#: describe.c:2719 describe.c:2791 describe.c:2802 describe.c:2861
+#: describe.c:3051 describe.c:3110
 msgid "Name"
 msgstr "Nombre"
 
-#: describe.c:70 describe.c:207 describe.c:242 describe.c:249
+#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
 msgid "Result data type"
 msgstr "Tipo de dato de salida"
 
-#: describe.c:84 describe.c:88 describe.c:208 describe.c:243 describe.c:250
+#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
 msgid "Argument data types"
 msgstr "Tipos de datos de argumentos"
 
@@ -1405,8 +1408,8 @@ msgstr "Listado de funciones de agregaci�n"
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr "El servidor (versi�n %d.%d) no soporta tablespaces.\n"
 
-#: describe.c:146 describe.c:264 describe.c:472 describe.c:1982
-#: describe.c:2280 describe.c:2909 describe.c:2968
+#: describe.c:146 describe.c:334 describe.c:612 describe.c:2125
+#: describe.c:2423 describe.c:3052 describe.c:3111
 msgid "Owner"
 msgstr "Due�o"
 
@@ -1418,562 +1421,597 @@ msgstr "Ubicaci�n"
 msgid "List of tablespaces"
 msgstr "Listado de tablespaces"
 
-#: describe.c:263
+#: describe.c:212
+#, c-format
+msgid "\\df only takes [antwS+] as options\n"
+msgstr "\\df s�lo acepta las opciones [antwS+]\n"
+
+#: describe.c:218
+#, c-format
+msgid "\\df does not take a \"w\" option in %d.%d.\n"
+msgstr "\\df no acepta la opci�n �w� option in %d.%d.\n"
+
+#. translator: "agg" is short for "aggregate"
+#: describe.c:251 describe.c:297 describe.c:314
+msgid "agg"
+msgstr "agg"
+
+#: describe.c:252
+msgid "window"
+msgstr "ventana"
+
+#: describe.c:253 describe.c:298 describe.c:315 describe.c:896
+msgid "trigger"
+msgstr "disparador"
+
+#: describe.c:254 describe.c:299 describe.c:316
+msgid "normal"
+msgstr "normal"
+
+#: describe.c:255 describe.c:300 describe.c:317 describe.c:684 describe.c:1222
+#: describe.c:2124 describe.c:2239 describe.c:3123
+msgid "Type"
+msgstr "Tipo"
+
+#: describe.c:330
+msgid "immutable"
+msgstr "inmutable"
+
+#: describe.c:331
+msgid "stable"
+msgstr "estable"
+
+#: describe.c:332
+msgid "volatile"
+msgstr "vol�til"
+
+#: describe.c:333
 msgid "Volatility"
 msgstr "Volatilidad"
 
-#: describe.c:265
+#: describe.c:335
 msgid "Language"
 msgstr "Lenguaje"
 
-#: describe.c:266
+#: describe.c:336
 msgid "Source code"
 msgstr "C�digo fuente"
 
-#: describe.c:295
+#: describe.c:434
 msgid "List of functions"
 msgstr "Listado de funciones"
 
-#: describe.c:333
+#: describe.c:473
 msgid "Internal name"
 msgstr "Nombre interno"
 
-#: describe.c:334 describe.c:488 describe.c:1992
+#: describe.c:474 describe.c:628 describe.c:2135
 msgid "Size"
 msgstr "Tama�o"
 
-#: describe.c:346
+#: describe.c:486
 msgid "Elements"
 msgstr "Elementos"
 
-#: describe.c:389
+#: describe.c:529
 msgid "List of data types"
 msgstr "Listado de tipos de dato"
 
-#: describe.c:422
+#: describe.c:562
 msgid "Left arg type"
 msgstr "Tipo arg izq"
 
-#: describe.c:423
+#: describe.c:563
 msgid "Right arg type"
 msgstr "Tipo arg der"
 
-#: describe.c:424
+#: describe.c:564
 msgid "Result type"
 msgstr "Tipo resultado"
 
-#: describe.c:443
+#: describe.c:583
 msgid "List of operators"
 msgstr "Listado de operadores"
 
-#: describe.c:473
+#: describe.c:613
 msgid "Encoding"
 msgstr "Codificaci�n"
 
-#: describe.c:478
+#: describe.c:618
 msgid "Collation"
 msgstr "Collation"
 
-#: describe.c:479
+#: describe.c:619
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:492
+#: describe.c:632
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:509
+#: describe.c:649
 msgid "List of databases"
 msgstr "Listado de base de datos"
 
-#: describe.c:543 describe.c:711 describe.c:1976
+#: describe.c:683 describe.c:851 describe.c:2119
 msgid "table"
 msgstr "tabla"
 
-#: describe.c:543 describe.c:712 describe.c:1977
+#: describe.c:683 describe.c:852 describe.c:2120
 msgid "view"
 msgstr "vista"
 
-#: describe.c:543 describe.c:714 describe.c:1979
+#: describe.c:683 describe.c:854 describe.c:2122
 msgid "sequence"
 msgstr "secuencia"
 
-#: describe.c:544 describe.c:1082 describe.c:1981 describe.c:2096
-#: describe.c:2980
-msgid "Type"
-msgstr "Tipo"
-
-#: describe.c:555
+#: describe.c:695
 msgid "Column access privileges"
 msgstr "Privilegios de acceso a columnas"
 
-#: describe.c:581 describe.c:3075 describe.c:3079
+#: describe.c:721 describe.c:3218 describe.c:3222
 msgid "Access privileges"
 msgstr "Privilegios"
 
-#: describe.c:618
+#: describe.c:758
 msgid "Object"
 msgstr "Objeto"
 
-#: describe.c:630
+#: describe.c:770
 msgid "aggregate"
 msgstr "funci�n de agregaci�n"
 
-#: describe.c:650
+#: describe.c:790
 msgid "function"
 msgstr "funci�n"
 
-#: describe.c:669
+#: describe.c:809
 msgid "operator"
 msgstr "operador"
 
-#: describe.c:688
+#: describe.c:828
 msgid "data type"
 msgstr "tipo de dato"
 
-#: describe.c:713 describe.c:1978
+#: describe.c:853 describe.c:2121
 msgid "index"
 msgstr "�ndice"
 
-#: describe.c:735
+#: describe.c:875
 msgid "rule"
 msgstr "regla"
 
-#: describe.c:756
-msgid "trigger"
-msgstr "disparador"
-
-#: describe.c:779
+#: describe.c:919
 msgid "Object descriptions"
 msgstr "Descripciones de objetos"
 
-#: describe.c:832
+#: describe.c:972
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "No se encontr� relaci�n llamada �%s�.\n"
 
-#: describe.c:969
+#: describe.c:1109
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "No se encontr� relaci�n con OID %s.\n"
 
-#: describe.c:1044
+#: describe.c:1184
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabla �%s.%s�"
 
-#: describe.c:1048
+#: describe.c:1188
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vista �%s.%s�"
 
-#: describe.c:1052
+#: describe.c:1192
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Secuencia �%s.%s�"
 
-#: describe.c:1056
+#: describe.c:1196
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "�ndice �%s.%s�"
 
-#: describe.c:1061
+#: describe.c:1201
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Relaci�n especial �%s.%s�"
 
-#: describe.c:1065
+#: describe.c:1205
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Tabla TOAST �%s.%s�"
 
-#: describe.c:1069
+#: describe.c:1209
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo compuesto �%s.%s�"
 
-#: describe.c:1081
+#: describe.c:1221
 msgid "Column"
 msgstr "Columna"
 
-#: describe.c:1087
+#: describe.c:1227
 msgid "Modifiers"
 msgstr "Modificadores"
 
-#: describe.c:1092
+#: describe.c:1232
 msgid "Value"
 msgstr "Valor"
 
-#: describe.c:1096
+#: describe.c:1236
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: describe.c:1138
+#: describe.c:1278
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1147
+#: describe.c:1287
 #, c-format
 msgid "default %s"
 msgstr "valor por omisi�n %s"
 
-#: describe.c:1213
+#: describe.c:1353
 msgid "primary key, "
 msgstr "llave primaria, "
 
-#: describe.c:1215
+#: describe.c:1355
 msgid "unique, "
 msgstr "�nico, "
 
-#: describe.c:1221
+#: describe.c:1361
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "de tabla �%s.%s�"
 
-#: describe.c:1225
+#: describe.c:1365
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicado (%s)"
 
-#: describe.c:1228
+#: describe.c:1368
 msgid ", clustered"
 msgstr ", clustered"
 
-#: describe.c:1231
+#: describe.c:1371
 msgid ", invalid"
 msgstr ", no v�lido"
 
-#: describe.c:1245
+#: describe.c:1385
 msgid "View definition:"
 msgstr "Definici�n de vista:"
 
-#: describe.c:1262 describe.c:1515
+#: describe.c:1402 describe.c:1655
 msgid "Rules:"
 msgstr "Reglas:"
 
-#: describe.c:1309
+#: describe.c:1449
 msgid "Indexes:"
 msgstr "�ndices:"
 
-#: describe.c:1369
+#: describe.c:1509
 msgid "Check constraints:"
 msgstr "Restricciones CHECK:"
 
-#: describe.c:1400
+#: describe.c:1540
 msgid "Foreign-key constraints:"
 msgstr "Restricciones de llave for�nea:"
 
-#: describe.c:1431
+#: describe.c:1571
 msgid "Referenced by:"
 msgstr "Referenciada por:"
 
 #. translator: the first %s is a FK name, the following are
 #. * a table name and the FK definition
-#: describe.c:1436
+#: describe.c:1576
 #, c-format
 msgid "  \"%s\" IN %s %s"
 msgstr "    �%s� IN %s %s"
 
-#: describe.c:1518
+#: describe.c:1658
 msgid "Disabled rules:"
 msgstr "Reglas deshabilitadas:"
 
-#: describe.c:1521
+#: describe.c:1661
 msgid "Rules firing always:"
 msgstr "Reglas que se activan siempre:"
 
-#: describe.c:1524
+#: describe.c:1664
 msgid "Rules firing on replica only:"
 msgstr "Reglas que se activan s�lo en las r�plicas:"
 
-#: describe.c:1620
+#: describe.c:1760
 msgid "Triggers:"
 msgstr "Triggers:"
 
-#: describe.c:1623
+#: describe.c:1763
 msgid "Disabled triggers:"
 msgstr "Disparadores deshabilitados:"
 
-#: describe.c:1626
+#: describe.c:1766
 msgid "Triggers firing always:"
 msgstr "Disparadores que siempre se ejecutan:"
 
-#: describe.c:1629
+#: describe.c:1769
 msgid "Triggers firing on replica only:"
 msgstr "Disparadores que se ejecutan s�lo en las r�plicas:"
 
-#: describe.c:1662
+#: describe.c:1802
 msgid "Inherits"
 msgstr "Hereda"
 
-#: describe.c:1677
+#: describe.c:1817
 msgid "Has OIDs"
 msgstr "Tiene OIDs"
 
-#: describe.c:1680 describe.c:2153 describe.c:2226
+#: describe.c:1820 describe.c:2296 describe.c:2369
 msgid "yes"
 msgstr "s�"
 
-#: describe.c:1680 describe.c:2153 describe.c:2226
+#: describe.c:1820 describe.c:2296 describe.c:2369
 msgid "no"
 msgstr "no"
 
-#: describe.c:1688 describe.c:2918 describe.c:2982 describe.c:3038
+#: describe.c:1828 describe.c:3061 describe.c:3125 describe.c:3181
 msgid "Options"
 msgstr "Opciones"
 
-#: describe.c:1773
+#: describe.c:1913
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: �%s�"
 
 #. translator: before this string there's an index
 #. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:1783
+#: describe.c:1923
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace \"%s\""
 
-#: describe.c:1861
+#: describe.c:2001
 msgid "List of roles"
 msgstr "Lista de roles"
 
-#: describe.c:1863
+#: describe.c:2003
 msgid "Role name"
 msgstr "Nombre de rol"
 
-#: describe.c:1864
+#: describe.c:2004
 msgid "Attributes"
 msgstr "Atributos"
 
-#: describe.c:1865
+#: describe.c:2005
 msgid "Member of"
 msgstr "Miembro de"
 
-#: describe.c:1876
+#: describe.c:2016
 msgid "Superuser"
 msgstr "Superusuario"
 
-#: describe.c:1879
+#: describe.c:2019
 msgid "No inheritance"
 msgstr "Sin herencia"
 
-#: describe.c:1882
+#: describe.c:2022
 msgid "Create role"
 msgstr "Crear rol"
 
-#: describe.c:1885
+#: describe.c:2025
 msgid "Create DB"
 msgstr "Crear BD"
 
-#: describe.c:1888
+#: describe.c:2028
 msgid "Cannot login"
 msgstr "No puede conectarse"
 
-#: describe.c:1897
+#: describe.c:2037
 msgid "No connections"
 msgstr "Ninguna conexi�n"
 
-#: describe.c:1899
+#: describe.c:2039
 #, c-format
-msgid "1 connection"
+msgid "%d connection"
 msgid_plural "%d connections"
-msgstr[0] "una conexi�n"
+msgstr[0] "%d conexi�n"
 msgstr[1] "%d conexiones"
 
-#: describe.c:1980
+#: describe.c:2123
 msgid "special"
 msgstr "especial"
 
-#: describe.c:1987
+#: describe.c:2130
 msgid "Table"
 msgstr "Tabla"
 
-#: describe.c:2046
+#: describe.c:2189
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "No se encontraron relaciones coincidentes.\n"
 
-#: describe.c:2048
+#: describe.c:2191
 #, c-format
 msgid "No relations found.\n"
 msgstr "No se encontraron relaciones.\n"
 
-#: describe.c:2053
+#: describe.c:2196
 msgid "List of relations"
 msgstr "Listado de relaciones"
 
-#: describe.c:2097
+#: describe.c:2240
 msgid "Modifier"
 msgstr "Modificador"
 
-#: describe.c:2098
+#: describe.c:2241
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:2116
+#: describe.c:2259
 msgid "List of domains"
 msgstr "Listado de dominios"
 
-#: describe.c:2151
+#: describe.c:2294
 msgid "Source"
 msgstr "Fuente"
 
-#: describe.c:2152
+#: describe.c:2295
 msgid "Destination"
 msgstr "Destino"
 
-#: describe.c:2154
+#: describe.c:2297
 msgid "Default?"
 msgstr "Por omisi�n?"
 
-#: describe.c:2172
+#: describe.c:2315
 msgid "List of conversions"
 msgstr "Listado de conversiones"
 
-#: describe.c:2223
+#: describe.c:2366
 msgid "Source type"
 msgstr "Tipo fuente"
 
-#: describe.c:2224
+#: describe.c:2367
 msgid "Target type"
 msgstr "Tipo destino"
 
-#: describe.c:2225 describe.c:2485
+#: describe.c:2368 describe.c:2628
 msgid "Function"
 msgstr "Funci�n"
 
-#: describe.c:2226
+#: describe.c:2369
 msgid "in assignment"
 msgstr "en asignaci�n"
 
-#: describe.c:2227
+#: describe.c:2370
 msgid "Implicit?"
 msgstr "Impl�cito?"
 
-#: describe.c:2253
+#: describe.c:2396
 msgid "List of casts"
 msgstr "Listado de conversiones de tipo (casts)"
 
-#: describe.c:2308
+#: describe.c:2451
 msgid "List of schemas"
 msgstr "Listado de esquemas"
 
-#: describe.c:2331 describe.c:2564 describe.c:2632 describe.c:2700
+#: describe.c:2474 describe.c:2707 describe.c:2775 describe.c:2843
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "El servidor (versi�n %d.%d) no soporta b�squeda en texto.\n"
 
-#: describe.c:2365
+#: describe.c:2508
 msgid "List of text search parsers"
 msgstr "Listado de analizadores de b�squeda en texto"
 
-#: describe.c:2408
+#: describe.c:2551
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "No se encontr� ning�n analizador de b�squeda en texto llamado �%s�.\n"
 
-#: describe.c:2483
+#: describe.c:2626
 msgid "Start parse"
 msgstr "Inicio de parse"
 
-#: describe.c:2484
+#: describe.c:2627
 msgid "Method"
 msgstr "M�todo"
 
-#: describe.c:2488
+#: describe.c:2631
 msgid "Get next token"
 msgstr "Obtener siguiente elemento"
 
-#: describe.c:2490
+#: describe.c:2633
 msgid "End parse"
 msgstr "Fin de parse"
 
-#: describe.c:2492
+#: describe.c:2635
 msgid "Get headline"
 msgstr "Obtener encabezado"
 
-#: describe.c:2494
+#: describe.c:2637
 msgid "Get token types"
 msgstr "Obtener tipos de elemento"
 
-#: describe.c:2504
+#: describe.c:2647
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analizador de b�squeda en texto �%s.%s�"
 
-#: describe.c:2506
+#: describe.c:2649
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analizador de b�squeda en texto �%s�"
 
-#: describe.c:2524
+#: describe.c:2667
 msgid "Token name"
 msgstr "Nombre de elemento"
 
-#: describe.c:2535
+#: describe.c:2678
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipos de elemento para el analizador �%s.%s�"
 
-#: describe.c:2537
+#: describe.c:2680
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipos de elemento para el analizador �%s�"
 
-#: describe.c:2586
+#: describe.c:2729
 msgid "Template"
 msgstr "Plantilla"
 
-#: describe.c:2587
+#: describe.c:2730
 msgid "Init options"
 msgstr "Opciones de inicializaci�n"
 
-#: describe.c:2609
+#: describe.c:2752
 msgid "List of text search dictionaries"
 msgstr "Listado de diccionarios de b�squeda en texto"
 
-#: describe.c:2649
+#: describe.c:2792
 msgid "Init"
 msgstr "Inicializador"
 
-#: describe.c:2650
+#: describe.c:2793
 msgid "Lexize"
 msgstr "Fn. an�lisis l�x."
 
-#: describe.c:2677
+#: describe.c:2820
 msgid "List of text search templates"
 msgstr "Listado de plantillas de b�squeda en texto"
 
-#: describe.c:2734
+#: describe.c:2877
 msgid "List of text search configurations"
 msgstr "Listado de configuraciones de b�squeda en texto"
 
-#: describe.c:2778
+#: describe.c:2921
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "No se encontr� una configuraci�n de b�squeda en texto llamada �%s�.\n"
 
-#: describe.c:2844
+#: describe.c:2987
 msgid "Token"
 msgstr "Elemento"
 
-#: describe.c:2845
+#: describe.c:2988
 msgid "Dictionaries"
 msgstr "Diccionarios"
 
-#: describe.c:2856
+#: describe.c:2999
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuraci�n de b�squeda en texto �%s.%s�"
 
-#: describe.c:2859
+#: describe.c:3002
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuraci�n de b�squeda en texto �%s�"
 
-#: describe.c:2863
+#: describe.c:3006
 #, c-format
 msgid ""
 "\n"
@@ -1982,7 +2020,7 @@ msgstr ""
 "\n"
 "Analizador: �%s.%s�"
 
-#: describe.c:2866
+#: describe.c:3009
 #, c-format
 msgid ""
 "\n"
@@ -1991,50 +2029,50 @@ msgstr ""
 "\n"
 "Analizador: �%s�"
 
-#: describe.c:2898
+#: describe.c:3041
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "El servidor (versi�n %d.%d) no soporta conectores de datos externos.\n"
 
-#: describe.c:2910
+#: describe.c:3053
 msgid "Validator"
 msgstr "Validador"
 
-#: describe.c:2934
+#: describe.c:3077
 msgid "List of foreign-data wrappers"
 msgstr "Listado de conectores de datos externos"
 
-#: describe.c:2957
+#: describe.c:3100
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "El servidor (versi�n %d.%d) no soporta servidores for�neos.\n"
 
-#: describe.c:2969
+#: describe.c:3112
 msgid "Foreign-data wrapper"
 msgstr "Conectores de datos externos"
 
-#: describe.c:2981
+#: describe.c:3124
 msgid "Version"
 msgstr "Versi�n"
 
-#: describe.c:3000
+#: describe.c:3143
 msgid "List of foreign servers"
 msgstr "Listado de servidores for�neos"
 
-#: describe.c:3023
+#: describe.c:3166
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "El servidor (versi�n %d.%d) no soporta mapeos de usuario.\n"
 
-#: describe.c:3032
+#: describe.c:3175
 msgid "Server"
 msgstr "Servidor"
 
-#: describe.c:3033
+#: describe.c:3176
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: describe.c:3053
+#: describe.c:3196
 msgid "List of user mappings"
 msgstr "Listado de mapeos de usuario"
 
@@ -2297,8 +2335,8 @@ msgid ""
 "ALTER OPERATOR FAMILY name USING index_method OWNER TO newowner"
 msgstr ""
 "ALTER OPERATOR FAMILY nombre USING m�todo_de_�ndice ADD\n"
-"  {  OPERATOR n�mero_estrategia nombre_operador ( tipo_op, tipo_op )\n "
-"   | FUNCTION n�m_soporte [ ( tipo_op [ , tipo_op ] ) ] nombre_func "
+"  {  OPERATOR n�mero_estrategia nombre_operador ( tipo_op, tipo_op )\n"
+"    | FUNCTION n�m_soporte [ ( tipo_op [ , tipo_op ] ) ] nombre_func "
 "( tipo_arg [, ...] )\n"
 "  } [, ... ]\n"
 "ALTER OPERATOR FAMILY nombre USING m�todo_de_�ndice DROP\n"
@@ -2386,7 +2424,8 @@ msgid ""
 "ALTER SEQUENCE name SET SCHEMA new_schema"
 msgstr ""
 "ALTER SEQUENCE nombre [ INCREMENT [ BY ] incremento ]\n"
-"    [ MINVALUE valor_m�n | NO MINVALUE ] [ MAXVALUE valor_m�x | NO MAXVALUE ]\n"
+"    [ MINVALUE valor_m�n | NO MINVALUE ] [ MAXVALUE valor_m�x | NO "
+"MAXVALUE ]\n"
 "    [ START [ WITH ] inicio ]\n"
 "    [ RESTART [ [ WITH ] reinicio ] ]\n"
 "    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
@@ -2943,8 +2982,7 @@ msgstr ""
 "\n"
 "CREATE CAST (tipo_origen AS tipo_destino)\n"
 "    WITHOUT FUNCTION\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]"
-"\n"
+"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
 "CREATE CAST (tipo_origen AS tipo_destino)\n"
 "    WITH INOUT\n"
 "    [ AS ASSIGNMENT | AS IMPLICIT ]"
@@ -3072,7 +3110,8 @@ msgid ""
 "    [ WITH ( attribute [, ...] ) ]"
 msgstr ""
 "CREATE [ OR REPLACE ] FUNCTION\n"
-"    nombre ( [ [ mode_arg ] [ nombre_arg ] tipo_arg [ { DEFAULT | = } expr_def ] [, ...] ] )\n"
+"    nombre ( [ [ mode_arg ] [ nombre_arg ] tipo_arg [ { DEFAULT | = } "
+"expr_def ] [, ...] ] )\n"
 "    [ RETURNS tipo_retorno ]\n"
 "      | RETURNS TABLE ( nombre_col tipo_col [, ...] ) ]\n"
 "  { LANGUAGE nombre_lenguaje\n"
@@ -3203,8 +3242,7 @@ msgid ""
 msgstr ""
 "CREATE OPERATOR CLASS nombre [ DEFAULT ] FOR TYPE tipo_de_dato\n"
 "  USING m�todo_de_�ndice [ FAMILY nombre_familia ] AS\n"
-"  {  OPERATOR n�mero_estrategia nombre_operador [ ( tipo_op, tipo_op ) ] "
-"\n"
+"  {  OPERATOR n�mero_estrategia nombre_operador [ ( tipo_op, tipo_op ) ] \n"
 "   | FUNCTION n�mero_soporte [ ( tipo_op [ , tipo_op ] ) ] nombre_func "
 "( tipo_arg [, ...] )\n"
 "   | STORAGE tipo_almacenamiento\n"
@@ -3314,7 +3352,8 @@ msgid ""
 "    FOREIGN DATA WRAPPER fdwname\n"
 "    [ OPTIONS ( option 'value' [, ... ] ) ]"
 msgstr ""
-"CREATE SERVER nombre [ TYPE 'tipo_servidor' ] [ VERSION 'versi�n_servidor' ]\n"
+"CREATE SERVER nombre [ TYPE 'tipo_servidor' ] [ VERSION "
+"'versi�n_servidor' ]\n"
 "    FOREIGN DATA WRAPPER nombre_fdw\n"
 "    [ OPTIONS ( opci�n 'valor' [, ... ] ) ]"
 
@@ -4089,7 +4128,8 @@ msgid ""
 "\n"
 "GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
 msgstr ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
+"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+"TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] nombre_tabla [, ...]\n"
 "    TO { [ GROUP ] nombre_rol | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
@@ -4158,7 +4198,7 @@ msgstr "escucha notificaciones"
 
 #: sql_help.h:458
 msgid "LISTEN name"
-msgstr "LISTEN name"
+msgstr "LISTEN nombre"
 
 #: sql_help.h:461
 msgid "load or reload a shared library file"
@@ -4166,7 +4206,7 @@ msgstr "carga o recarga un archivo de biblioteca compartida"
 
 #: sql_help.h:462
 msgid "LOAD 'filename'"
-msgstr "LOAD 'filename'"
+msgstr "LOAD 'archivo'"
 
 #: sql_help.h:465
 msgid "lock a table"
@@ -4333,7 +4373,8 @@ msgid ""
 "    [ CASCADE | RESTRICT ]"
 msgstr ""
 "REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
+"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+"TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] nombre_tabla [, ...]\n"
 "    FROM { [ GROUP ] nombre_rol | PUBLIC } [, ...]\n"
@@ -4495,7 +4536,8 @@ msgstr ""
 "    nombre_funci�n ( [ argumento [, ...] ] ) AS ( definici�n_columna "
 "[, ...] )\n"
 "    item_from [ NATURAL ] tipo_join item_from [ ON condici�n_join | USING "
-"( columna_join [, ...] ) ]"
+"( columna_join [, ...] ) ]\n"
+"\n"
 "y consulta_with es:\n"
 "\n"
 "    nombre_consulta_with [ ( nombre_columna [, ...] ) ] AS ( consulta )\n"
diff --git a/src/bin/psql/po/fr.po b/src/bin/psql/po/fr.po
index d8a39b5166..52c4d9d6c1 100644
--- a/src/bin/psql/po/fr.po
+++ b/src/bin/psql/po/fr.po
@@ -1,7 +1,7 @@
 # translation of psql.po to fr_fr
 # french message translation file for psql
 #
-# $PostgreSQL: pgsql/src/bin/psql/po/fr.po,v 1.24 2009/05/14 21:41:52 alvherre Exp $
+# $PostgreSQL: pgsql/src/bin/psql/po/fr.po,v 1.25 2009/06/10 23:42:43 petere Exp $
 #
 # Use these quotes: � %s �
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-05-02 19:08+0000\n"
-"PO-Revision-Date: 2009-05-02 22:15+0100\n"
+"POT-Creation-Date: 2009-06-09 17:09+0000\n"
+"PO-Revision-Date: 2009-06-09 19:44+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "MIME-Version: 1.0\n"
@@ -1319,22 +1319,22 @@ msgstr "ID"
 #: large_obj.c:287
 #: describe.c:95
 #: describe.c:158
-#: describe.c:333
-#: describe.c:463
-#: describe.c:538
-#: describe.c:609
-#: describe.c:732
-#: describe.c:1210
-#: describe.c:1981
-#: describe.c:2109
-#: describe.c:2401
-#: describe.c:2463
-#: describe.c:2599
-#: describe.c:2638
-#: describe.c:2705
-#: describe.c:2764
-#: describe.c:2773
-#: describe.c:2832
+#: describe.c:337
+#: describe.c:490
+#: describe.c:565
+#: describe.c:636
+#: describe.c:759
+#: describe.c:1237
+#: describe.c:2008
+#: describe.c:2139
+#: describe.c:2431
+#: describe.c:2493
+#: describe.c:2629
+#: describe.c:2668
+#: describe.c:2735
+#: describe.c:2794
+#: describe.c:2803
+#: describe.c:2862
 msgid "Description"
 msgstr "Description"
 
@@ -1396,11 +1396,11 @@ msgstr ""
 msgid "invalid output format (internal error): %d"
 msgstr "format de sortie invalide (erreur interne) : %d"
 
-#: print.c:2351
+#: print.c:2352
 #, c-format
-msgid "(1 row)"
+msgid "(%lu row)"
 msgid_plural "(%lu rows)"
-msgstr[0] "(1 ligne)"
+msgstr[0] "(%lu ligne)"
 msgstr[1] "(%lu lignes)"
 
 #: startup.c:217
@@ -1448,56 +1448,56 @@ msgid "contains support for command-line editing"
 msgstr "contient une gestion avanc�e de la ligne de commande"
 
 #: describe.c:68
-#: describe.c:234
-#: describe.c:435
-#: describe.c:533
-#: describe.c:654
-#: describe.c:729
-#: describe.c:2087
-#: describe.c:2207
-#: describe.c:2262
-#: describe.c:2461
-#: describe.c:2688
-#: describe.c:2760
-#: describe.c:2771
-#: describe.c:2830
+#: describe.c:235
+#: describe.c:462
+#: describe.c:560
+#: describe.c:681
+#: describe.c:756
+#: describe.c:2117
+#: describe.c:2237
+#: describe.c:2292
+#: describe.c:2491
+#: describe.c:2718
+#: describe.c:2790
+#: describe.c:2801
+#: describe.c:2860
 msgid "Schema"
 msgstr "Sch�ma"
 
 #: describe.c:69
 #: describe.c:145
-#: describe.c:235
-#: describe.c:436
-#: describe.c:534
-#: describe.c:584
-#: describe.c:655
-#: describe.c:730
-#: describe.c:2088
-#: describe.c:2208
-#: describe.c:2263
-#: describe.c:2392
-#: describe.c:2462
-#: describe.c:2689
-#: describe.c:2761
-#: describe.c:2772
-#: describe.c:2831
-#: describe.c:3021
-#: describe.c:3080
+#: describe.c:236
+#: describe.c:463
+#: describe.c:561
+#: describe.c:611
+#: describe.c:682
+#: describe.c:757
+#: describe.c:2118
+#: describe.c:2238
+#: describe.c:2293
+#: describe.c:2422
+#: describe.c:2492
+#: describe.c:2719
+#: describe.c:2791
+#: describe.c:2802
+#: describe.c:2861
+#: describe.c:3051
+#: describe.c:3110
 msgid "Name"
 msgstr "Nom"
 
 #: describe.c:70
-#: describe.c:247
-#: describe.c:293
-#: describe.c:310
+#: describe.c:248
+#: describe.c:294
+#: describe.c:311
 msgid "Result data type"
 msgstr "Type de donn�es du r�sultat"
 
 #: describe.c:84
 #: describe.c:88
-#: describe.c:248
-#: describe.c:294
-#: describe.c:311
+#: describe.c:249
+#: describe.c:295
+#: describe.c:312
 msgid "Argument data types"
 msgstr "Type de donn�es des param�tres"
 
@@ -1511,12 +1511,12 @@ msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les tablespaces.\n"
 
 #: describe.c:146
-#: describe.c:330
-#: describe.c:585
-#: describe.c:2095
-#: describe.c:2393
-#: describe.c:3022
-#: describe.c:3081
+#: describe.c:334
+#: describe.c:612
+#: describe.c:2125
+#: describe.c:2423
+#: describe.c:3052
+#: describe.c:3111
 msgid "Owner"
 msgstr "Propri�taire"
 
@@ -1528,621 +1528,633 @@ msgstr "Emplacement"
 msgid "List of tablespaces"
 msgstr "Liste des tablespaces"
 
-#: describe.c:211
+#: describe.c:212
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df prends seulement [antwS+] comme options\n"
 
-#: describe.c:217
+#: describe.c:218
 #, c-format
 msgid "\\df does not take a \"w\" option in %d.%d.\n"
 msgstr "\\df ne prends pas l'option � w � dans %d.%d.\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:250
-#: describe.c:296
-#: describe.c:313
+#: describe.c:251
+#: describe.c:297
+#: describe.c:314
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:251
+#: describe.c:252
 msgid "window"
 msgstr "window"
 
-#: describe.c:252
-#: describe.c:297
-#: describe.c:314
-#: describe.c:869
-msgid "trigger"
-msgstr "trigger"
-
 #: describe.c:253
 #: describe.c:298
 #: describe.c:315
-msgid "normal"
-msgstr "normal"
+#: describe.c:896
+msgid "trigger"
+msgstr "trigger"
 
 #: describe.c:254
 #: describe.c:299
 #: describe.c:316
-#: describe.c:657
-#: describe.c:1195
-#: describe.c:2094
-#: describe.c:2209
-#: describe.c:3093
+msgid "normal"
+msgstr "normal"
+
+#: describe.c:255
+#: describe.c:300
+#: describe.c:317
+#: describe.c:684
+#: describe.c:1222
+#: describe.c:2124
+#: describe.c:2239
+#: describe.c:3123
 msgid "Type"
 msgstr "Type"
 
-#: describe.c:329
+#: describe.c:330
+msgid "immutable"
+msgstr "immutable"
+
+#: describe.c:331
+msgid "stable"
+msgstr "stable"
+
+#: describe.c:332
+msgid "volatile"
+msgstr "volatile"
+
+#: describe.c:333
 msgid "Volatility"
 msgstr "Volatibilit�"
 
-#: describe.c:331
+#: describe.c:335
 msgid "Language"
 msgstr "Langage"
 
-#: describe.c:332
+#: describe.c:336
 msgid "Source code"
 msgstr "Code source"
 
-#: describe.c:408
+#: describe.c:434
 msgid "List of functions"
 msgstr "Liste des fonctions"
 
-#: describe.c:446
+#: describe.c:473
 msgid "Internal name"
 msgstr "Nom interne"
 
-#: describe.c:447
-#: describe.c:601
-#: describe.c:2105
+#: describe.c:474
+#: describe.c:628
+#: describe.c:2135
 msgid "Size"
 msgstr "Taille"
 
-#: describe.c:459
+#: describe.c:486
 msgid "Elements"
 msgstr "�l�ments"
 
-#: describe.c:502
+#: describe.c:529
 msgid "List of data types"
 msgstr "Liste des types de donn�es"
 
-#: describe.c:535
+#: describe.c:562
 msgid "Left arg type"
 msgstr "Type de l'arg. gauche"
 
-#: describe.c:536
+#: describe.c:563
 msgid "Right arg type"
 msgstr "Type de l'arg. droit"
 
-#: describe.c:537
+#: describe.c:564
 msgid "Result type"
 msgstr "Type du r�sultat"
 
-#: describe.c:556
+#: describe.c:583
 msgid "List of operators"
 msgstr "Liste des op�rateurs"
 
-#: describe.c:586
+#: describe.c:613
 msgid "Encoding"
 msgstr "Encodage"
 
-#: describe.c:591
+#: describe.c:618
 msgid "Collation"
 msgstr "Tri"
 
-#: describe.c:592
+#: describe.c:619
 msgid "Ctype"
 msgstr "Type caract."
 
-#: describe.c:605
+#: describe.c:632
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:622
+#: describe.c:649
 msgid "List of databases"
 msgstr "Liste des bases de donn�es"
 
-#: describe.c:656
-#: describe.c:824
-#: describe.c:2089
+#: describe.c:683
+#: describe.c:851
+#: describe.c:2119
 msgid "table"
 msgstr "table"
 
-#: describe.c:656
-#: describe.c:825
-#: describe.c:2090
+#: describe.c:683
+#: describe.c:852
+#: describe.c:2120
 msgid "view"
 msgstr "vue"
 
-#: describe.c:656
-#: describe.c:827
-#: describe.c:2092
+#: describe.c:683
+#: describe.c:854
+#: describe.c:2122
 msgid "sequence"
 msgstr "s�quence"
 
-#: describe.c:668
+#: describe.c:695
 msgid "Column access privileges"
 msgstr "Droits d'acc�s � la colonne"
 
-#: describe.c:694
-#: describe.c:3188
-#: describe.c:3192
+#: describe.c:721
+#: describe.c:3218
+#: describe.c:3222
 msgid "Access privileges"
 msgstr "Droits d'acc�s"
 
-#: describe.c:731
+#: describe.c:758
 msgid "Object"
 msgstr "Objet"
 
-#: describe.c:743
+#: describe.c:770
 msgid "aggregate"
 msgstr "agr�gation"
 
-#: describe.c:763
+#: describe.c:790
 msgid "function"
 msgstr "fonction"
 
-#: describe.c:782
+#: describe.c:809
 msgid "operator"
 msgstr "op�rateur"
 
-#: describe.c:801
+#: describe.c:828
 msgid "data type"
 msgstr "type de donn�es"
 
-#: describe.c:826
-#: describe.c:2091
+#: describe.c:853
+#: describe.c:2121
 msgid "index"
 msgstr "index"
 
-#: describe.c:848
+#: describe.c:875
 msgid "rule"
 msgstr "r�gle"
 
-#: describe.c:892
+#: describe.c:919
 msgid "Object descriptions"
 msgstr "Descriptions des objets"
 
-#: describe.c:945
+#: describe.c:972
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Aucune relation nomm�e � %s � n'a �t� trouv�e.\n"
 
-#: describe.c:1082
+#: describe.c:1109
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Aucune relation avec l'OID � %s � n'a �t� trouv�e.\n"
 
-#: describe.c:1157
+#: describe.c:1184
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Table � %s.%s �"
 
-#: describe.c:1161
+#: describe.c:1188
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vue � %s.%s �"
 
-#: describe.c:1165
+#: describe.c:1192
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "S�quence � %s.%s �"
 
-#: describe.c:1169
+#: describe.c:1196
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index � %s.%s �"
 
-#: describe.c:1174
+#: describe.c:1201
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Relation sp�ciale � %s.%s �"
 
-#: describe.c:1178
+#: describe.c:1205
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Table TOAST � %s.%s �"
 
-#: describe.c:1182
+#: describe.c:1209
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Type compos� � %s.%s �"
 
-#: describe.c:1194
+#: describe.c:1221
 msgid "Column"
 msgstr "Colonne"
 
-#: describe.c:1200
+#: describe.c:1227
 msgid "Modifiers"
 msgstr "Modificateurs"
 
-#: describe.c:1205
+#: describe.c:1232
 msgid "Value"
 msgstr "Valeur"
 
-#: describe.c:1209
+#: describe.c:1236
 msgid "Storage"
 msgstr "Stockage"
 
-#: describe.c:1251
+#: describe.c:1278
 msgid "not null"
 msgstr "non NULL"
 
 #. translator: default values of column definitions
-#: describe.c:1260
+#: describe.c:1287
 #, c-format
 msgid "default %s"
 msgstr "Par d�faut, %s"
 
-#: describe.c:1326
+#: describe.c:1353
 msgid "primary key, "
 msgstr "cl� primaire, "
 
-#: describe.c:1328
+#: describe.c:1355
 msgid "unique, "
 msgstr "unique, "
 
-#: describe.c:1334
+#: describe.c:1361
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "pour la table � %s.%s �"
 
-#: describe.c:1338
+#: describe.c:1365
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", pr�dicat (%s)"
 
-#: describe.c:1341
+#: describe.c:1368
 msgid ", clustered"
 msgstr ", en cluster"
 
-#: describe.c:1344
+#: describe.c:1371
 msgid ", invalid"
 msgstr ", invalide"
 
-#: describe.c:1358
+#: describe.c:1385
 msgid "View definition:"
 msgstr "D�finition de la vue :"
 
-#: describe.c:1375
-#: describe.c:1628
+#: describe.c:1402
+#: describe.c:1655
 msgid "Rules:"
 msgstr "R�gles :"
 
-#: describe.c:1422
+#: describe.c:1449
 msgid "Indexes:"
 msgstr "Index :"
 
-#: describe.c:1482
+#: describe.c:1509
 msgid "Check constraints:"
 msgstr "Contraintes de v�rification :"
 
-#: describe.c:1513
+#: describe.c:1540
 msgid "Foreign-key constraints:"
 msgstr "Contraintes de cl�s �trang�res :"
 
-#: describe.c:1544
+#: describe.c:1571
 msgid "Referenced by:"
 msgstr "R�f�renc� par :"
 
 #. translator: the first %s is a FK name, the following are
 #. * a table name and the FK definition
-#: describe.c:1549
+#: describe.c:1576
 #, c-format
 msgid "  \"%s\" IN %s %s"
 msgstr "  \"%s\" DANS %s %s"
 
-#: describe.c:1631
+#: describe.c:1658
 msgid "Disabled rules:"
 msgstr "R�gles d�sactiv�es :"
 
-#: describe.c:1634
+#: describe.c:1661
 msgid "Rules firing always:"
 msgstr "R�gles toujous activ�es :"
 
-#: describe.c:1637
+#: describe.c:1664
 msgid "Rules firing on replica only:"
 msgstr "R�gles activ�es uniquement sur le r�plica :"
 
-#: describe.c:1733
+#: describe.c:1760
 msgid "Triggers:"
 msgstr "Triggers :"
 
-#: describe.c:1736
+#: describe.c:1763
 msgid "Disabled triggers:"
 msgstr "Triggers d�sactiv�s :"
 
-#: describe.c:1739
+#: describe.c:1766
 msgid "Triggers firing always:"
 msgstr "Triggers toujours activ�s :"
 
-#: describe.c:1742
+#: describe.c:1769
 msgid "Triggers firing on replica only:"
 msgstr "Triggers activ�s uniquement sur le r�plica :"
 
-#: describe.c:1775
+#: describe.c:1802
 msgid "Inherits"
 msgstr "H�rite de"
 
-#: describe.c:1790
+#: describe.c:1817
 msgid "Has OIDs"
 msgstr "Contient des OID"
 
-#: describe.c:1793
-#: describe.c:2266
-#: describe.c:2339
+#: describe.c:1820
+#: describe.c:2296
+#: describe.c:2369
 msgid "yes"
 msgstr "oui"
 
-#: describe.c:1793
-#: describe.c:2266
-#: describe.c:2339
+#: describe.c:1820
+#: describe.c:2296
+#: describe.c:2369
 msgid "no"
 msgstr "non"
 
-#: describe.c:1801
-#: describe.c:3031
-#: describe.c:3095
-#: describe.c:3151
+#: describe.c:1828
+#: describe.c:3061
+#: describe.c:3125
+#: describe.c:3181
 msgid "Options"
 msgstr "Options"
 
-#: describe.c:1886
+#: describe.c:1913
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace : � %s �"
 
 #. translator: before this string there's an index
 #. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:1896
+#: describe.c:1923
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace � %s �"
 
-#: describe.c:1974
+#: describe.c:2001
 msgid "List of roles"
 msgstr "Liste des r�les"
 
-#: describe.c:1976
+#: describe.c:2003
 msgid "Role name"
 msgstr "Nom du r�le"
 
-#: describe.c:1977
+#: describe.c:2004
 msgid "Attributes"
 msgstr "Attributs"
 
-#: describe.c:1978
+#: describe.c:2005
 msgid "Member of"
 msgstr "Membre de"
 
-#: describe.c:1989
+#: describe.c:2016
 msgid "Superuser"
 msgstr "Superutilisateur"
 
-#: describe.c:1992
+#: describe.c:2019
 msgid "No inheritance"
 msgstr "Pas d'h�ritage"
 
-#: describe.c:1995
+#: describe.c:2022
 msgid "Create role"
 msgstr "Cr�er un r�le"
 
-#: describe.c:1998
+#: describe.c:2025
 msgid "Create DB"
 msgstr "Cr�er une base"
 
-#: describe.c:2001
+#: describe.c:2028
 msgid "Cannot login"
 msgstr "Ne peut pas se connecter"
 
-#: describe.c:2010
+#: describe.c:2037
 msgid "No connections"
 msgstr "Sans connexions"
 
-#: describe.c:2012
+#: describe.c:2039
 #, c-format
-msgid "1 connection"
+msgid "%d connection"
 msgid_plural "%d connections"
-msgstr[0] "1 connexion"
+msgstr[0] "%d connexion"
 msgstr[1] "%d connexions"
 
-#: describe.c:2093
+#: describe.c:2123
 msgid "special"
 msgstr "sp�cial"
 
-#: describe.c:2100
+#: describe.c:2130
 msgid "Table"
 msgstr "Table"
 
-#: describe.c:2159
+#: describe.c:2189
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Aucune relation correspondante trouv�e.\n"
 
-#: describe.c:2161
+#: describe.c:2191
 #, c-format
 msgid "No relations found.\n"
 msgstr "Aucune relation trouv�e.\n"
 
-#: describe.c:2166
+#: describe.c:2196
 msgid "List of relations"
 msgstr "Liste des relations"
 
-#: describe.c:2210
+#: describe.c:2240
 msgid "Modifier"
 msgstr "Modificateur"
 
-#: describe.c:2211
+#: describe.c:2241
 msgid "Check"
 msgstr "V�rification"
 
-#: describe.c:2229
+#: describe.c:2259
 msgid "List of domains"
 msgstr "Liste des domaines"
 
-#: describe.c:2264
+#: describe.c:2294
 msgid "Source"
 msgstr "Source"
 
-#: describe.c:2265
+#: describe.c:2295
 msgid "Destination"
 msgstr "Destination"
 
-#: describe.c:2267
+#: describe.c:2297
 msgid "Default?"
 msgstr "Par d�faut ?"
 
-#: describe.c:2285
+#: describe.c:2315
 msgid "List of conversions"
 msgstr "Liste des conversions"
 
-#: describe.c:2336
+#: describe.c:2366
 msgid "Source type"
 msgstr "Type source"
 
-#: describe.c:2337
+#: describe.c:2367
 msgid "Target type"
 msgstr "Type cible"
 
-#: describe.c:2338
-#: describe.c:2598
+#: describe.c:2368
+#: describe.c:2628
 msgid "Function"
 msgstr "Fonction"
 
-#: describe.c:2339
+#: describe.c:2369
 msgid "in assignment"
 msgstr "assign�"
 
-#: describe.c:2340
+#: describe.c:2370
 msgid "Implicit?"
 msgstr "Implicite ?"
 
-#: describe.c:2366
+#: describe.c:2396
 msgid "List of casts"
 msgstr "Liste des conversions explicites"
 
-#: describe.c:2421
+#: describe.c:2451
 msgid "List of schemas"
 msgstr "Liste des sch�mas"
 
-#: describe.c:2444
-#: describe.c:2677
-#: describe.c:2745
-#: describe.c:2813
+#: describe.c:2474
+#: describe.c:2707
+#: describe.c:2775
+#: describe.c:2843
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas la recherche plein texte.\n"
 
-#: describe.c:2478
+#: describe.c:2508
 msgid "List of text search parsers"
 msgstr "Liste des analyseurs de la recherche de texte"
 
-#: describe.c:2521
+#: describe.c:2551
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "Aucun analyseur de la recherche de texte nomm� � %s � n'a �t� trouv�.\n"
 
-#: describe.c:2596
+#: describe.c:2626
 msgid "Start parse"
 msgstr "D�but de l'analyse"
 
-#: describe.c:2597
+#: describe.c:2627
 msgid "Method"
 msgstr "M�thode"
 
-#: describe.c:2601
+#: describe.c:2631
 msgid "Get next token"
 msgstr "Obtenir le prochain jeton"
 
-#: describe.c:2603
+#: describe.c:2633
 msgid "End parse"
 msgstr "Fin de l'analyse"
 
-#: describe.c:2605
+#: describe.c:2635
 msgid "Get headline"
 msgstr "Obtenir l'en-t�te"
 
-#: describe.c:2607
+#: describe.c:2637
 msgid "Get token types"
 msgstr "Obtenir les types de jeton"
 
-#: describe.c:2617
+#: describe.c:2647
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analyseur � %s.%s � de la recherche de texte"
 
-#: describe.c:2619
+#: describe.c:2649
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analyseur � %s � de la recherche de texte"
 
-#: describe.c:2637
+#: describe.c:2667
 msgid "Token name"
 msgstr "Nom du jeton"
 
-#: describe.c:2648
+#: describe.c:2678
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Types de jeton pour l'analyseur � %s.%s �"
 
-#: describe.c:2650
+#: describe.c:2680
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Types de jeton pour l'analyseur � %s �"
 
-#: describe.c:2699
+#: describe.c:2729
 msgid "Template"
 msgstr "Mod�le"
 
-#: describe.c:2700
+#: describe.c:2730
 msgid "Init options"
 msgstr "Options d'initialisation :"
 
-#: describe.c:2722
+#: describe.c:2752
 msgid "List of text search dictionaries"
 msgstr "Liste des dictionnaires de la recherche de texte"
 
-#: describe.c:2762
+#: describe.c:2792
 msgid "Init"
 msgstr "Initialisation"
 
-#: describe.c:2763
+#: describe.c:2793
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:2790
+#: describe.c:2820
 msgid "List of text search templates"
 msgstr "Liste des mod�les de la recherche de texte"
 
-#: describe.c:2847
+#: describe.c:2877
 msgid "List of text search configurations"
 msgstr "Liste des configurations de la recherche de texte"
 
-#: describe.c:2891
+#: describe.c:2921
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Aucune configuration de la recherche de texte nomm�e � %s � n'a �t� trouv�e.\n"
 
-#: describe.c:2957
+#: describe.c:2987
 msgid "Token"
 msgstr "Jeton"
 
-#: describe.c:2958
+#: describe.c:2988
 msgid "Dictionaries"
 msgstr "Dictionnaires"
 
-#: describe.c:2969
+#: describe.c:2999
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuration � %s.%s � de la recherche de texte"
 
-#: describe.c:2972
+#: describe.c:3002
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuration � %s � de la recherche de texte"
 
-#: describe.c:2976
+#: describe.c:3006
 #, c-format
 msgid ""
 "\n"
@@ -2151,7 +2163,7 @@ msgstr ""
 "\n"
 "Analyseur : � %s.%s �"
 
-#: describe.c:2979
+#: describe.c:3009
 #, c-format
 msgid ""
 "\n"
@@ -2160,50 +2172,50 @@ msgstr ""
 "\n"
 "Analyseur : � %s �"
 
-#: describe.c:3011
+#: describe.c:3041
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les wrappers de donn�es distantes.\n"
 
-#: describe.c:3023
+#: describe.c:3053
 msgid "Validator"
 msgstr "Validateur"
 
-#: describe.c:3047
+#: describe.c:3077
 msgid "List of foreign-data wrappers"
 msgstr "Liste des wrappers de donn�es distantes"
 
-#: describe.c:3070
+#: describe.c:3100
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les serveurs distants.\n"
 
-#: describe.c:3082
+#: describe.c:3112
 msgid "Foreign-data wrapper"
 msgstr "Wrapper des donn�es distantes"
 
-#: describe.c:3094
+#: describe.c:3124
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:3113
+#: describe.c:3143
 msgid "List of foreign servers"
 msgstr "Liste des serveurs distants"
 
-#: describe.c:3136
+#: describe.c:3166
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les correspondances d'utilisateurs.\n"
 
-#: describe.c:3145
+#: describe.c:3175
 msgid "Server"
 msgstr "Serveur"
 
-#: describe.c:3146
+#: describe.c:3176
 msgid "User name"
 msgstr "Nom de l'utilisateur"
 
-#: describe.c:3166
+#: describe.c:3196
 msgid "List of user mappings"
 msgstr "Liste des correspondances utilisateurs"
 
@@ -4892,6 +4904,10 @@ msgstr "le processus fils a �t� termin� par le signal %d"
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitt� avec un statut %d non reconnu"
 
+#~ msgid "(1 row)"
+#~ msgid_plural "(%lu rows)"
+#~ msgstr[0] "(1 ligne)"
+#~ msgstr[1] "(%lu lignes)"
 #~ msgid "  \\df[S+] [PATTERN]      list functions\n"
 #~ msgstr "  \\df[S+] [MOD�LE]     affiche la liste des fonctions\n"
 #~ msgid ""
@@ -4947,8 +4963,6 @@ msgstr "le processus fils a quitt� avec un statut %d non reconnu"
 #~ "                       vues et s�quences (identique � \\dp)\n"
 #~ msgid "Copy, Large Object\n"
 #~ msgstr "Copie, � Large Object �\n"
-#~ msgid "(%lu rows)"
-#~ msgstr "(%lu lignes)"
 #~ msgid ""
 #~ "Welcome to %s %s (server %s), the PostgreSQL interactive terminal.\n"
 #~ "\n"
diff --git a/src/bin/psql/po/ja.po b/src/bin/psql/po/ja.po
index 3c2afcbed7..93a0d53e9e 100644
--- a/src/bin/psql/po/ja.po
+++ b/src/bin/psql/po/ja.po
@@ -5,13 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-03-08 23:24+0900\n"
-"PO-Revision-Date: 2008-02-12 18:29+0900\n"
+"POT-Creation-Date: 2009-05-08 19:53+0900\n"
+"PO-Revision-Date: 2009-05-08 20:03+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: command.c:112
 #, c-format
@@ -43,133 +44,134 @@ msgstr "\\%s: ディレクトリを \"%s\" に変更できません：%s\n"
 msgid "Time: %.3f ms\n"
 msgstr "時間: %.3f ms\n"
 
-#: command.c:454 command.c:482 command.c:1021
+#: command.c:468 command.c:496 command.c:1035
 msgid "no query buffer\n"
 msgstr "クエリーバッファがありません。\n"
 
-#: command.c:524
-msgid "No changes."
-msgstr "変更なし。"
+#: command.c:538
+msgid "No changes"
+msgstr "変更なし"
 
-#: command.c:578
+#: command.c:592
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: 正しいエンコーディング名でないか、または変換用プロシージャが見つかりませ"
 "ん。\n"
 
-#: command.c:646 command.c:680 command.c:694 command.c:711 command.c:815
-#: command.c:865 command.c:1001 command.c:1032
+#: command.c:660 command.c:694 command.c:708 command.c:725 command.c:829
+#: command.c:879 command.c:1015 command.c:1046
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: 引数が不足しています。\n"
 
-#: command.c:743
+#: command.c:757
 msgid "Query buffer is empty."
 msgstr "クエリーバッファは空です。"
 
-#: command.c:753
+#: command.c:767
 msgid "Enter new password: "
 msgstr "新しいパスワード: "
 
-#: command.c:754
+#: command.c:768
 msgid "Enter it again: "
 msgstr "もう一度入力してください："
 
-#: command.c:758
+#: command.c:772
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "パスワードがマッチしません。\n"
 
-#: command.c:776
+#: command.c:790
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "パスワードの暗号化に失敗しました。\n"
 
-#: command.c:844 command.c:945 command.c:1006
+#: command.c:858 command.c:959 command.c:1020
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: エラー\n"
 
-#: command.c:885
+#: command.c:899
 msgid "Query buffer reset (cleared)."
 msgstr "クエリーバッファがリセット（クリア）されました。"
 
-#: command.c:898
+#: command.c:912
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "ファイル \"%s/%s\" にヒストリを出力しました。\n"
 
-#: command.c:936 common.c:52 common.c:66 input.c:198 mainloop.c:69
+#: command.c:950 common.c:52 common.c:66 input.c:198 mainloop.c:69
 #: mainloop.c:227 print.c:61 print.c:75
 #, c-format
 msgid "out of memory\n"
 msgstr "メモリ不足です\n"
 
-#: command.c:986
+#: command.c:1000
 msgid "Timing is on."
 msgstr "タイミングは on です。"
 
-#: command.c:988
+#: command.c:1002
 msgid "Timing is off."
 msgstr "タイミングは off です。"
 
-#: command.c:1049 command.c:1069 command.c:1567 command.c:1574 command.c:1583
-#: command.c:1593 command.c:1602 command.c:1616 command.c:1633 command.c:1666
-#: common.c:137 copy.c:521 copy.c:585
+#: command.c:1063 command.c:1083 command.c:1581 command.c:1588 command.c:1597
+#: command.c:1607 command.c:1616 command.c:1630 command.c:1647 command.c:1680
+#: common.c:137 copy.c:517 copy.c:581
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1151 startup.c:164
+#: command.c:1165 startup.c:159
 msgid "Password: "
 msgstr "パスワード: "
 
-#: command.c:1158 startup.c:167 startup.c:169
+#: command.c:1172 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "ユーザ %s のパスワード: "
 
-#: command.c:1254 command.c:2096 common.c:183 common.c:460 common.c:525
-#: common.c:811 common.c:836 common.c:920 copy.c:656 copy.c:701 copy.c:830
+#: command.c:1268 command.c:2110 common.c:183 common.c:460 common.c:525
+#: common.c:811 common.c:836 common.c:920 copy.c:652 copy.c:697 copy.c:826
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1258
+#: command.c:1272
 msgid "Previous connection kept\n"
 msgstr "以前の接続は保持されています。\n"
 
-#: command.c:1262
+#: command.c:1276
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1286
+#: command.c:1300
 #, c-format
 msgid "You are now connected to database \"%s\""
 msgstr "データベース \"%s\" に接続しました。"
 
-#: command.c:1289
+#: command.c:1303
 #, c-format
 msgid " on host \"%s\""
 msgstr "ホスト：\"%s\""
 
-#: command.c:1292
+#: command.c:1306
 #, c-format
 msgid " at port \"%s\""
 msgstr "ポート：\"%s\""
 
-#: command.c:1295
+#: command.c:1309
 #, c-format
 msgid " as user \"%s\""
 msgstr "ユーザ名：\"%s\""
 
-#: command.c:1330
+#: command.c:1344
+#, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, サーバ %s)\n"
 
-#: command.c:1337
+#: command.c:1351
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -178,15 +180,18 @@ msgstr ""
 "注意： %s バージョン %d.%d, サーババージョン %d.%d.\n"
 "         psql の機能の中で、動作しないものがあるかもしれません。\n"
 
-#: command.c:1367
+#: command.c:1381
+#, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "SSL 接続 (暗号化方式: %s, ビット長: %i)\n"
 
-#: command.c:1376
+#: command.c:1390
+#, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "SSL 接続 (未定義の暗号化方式)\n"
 
-#: command.c:1397
+#: command.c:1411
+#, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
 "         8-bit characters might not work correctly. See psql reference\n"
@@ -198,140 +203,140 @@ msgstr ""
 "      （ウィンドウズユーザのために）を参照してください。\n"
 "\n"
 
-#: command.c:1486
+#: command.c:1500
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "エディタ \"%s\" を起動できません。\n"
 
-#: command.c:1488
+#: command.c:1502
 msgid "could not start /bin/sh\n"
 msgstr "/bin/sh を起動できませんでした。\n"
 
-#: command.c:1525
+#: command.c:1539
 #, c-format
 msgid "cannot locate temporary directory: %s"
 msgstr "一時ディレクトリ \"%s\" が見つかりません。"
 
-#: command.c:1552
+#: command.c:1566
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "一時ファイル \"%s\" を開けません: %s\n"
 
-#: command.c:1750
+#: command.c:1764
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
 msgstr ""
-"\\pset: 有効なフォーマットは unaligned, aligned, wrapped, html, latex, "
-"troff-ms です。\n"
+"\\pset: 有効なフォーマットは unaligned, aligned, wrapped, html, latex, troff-"
+"ms です。\n"
 
-#: command.c:1755
+#: command.c:1769
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "出力フォーマットは \"%s\" です。\n"
 
-#: command.c:1765
+#: command.c:1779
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "境界線のスタイルは %d です。\n"
 
-#: command.c:1777
+#: command.c:1791
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "拡張表示は on です。\n"
 
-#: command.c:1778
+#: command.c:1792
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "拡張表示は off です。\n"
 
-#: command.c:1791
+#: command.c:1805
 msgid "Showing locale-adjusted numeric output."
 msgstr "ロケールで調整された数値出力を表示しています。"
 
-#: command.c:1793
+#: command.c:1807
 msgid "Locale-adjusted numeric output is off."
 msgstr "ロケールで調整された数値出力は off です。"
 
-#: command.c:1806
+#: command.c:1820
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null 表示は \"%s\" です。\n"
 
-#: command.c:1818
+#: command.c:1832
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "フィールド区切り文字は \"%s\" です。\n"
 
-#: command.c:1832
+#: command.c:1846
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "レコード区切り文字は <newline> です。"
 
-#: command.c:1834
+#: command.c:1848
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "レコード区切り文字は \"%s\" です。\n"
 
-#: command.c:1848
+#: command.c:1862
 msgid "Showing only tuples."
 msgstr "タプルのみを表示しています。"
 
-#: command.c:1850
+#: command.c:1864
 msgid "Tuples only is off."
 msgstr "「タプルのみ表示」は off です。"
 
-#: command.c:1866
+#: command.c:1880
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "タイトルは \"%s\" です。\n"
 
-#: command.c:1868
+#: command.c:1882
 #, c-format
 msgid "Title is unset.\n"
 msgstr "タイトルはセットされていません。\n"
 
-#: command.c:1884
+#: command.c:1898
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "テーブル属性は \"%s\" です。\n"
 
-#: command.c:1886
+#: command.c:1900
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "テーブル属性はセットされていません。\n"
 
-#: command.c:1907
+#: command.c:1921
 msgid "Pager is used for long output."
 msgstr "出力が長い場合はページャが使われます。"
 
-#: command.c:1909
+#: command.c:1923
 msgid "Pager is always used."
 msgstr "常にページャが使われます。"
 
-#: command.c:1911
+#: command.c:1925
 msgid "Pager usage is off."
 msgstr "「ページャを使う」は off です。"
 
-#: command.c:1925
+#: command.c:1939
 msgid "Default footer is on."
 msgstr "デフォルトのフッタは on です。"
 
-#: command.c:1927
+#: command.c:1941
 msgid "Default footer is off."
 msgstr "デフォルトのフッタは off です。"
 
-#: command.c:1938
+#: command.c:1952
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr "\"wrapped\" フォーマットの対象幅は %d です。\n"
 
-#: command.c:1943
+#: command.c:1957
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: 未定義のオプション：%s\n"
 
-#: command.c:1997
+#: command.c:2011
 msgid "\\!: failed\n"
 msgstr "\\!: 失敗\n"
 
@@ -402,54 +407,55 @@ msgstr ""
 #: common.c:827
 #, c-format
 msgid ""
-"The server version (%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+"The server (version %d.%d) does not support savepoints for "
+"ON_ERROR_ROLLBACK.\n"
 msgstr ""
-"このサーバのバージョン (%d) では、ON_ERROR_ROLLBACK 用のセーブポイントを"
-"サポートしていません。\n"
+"このサーバ(バージョン%d.%d)では、ON_ERROR_ROLLBACK用のセーブポイントをサポー"
+"トしていません。\n"
 
-#: copy.c:124
+#: copy.c:120
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: 引数がありません。\n"
 
-#: copy.c:403
+#: copy.c:399
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: \"%s\" でパースエラー発生\n"
 
-#: copy.c:405
+#: copy.c:401
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: 行末でパースエラー発生\n"
 
-#: copy.c:532
+#: copy.c:528
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: ディレクトリから／ディレクトリへのコピーはできません。\n"
 
-#: copy.c:558
+#: copy.c:554
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:562 copy.c:576
+#: copy.c:558 copy.c:572
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: 予期しない応答 (%d)\n"
 
-#: copy.c:631 copy.c:641
+#: copy.c:627 copy.c:637
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "コピーデータを書き込めません：%s\n"
 
-#: copy.c:648
+#: copy.c:644
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "COPY データの転送に失敗しました：%s"
 
-#: copy.c:696
+#: copy.c:692
 msgid "canceled by user"
 msgstr "ユーザによりキャンセルされました"
 
-#: copy.c:711
+#: copy.c:707
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -457,7 +463,7 @@ msgstr ""
 "コピーするデータに続いて改行を入力します。\n"
 "バックスラッシュ(\\)とピリオドだけの行で終了します。"
 
-#: copy.c:823
+#: copy.c:819
 msgid "aborted because of read failure"
 msgstr "読み込みに失敗したため異常終了しました"
 
@@ -475,6 +481,7 @@ msgid "could not get current user name: %s\n"
 msgstr "現在のユーザ名を取得できません: %s\n"
 
 #: help.c:86
+#, c-format
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
@@ -488,39 +495,49 @@ msgid "Usage:\n"
 msgstr "使用方法:\n"
 
 #: help.c:88
+#, c-format
 msgid ""
-"  psql [OPTIONS]... [DBNAME [USERNAME]]\n"
+"  psql [OPTION]... [DBNAME [USERNAME]]\n"
+"\n"
+msgstr ""
+"  psql [オプション]... [データベース名 [ユーザ名]]\n"
 "\n"
-msgstr "  psql [オプション]... [データベース名 [ユーザ名]]\n"
 
 #: help.c:90
+#, c-format
 msgid "General options:\n"
 msgstr "一般的なオプション：\n"
 
 #: help.c:95
+#, c-format
 msgid ""
 "  -c, --command=COMMAND    run only single command (SQL or internal) and "
 "exit\n"
 msgstr ""
-"  -c, --command=コマンド   (SQLまたは内部の)単一コマンドを一つだけ"
-"実行して終了\n"
+"  -c, --command=コマンド   (SQLまたは内部の)単一コマンドを一つだけ実行して終"
+"了\n"
 
 #: help.c:96
+#, c-format
 msgid ""
-"  -d, --dbnme=DBNAME       database name to connect to (default: \"%s\")\n"
+"  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr ""
-"  -d, --dbnme=DB名         接続するデータベース名を指定(デフォルト: \"%s\")\n"
+"  -d, --dbname=DB名         接続するデータベース名を指定(デフォルト: \"%s"
+"\")\n"
 
 #: help.c:97
+#, c-format
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr ""
 "  -f, --file=ファイル名   ファイルからコマンドを読み込んで実行後、終了\n"
 
 #: help.c:98
+#, c-format
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l(エル), --list        使用可能なデータベース一覧を表示して終了\n"
 
 #: help.c:99
+#, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -529,17 +546,19 @@ msgstr ""
 "                           psql 変数 '名前' に '値' をセット\n"
 
 #: help.c:101
+#, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X              初期化ファイル (~/.psqlrc) を読みこまない\n"
 
 #: help.c:102
+#, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute command file as a single transaction\n"
 msgstr ""
 "  -1(数字の１), --single-transaction\n"
-"                           単一のトランザクションとしてコマンドファイルを"
-"実行\n"
+"                           単一のトランザクションとしてコマンドファイルを実"
+"行\n"
 
 #: help.c:104
 #, c-format
@@ -552,6 +571,7 @@ msgid "  --version                output version information, then exit\n"
 msgstr "  --version                バージョン情報を表示し、終了します\n"
 
 #: help.c:107
+#, c-format
 msgid ""
 "\n"
 "Input and output options:\n"
@@ -560,46 +580,54 @@ msgstr ""
 "入出力オプション：\n"
 
 #: help.c:108
+#, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           スクリプトからのすべての入力を表示\n"
 
 #: help.c:109
+#, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       サーバへ送信したコマンドを表示\n"
 
 #: help.c:110
+#, c-format
 msgid ""
 "  -E, --echo-hidden        display queries that internal commands generate\n"
-msgstr ""
-"  -E, --echo-hidden        内部コマンドが生成したクエリーを表示\n"
+msgstr "  -E, --echo-hidden        内部コマンドが生成したクエリーを表示\n"
 
 #: help.c:111
+#, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=ファイル名 セッションログをファイルに吐き出す\n"
 
 #: help.c:112
+#, c-format
 msgid ""
 "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline        拡張コマンドライン編集機能(readline)を無効にする\n"
 
 #: help.c:113
+#, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
-msgstr "  -o, --output=ファイル名  クエリーの結果をファイル"
-"(または |パイプ)に送る\n"
+msgstr ""
+"  -o, --output=ファイル名  クエリーの結果をファイル(または |パイプ)に送る\n"
 
 #: help.c:114
+#, c-format
 msgid ""
 "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet              静かに実行(メッセージなしで、クエリー出力のみ)\n"
 
 #: help.c:115
+#, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr ""
 "  -s, --single-step        シングルステップモード(各クエリーごとに確認)\n"
 
 #: help.c:116
+#, c-format
 msgid ""
 "  -S, --single-line        single-line mode (end of line terminates SQL "
 "command)\n"
@@ -607,6 +635,7 @@ msgstr ""
 "  -S, --single-line         単一行モード(行末を SQL コマンドの終了とみなす)\n"
 
 #: help.c:118
+#, c-format
 msgid ""
 "\n"
 "Output format options:\n"
@@ -615,30 +644,35 @@ msgstr ""
 "出力フォーマットオプション:\n"
 
 #: help.c:119
+#, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           桁揃えしないテーブル出力モード\n"
 
 #: help.c:120
+#, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
 "                           set field separator (default: \"%s\")\n"
 msgstr ""
-"  -F, --field-separator=文字列  フィールド区切り文字を設定"
-"(デフォルト: \"%s\")\n"
+"  -F, --field-separator=文字列  フィールド区切り文字を設定(デフォルト: \"%s"
+"\")\n"
 
 #: help.c:123
+#, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               HTML テーブル出力モード\n"
 
 #: help.c:124
+#, c-format
 msgid ""
 "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
 "command)\n"
 msgstr ""
-"  -P, --pset=変数[=値]     表示オプション '変数' を '値' にセット"
-" (\\pset コマンドを参照)\n"
+"  -P, --pset=変数[=値]     表示オプション '変数' を '値' にセット (\\pset コ"
+"マンドを参照)\n"
 
 #: help.c:125
+#, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
 "                           set record separator (default: newline)\n"
@@ -647,10 +681,12 @@ msgstr ""
 "                           レコード区切り文字を設定(デフォルト：改行)\n"
 
 #: help.c:127
+#, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        行のみを表示\n"
 
 #: help.c:128
+#, c-format
 msgid ""
 "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
 "border)\n"
@@ -658,10 +694,12 @@ msgstr ""
 "  -T, --table-attr=TEXT    HTMLテーブルのタグ属性をセット(width, border等)\n"
 
 #: help.c:129
+#, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           拡張テーブル出力を有効にする\n"
 
 #: help.c:131
+#, c-format
 msgid ""
 "\n"
 "Connection options:\n"
@@ -670,33 +708,38 @@ msgstr ""
 "接続オプション:\n"
 
 #: help.c:134
+#, c-format
 msgid ""
 "  -h, --host=HOSTNAME      database server host or socket directory "
 "(default: \"%s\")\n"
 msgstr ""
-"  -h, --host=ホスト名      データベースサーバのホストまたはソケットの"
-"ディレクトリ(デフォルト: \"%s\")\n"
+"  -h, --host=ホスト名      データベースサーバのホストまたはソケットのディレク"
+"トリ(デフォルト: \"%s\")\n"
 
 #: help.c:135
 msgid "local socket"
 msgstr "ローカルソケット"
 
 #: help.c:138
+#, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr ""
-"  -p, --port=ポート番号    データベースサーバのポート番号"
-"(デフォルト： \"%s\")\n"
+"  -p, --port=ポート番号    データベースサーバのポート番号(デフォルト： \"%s"
+"\")\n"
 
 #: help.c:144
+#, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
-msgstr "  -U, --username=名前      データベースのユーザ名"
-"(デフォルト: \"%s\")\n"
+msgstr ""
+"  -U, --username=名前      データベースのユーザ名(デフォルト: \"%s\")\n"
 
 #: help.c:145
+#, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        パスワード入力を要求しない\n"
 
 #: help.c:146
+#, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
 "automatically)\n"
@@ -705,6 +748,7 @@ msgstr ""
 "                           （自動的に表示されるはずです）\n"
 
 #: help.c:148
+#, c-format
 msgid ""
 "\n"
 "For more information, type \"\\?\" (for internal commands) or \"\\help"
@@ -720,258 +764,315 @@ msgstr ""
 "\n"
 
 #: help.c:151
+#, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "不具合は<pgsql-bugs@postgresql.org>まで報告してください。\n"
 
-#: help.c:173
+#: help.c:169
+#, c-format
 msgid "General\n"
 msgstr "一般\n"
 
-#: help.c:174
-msgid "  \\copyright     show PostgreSQL usage and distribution terms\n"
+#: help.c:170
+#, c-format
+msgid ""
+"  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright     PostgreSQL の使い方と配布条件を表示\n"
 
-#: help.c:175
-msgid "  \\g [FILE] or ; execute query (and send results to file or |pipe)\n"
-msgstr "  \\g [ファイル] または ;  クエリー実行"
-"（し、結果をファイルまたは |パイプ へ書き出す)\n"
+#: help.c:171
+#, c-format
+msgid ""
+"  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
+msgstr ""
+"  \\g [ファイル] または ;  クエリー実行（し、結果をファイルまたは |パイプ へ"
+"書き出す)\n"
 
-#: help.c:176
-msgid "  \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
+#: help.c:172
+#, c-format
+msgid ""
+"  \\h [NAME]              help on syntax of SQL commands, * for all "
+"commands\n"
 msgstr "  \\h [名前]      SQL コマンドの書式のヘルプ、* で全コマンド\n"
 
-#: help.c:177
+#: help.c:173
 #, c-format
-msgid "  \\q             quit psql\n"
+msgid "  \\q                     quit psql\n"
 msgstr "  \\q             psql を終了\n"
 
-#: help.c:180
+#: help.c:176
 #, c-format
 msgid "Query Buffer\n"
 msgstr "クエリーバッファ\n"
 
-#: help.c:181
+#: help.c:177
 #, c-format
 msgid ""
-"  \\e [FILE]      edit the query buffer (or file) with external editor\n"
+"  \\e [FILE]              edit the query buffer (or file) with external "
+"editor\n"
 msgstr ""
-"  \\e [ファイル]  現在のクエリーバッファやファイルを外部エディタで編集\n"
+"  \\e [ファイル]  現在のクエリーバッファ(やファイル)を外部エディタで編集\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
-msgid "  \\p             show the contents of the query buffer\n"
+msgid ""
+"  \\ef [FUNCNAME]         edit function definition with external editor\n"
+msgstr "  \\e [関数名]    関数定義を外部エディタで編集\n"
+
+#: help.c:179
+#, c-format
+msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p             クエリーバッファの内容を表示\n"
 
-#: help.c:183
+#: help.c:180
 #, c-format
-msgid "  \\r             reset (clear) the query buffer\n"
+msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r             クエリーバッファをリセット（クリア）\n"
 
-#: help.c:185
+#: help.c:182
 #, c-format
-msgid "  \\s [FILE]      display history or save it to file\n"
+msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr "  \\s [ファイル]  ヒストリを表示またはファイルに保存\n"
 
-#: help.c:187
+#: help.c:184
 #, c-format
-msgid "  \\w FILE        write query buffer to file\n"
-msgstr "  \\w [ファイル]  クエリーバッファの内容をファイルに書き出す\n"
+msgid "  \\w FILE                write query buffer to file\n"
+msgstr "  \\w ファイル    クエリーバッファの内容をファイルに書き出す\n"
 
-#: help.c:190
+#: help.c:187
 #, c-format
 msgid "Input/Output\n"
 msgstr "入出力\n"
 
-#: help.c:191
+#: help.c:188
 #, c-format
 msgid ""
-"  \\copy ...      perform SQL COPY with data stream to the client host\n"
+"  \\copy ...              perform SQL COPY with data stream to the client "
+"host\n"
 msgstr ""
 "  \\copy ...      クライアントホストに対し、データストリームを使って\n"
 "                  SQL コピーを行う\n"
 
-#: help.c:192
+#: help.c:189
 #, c-format
-msgid "  \\echo [STRING] write string to standard output\n"
+msgid "  \\echo [STRING]         write string to standard output\n"
 msgstr "  \\echo [文字列] 文字列を標準出力に書き出す\n"
 
-#: help.c:193
+#: help.c:190
 #, c-format
-msgid "  \\i FILE        execute commands from file\n"
+msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i ファイル    ファイルからコマンドを読み込んで実行\n"
 
-#: help.c:194
+#: help.c:191
 #, c-format
-msgid "  \\o [FILE]      send all query results to file or |pipe\n"
+msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr ""
-"  \\o ファイル    すべてのクエリーの結果をファイルまたは |パイプ へ送る\n"
+"  \\o [ファイル]  すべてのクエリーの結果をファイルまたは |パイプ へ送る\n"
 
-#: help.c:195
-msgid "  \\qecho [STRING] write string to query output stream (see \\o)\n"
+#: help.c:192
+#, c-format
+msgid ""
+"  \\qecho [STRING]        write string to query output stream (see \\o)\n"
 msgstr ""
 "  \\qecho [文字列]    文字列をクエリー出力ストリームに出力(\\o を参照)\n"
 
-#: help.c:198
+#: help.c:195
 #, c-format
 msgid "Informational\n"
 msgstr "情報\n"
 
+#: help.c:196
+#, c-format
+msgid "  (options: S = show system objects, + = additional detail)\n"
+msgstr "(修飾子: S = システムオブジェクトを表示 + = 詳細情報)\n"
+
+#: help.c:197
+#, c-format
+msgid "  \\d[S+]                 list tables, views, and sequences\n"
+msgstr "  \\d[S+]                テーブル、ビュー、シーケンスの一覧を表示\n"
+
+#: help.c:198
+#, c-format
+msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgstr ""
+"  \\d[S+]   名前         テーブル、ビュー、シーケンス、インデックスの説明を表"
+"示\n"
+
 #: help.c:199
 #, c-format
-msgid "  Modifiers: S = show system objects  + = Additional detail\n"
-msgstr "修飾子: S = システムオブジェクトを表示 + = 詳細情報\n"
+msgid "  \\da[+]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[+]   [パターン]   集約関数一覧を表示\n"
 
 #: help.c:200
-msgid "  \\l[+]                 list all databases\n"
-msgstr "  \\l[+]                 データベースの一覧を表示\n"
+#, c-format
+msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
+msgstr "  \\db[+]   [パターン]   テーブルスペース一覧を表示\n"
 
 #: help.c:201
-msgid "  \\d[S+]                list tables, views, and sequences\n"
-msgstr "  \\d[S+]                テーブル、ビュー、シーケンスの一覧を表示\n"
+#, c-format
+msgid "  \\dc[S]  [PATTERN]      list conversions\n"
+msgstr "  \\dc[S]   [パターン]   変換ルール一覧を表示\n"
 
 #: help.c:202
-msgid "  \\d[S+]   NAME         describe table, view, sequence, or index\n"
-msgstr "  \\d[S+]   名前         テーブル、ビュー、シーケンス、インデックス"
-"の説明を表示\n"
+#, c-format
+msgid "  \\dC     [PATTERN]      list casts\n"
+msgstr "  \\dC      [パターン]   キャスト一覧を表示\n"
 
 #: help.c:203
-msgid "  \\da[S]   [PATTERN]    list aggregate functions\n"
-msgstr "  \\da[S]   [パターン]   集約関数一覧を表示\n"
+#, c-format
+msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
+msgstr "  \\dd[S]   [パターン]   オブジェクトのコメントを表示\n"
 
 #: help.c:204
-msgid "  \\db[+]   [PATTERN]    list tablespaces\n"
-msgstr "  \\db[+]   [パターン]   テーブルスペース一覧を表示\n"
+#, c-format
+msgid "  \\dD[S]  [PATTERN]      list domains\n"
+msgstr "  \\dD[S]   [パターン]   ドメイン一覧を表示\n"
 
 #: help.c:205
-msgid "  \\dc[S]   [PATTERN]    list conversions\n"
-msgstr "  \\dc[S]   [パターン]   変換ルール一覧を表示\n"
+#, c-format
+msgid "  \\des[+] [PATTERN]      list foreign servers\n"
+msgstr "  \\des[+]  [パターン]   外部サーバ一覧を表示\n"
 
 #: help.c:206
-msgid "  \\dC      [PATTERN]    list casts\n"
-msgstr "  \\dC      [パターン]   キャスト一覧を表示\n"
+#, c-format
+msgid "  \\deu[+] [PATTERN]      list user mappings\n"
+msgstr "  \\deu[+]  [パターン]   ユーザマッピングの一覧を表示\n"
 
 #: help.c:207
-msgid "  \\dd[S]   [PATTERN]    show comments on objects\n"
-msgstr "  \\dd[S]   [パターン]   オブジェクトのコメントを表示\n"
+#, c-format
+msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
+msgstr "  \\dew[+]  [パターン]   外部データラッパーの一覧を表示\n"
 
 #: help.c:208
-msgid "  \\dD[S]   [PATTERN]    list domains\n"
-msgstr "  \\dD[S]   [パターン]   ドメイン一覧を表示\n"
+#, c-format
+msgid ""
+"  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
+msgstr "  \\df[antw][S+]   [パターン]   関数（集約/通常/トリガ/ウィンドウのみ）一覧を表示\n"
 
 #: help.c:209
-msgid "  \\des[+]  [PATTERN]    list foreign servers\n"
-msgstr "  \\des[+]  [パターン]   他のサーバ一覧を表示\n"
+#, c-format
+msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
+msgstr "  \\dF[+]   [パターン]   テキスト検索設定一覧を表示\n"
 
 #: help.c:210
-msgid "  \\deu[+]  [PATTERN]    list user mappings\n"
-msgstr "  \\deu[+]  [パターン]   ユーザマッピングの一覧を表示\n"
+#, c-format
+msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
+msgstr "  \\dFd[+]  [パターン]   テキスト検索用の辞書一覧を表示\n"
 
 #: help.c:211
-msgid "  \\dew[+]  [PATTERN]    list foreign-data wrappers\n"
-msgstr "  \\dew[+]  [パターン]   外部データラッパーの一覧を表示\n"
+#, c-format
+msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
+msgstr "  \\dFp[+]  [パターン]   テキスト検索用のパーサ一覧を表示\n"
 
 #: help.c:212
-msgid "  \\df[S+]  [PATTERN]    list functions\n"
-msgstr "  \\df[S+]  [パターン]   関数一覧を表示\n"
+#, c-format
+msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
+msgstr "  \\dFt[+]  [パターン]   テキスト検索用のテンプレート一覧を表示\n"
 
 #: help.c:213
-msgid "  \\dF[+]   [PATTERN]    list text search configurations\n"
-msgstr "  \\dF[+]   [パターン]   テキスト検索設定一覧を表示\n"
+#, c-format
+msgid "  \\dg     [PATTERN]      list roles (groups)\n"
+msgstr "  \\dg      [パターン]   ロール（グループ）の一覧を表示\n"
 
 #: help.c:214
-msgid "  \\dFd[+]  [PATTERN]    list text search dictionaries\n"
-msgstr "  \\dFd[+]  [パターン]   テキスト検索用の辞書一覧を表示\n"
+#, c-format
+msgid "  \\di[S+] [PATTERN]      list indexes\n"
+msgstr "  \\di[S+]  [パターン]   インデックスの一覧を表示\n"
 
 #: help.c:215
-msgid "  \\dFp[+]  [PATTERN]    list text search parsers\n"
-msgstr "  \\dFp[+]  [パターン]   テキスト検索用のパーサ一覧を表示\n"
+#, c-format
+msgid "  \\dl                    list large objects, same as \\lo_list\n"
+msgstr ""
+"  \\dl             ラージオブジェクトの一覧を表示。\\lo_list と同じ。\n"
 
 #: help.c:216
-msgid "  \\dFt[+]  [PATTERN]    list text search templates\n"
-msgstr "  \\dFt[+]  [パターン]   テキスト検索用のテンプレート一覧を表示\n"
+#, c-format
+msgid "  \\dn[+]  [PATTERN]      list schemas\n"
+msgstr "  \\dn[+]   [パターン]   スキーマの一覧を表示\n"
 
 #: help.c:217
-msgid "  \\dg      [PATTERN]    list roles (groups)\n"
-msgstr "  \\dg      [パターン]   ロール（グループ）の一覧を表示\n"
+#, c-format
+msgid "  \\do[S]  [PATTERN]      list operators\n"
+msgstr "  \\do[S]   [名前]       演算子の一覧を表示\n"
 
 #: help.c:218
-msgid "  \\di[S+]  [PATTERN]    list indexes\n"
-msgstr "  \\di[S+]  [パターン]   インデックスの一覧を表示\n"
+#, c-format
+msgid ""
+"  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
+msgstr ""
+"  \\dp [パターン]       テーブル、ビュー、シーケンスのアクセス権一覧を表示\n"
 
 #: help.c:219
-msgid "  \\dl                   list large objects, same as \\lo_list\n"
-msgstr "  \\dl             ラージオブジェクトの一覧を表示。\\lo_list と同じ。\n"
+#, c-format
+msgid "  \\ds[S+] [PATTERN]      list sequences\n"
+msgstr "  \\ds[S+]  [パターン]   シーケンスの一覧を表示\n"
 
 #: help.c:220
-msgid "  \\dn[+]   [PATTERN]    list schemas\n"
-msgstr "  \\dn[+]   [パターン]   スキーマの一覧を表示\n"
+#, c-format
+msgid "  \\dt[S+] [PATTERN]      list tables\n"
+msgstr "  \\dt[S+]  [パターン]   テーブルの一覧を表示\n"
 
 #: help.c:221
-msgid "  \\do[S]   [PATTERN]    list operators\n"
-msgstr "  \\do[S]   [名前]       演算子の一覧を表示\n"
+#, c-format
+msgid "  \\dT[S+] [PATTERN]      list data types\n"
+msgstr "  \\dT[S+]  [パターン]   データ型の一覧を表示\n"
 
 #: help.c:222
-msgid ""
-"  \\dp      [PATTERN]    list table, view, and sequence access privileges\n"
-msgstr ""
-"  \\dp [パターン]       テーブル、ビュー、シーケンスのアクセス権一覧を表示\n"
+#, c-format
+msgid "  \\du     [PATTERN]      list roles (users)\n"
+msgstr "  \\du      [パターン]   ロール（ユーザ）の一覧を表示\n"
 
 #: help.c:223
-msgid "   \\z      [PATTERN]    same as \\dp\n"
-msgstr "   \\z      [パターン]   \\dp と同じ\n"
+#, c-format
+msgid "  \\dv[S+] [PATTERN]      list views\n"
+msgstr "  \\dv[S+]  [パターン]   ビューの一覧を表示\n"
 
 #: help.c:224
-msgid "  \\ds[S+]  [PATTERN]    list sequences\n"
-msgstr "  \\ds[S+]  [パターン]   シーケンスの一覧を表示\n"
+#, c-format
+msgid "  \\l[+]                  list all databases\n"
+msgstr "  \\l[+]                 データベースの一覧を表示\n"
 
 #: help.c:225
-msgid "  \\dt[S+]  [PATTERN]    list tables\n"
-msgstr "  \\dt[S+]  [パターン]   テーブルの一覧を表示\n"
-
-#: help.c:226
-msgid "  \\dT[S+]  [PATTERN]    list data types\n"
-msgstr "  \\dT[S+]  [パターン]   データ型の一覧を表示\n"
-
-#: help.c:227
-msgid "  \\du      [PATTERN]    list roles (users)\n"
-msgstr "  \\du      [パターン]   ロール（ユーザ）の一覧を表示\n"
+#, c-format
+msgid "  \\z      [PATTERN]      same as \\dp\n"
+msgstr "   \\z      [パターン]   \\dp と同じ\n"
 
 #: help.c:228
-msgid "  \\dv[S+]  [PATTERN]    list views\n"
-msgstr "  \\dv[S+]  [パターン]   ビューの一覧を表示\n"
-
-#: help.c:231
 #, c-format
 msgid "Formatting\n"
 msgstr "書式設定\n"
 
-#: help.c:232
+#: help.c:229
 #, c-format
-msgid "  \\a             toggle between unaligned and aligned output mode\n"
+msgid ""
+"  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a             'unaligned' および 'aligned' 出力モードのトグル\n"
 
-#: help.c:233
+#: help.c:230
 #, c-format
-msgid "  \\C [STRING]    set table title, or unset if none\n"
+msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C タイトル    テーブルのタイトルをセット、指定がなければ解除\n"
 
-#: help.c:234
+#: help.c:231
+#, c-format
 msgid ""
-"  \\f [STRING]    show or set field separator for unaligned query output\n"
+"  \\f [STRING]            show or set field separator for unaligned query "
+"output\n"
 msgstr ""
 "  \\f [文字列]    クエリー出力の際に桁揃えを行わない(unaligned)場合に\n"
 "                  使用するフィールド区切り文字を表示または指定\n"
 
-#: help.c:235
+#: help.c:232
 #, c-format
-msgid "  \\H             toggle HTML output mode (currently %s)\n"
+msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H             HTML の出力モードをトグル(現在: %s)\n"
 
-#: help.c:237
+#: help.c:234
+#, c-format
 msgid ""
-"  \\pset NAME [VALUE]  set table output option\n"
-"                 (NAME := {format|border|expanded|fieldsep|footer|null|\n"
-"                 numericlocale|recordsep|tuples_only|title|tableattr|"
+"  \\pset NAME [VALUE]     set table output option\n"
+"                         (NAME := {format|border|expanded|fieldsep|footer|"
+"null|\n"
+"                         numericlocale|recordsep|tuples_only|title|tableattr|"
 "pager})\n"
 msgstr ""
 "  \\pset 名前 [値]    テーブル出力のオプション設定\n"
@@ -979,102 +1080,118 @@ msgstr ""
 "                 numericlocale|recordsep|tuples_only|title|tableattr|"
 "pager})\n"
 
-#: help.c:240
-msgid "  \\t [on|off]    show only rows (currently %s)\n"
-msgstr "  \\t [on|off]    行のみ表示する (現在 %s)\n"
+#: help.c:237
+#, c-format
+msgid "  \\t [on|off]            show only rows (currently %s)\n"
+msgstr "  \\t [on|off]    行のみ表示する (現在: %s)\n"
 
-#: help.c:242
-msgid "  \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
+#: help.c:239
+#, c-format
+msgid ""
+"  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
 "  \\T [文字列]    HTML の <table> タグの属性をセット。引数がなければ解除。\n"
 
-#: help.c:243
-msgid "  \\x [on|off]    toggle expanded output (currently %s)\n"
-msgstr "  \\x [on|off]    拡張出力のトグル(現在 %s)\n"
+#: help.c:240
+#, c-format
+msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
+msgstr "  \\x [on|off]    拡張出力のトグル(現在: %s)\n"
 
-#: help.c:247
+#: help.c:244
+#, c-format
 msgid "Connection\n"
 msgstr "接続\n"
 
-#: help.c:248
+#: help.c:245
 #, c-format
 msgid ""
 "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
-"                 connect to new database (currently \"%s\")\n"
+"                         connect to new database (currently \"%s\")\n"
 msgstr ""
 "  \\c[onnect] [DB名|- ユーザ名|- ホスト名|- ポート番号|-]\n"
-"                 新しいデータベースに接続する (現在は \"%s\")\n"
+"                 新しいデータベースに接続する (現在: \"%s\")\n"
 
-#: help.c:251
-msgid "  \\encoding [ENCODING]  show or set client encoding\n"
+#: help.c:248
+#, c-format
+msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr ""
 "  \\encoding [エンコーディング]\n"
 "                 クライアントのエンコーディングを表示またはセット\n"
 
-#: help.c:252
+#: help.c:249
 #, c-format
-msgid "  \\password [USERNAME]  securely change the password for a user\n"
+msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [USERNAME]  ユーザのパスワードを安全に変更する\n"
 
-#: help.c:255
+#: help.c:252
 #, c-format
-msgid "External\n"
-msgstr "外部\n"
+msgid "Operating System\n"
+msgstr "オペレーティングシステム\n"
 
-#: help.c:256
-msgid "  \\cd [DIR]         change the current working directory\n"
+#: help.c:253
+#, c-format
+msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]         カレントディレクトリを変更\n"
 
-#: help.c:257
-msgid "  \\timing [on|off]  toggle timing of commands (currently %s)\n"
-msgstr "  \\timing [on|off]  コマンドのタイミングを切り替え(現在 %s)\n"
+#: help.c:254
+#, c-format
+msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
+msgstr "  \\timing [on|off]  コマンドのタイミングを切り替え(現在: %s)\n"
 
-#: help.c:259
+#: help.c:256
+#, c-format
 msgid ""
-"  \\! [COMMAND]      execute command in shell or start interactive shell\n"
+"  \\! [COMMAND]           execute command in shell or start interactive "
+"shell\n"
 msgstr "  \\! [コマンド]  シェルでコマンドを実行、もしくは会話型シェルを起動\n"
 
-#: help.c:262
-msgid "Variable\n"
+#: help.c:259
+#, c-format
+msgid "Variables\n"
 msgstr "変数\n"
 
-#: help.c:263
-msgid "  \\prompt [TEXT] NAME  prompt user to set internal variable\n"
+#: help.c:260
+#, c-format
+msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [テキスト] 変数名    ユーザに内部変数をセットするよう促す\n"
 
-#: help.c:264
+#: help.c:261
+#, c-format
 msgid ""
-"  \\set [NAME [VALUE]]  set internal variable, or list all if no parameters\n"
+"  \\set [NAME [VALUE]]    set internal variable, or list all if no "
+"parameters\n"
 msgstr ""
-"  \\set [名前 [値]]\n"
+"  \\set [変数名 [値]]\n"
 "                 内部変数の値をセット。引数がない場合は一覧表示。\n"
 
-#: help.c:265
-msgid "  \\unset NAME          unset (delete) internal variable\n"
-msgstr "  \\unset 名前          内部変数を削除\n"
+#: help.c:262
+#, c-format
+msgid "  \\unset NAME            unset (delete) internal variable\n"
+msgstr "  \\unset 変数名          内部変数を削除\n"
 
-#: help.c:268
-msgid "Large Object\n"
+#: help.c:265
+#, c-format
+msgid "Large Objects\n"
 msgstr "ラージオブジェクト\n"
 
-#: help.c:269
+#: help.c:266
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
 "  \\lo_import FILE [COMMENT]\n"
 "  \\lo_list\n"
-"  \\lo_unlink LOBOID    large object operations\n"
+"  \\lo_unlink LOBOID      large object operations\n"
 msgstr ""
 "  \\lo_export LOBOID ファイル名\n"
 "  \\lo_import ファイル名 [コメント]\n"
 "  \\lo_list\n"
 "  \\lo_unlink LOBOID     ラージオブジェクトの操作\n"
 
-#: help.c:321
+#: help.c:318
 msgid "Available help:\n"
 msgstr "利用可能なヘルプ:\n"
 
-#: help.c:410
+#: help.c:407
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1089,7 +1206,8 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:426
+#: help.c:423
+#, c-format
 msgid ""
 "No help available for \"%-.*s\".\n"
 "Try \\h with no arguments to see available help.\n"
@@ -1098,10 +1216,12 @@ msgstr ""
 "引数なしで \\h とタイプすると、ヘルプの一覧が表示されます。\n"
 
 #: input.c:187
+#, c-format
 msgid "could not read from input file: %s\n"
 msgstr "入力ファイルから読み込めませんでした: %s\n"
 
 #: input.c:347
+#, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "ファイル \"%s\" にヒストリを保存できませんでした: %s\n"
 
@@ -1128,11 +1248,11 @@ msgstr "%s: トランザクションの状態が不明です。\n"
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:287 describe.c:95 describe.c:157 describe.c:266 describe.c:354
-#: describe.c:428 describe.c:498 describe.c:621 describe.c:1093
-#: describe.c:1864 describe.c:1994 describe.c:2278 describe.c:2340
-#: describe.c:2476 describe.c:2515 describe.c:2582 describe.c:2641
-#: describe.c:2650 describe.c:2709
+#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:337 describe.c:490
+#: describe.c:565 describe.c:636 describe.c:759 describe.c:1237
+#: describe.c:2008 describe.c:2136 describe.c:2428 describe.c:2490
+#: describe.c:2626 describe.c:2665 describe.c:2732 describe.c:2791
+#: describe.c:2800 describe.c:2859
 msgid "Description"
 msgstr "説明"
 
@@ -1147,10 +1267,10 @@ msgstr "\"\\q\" で %s を抜けます。\n"
 
 #: mainloop.c:182
 msgid "You are using psql, the command-line interface to PostgreSQL."
-msgstr ""
-"これは psql : PostgreSQL へのコマンドライン・インターフェースです。"
+msgstr "これは psql : PostgreSQL へのコマンドライン・インターフェースです。"
 
 #: mainloop.c:183
+#, c-format
 msgid ""
 "Type:  \\copyright for distribution terms\n"
 "       \\h for help with SQL commands\n"
@@ -1165,40 +1285,48 @@ msgstr ""
 "\\q で終了します。\n"
 
 #: print.c:973
+#, c-format
 msgid "(No rows)\n"
 msgstr "(行がありません)\n"
 
 #: print.c:1960
+#, c-format
 msgid "Interrupted\n"
 msgstr "中断されました\n"
 
 #: print.c:2027
+#, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
-msgstr "テーブルの内容に見出しを追加できませんでした："
-"カラム数 %d が制限を越えています。\n"
+msgstr ""
+"テーブルの内容に見出しを追加できませんでした：カラム数 %d が制限を越えていま"
+"す。\n"
 
 #: print.c:2064
+#, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
-msgstr "テーブルの内容にセルを追加できませんでした："
-"全セル数 %d が制限を越えています。\n"
+msgstr ""
+"テーブルの内容にセルを追加できませんでした：全セル数 %d が制限を越えていま"
+"す。\n"
 
 #: print.c:2263
-msgid "invalid fout format (internal error): %d"
+#, c-format
+msgid "invalid output format (internal error): %d"
 msgstr "出力フォーマットが無効（内部エラー）：%d"
 
-#: print.c:2352
+#: print.c:2351
+#, c-format
 msgid "(1 row)"
-msgstr "(1 行)"
-
-#: print.c:2354
-msgid "(%lu rows)"
-msgstr "(%lu 行)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(1 行)"
+msgstr[1] "(%lu 行)"
 
-#: startup.c:222
+#: startup.c:217
+#, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: ログファイル \"%s\" が開けません: %s\n"
 
-#: startup.c:284
+#: startup.c:279
+#, c-format
 msgid ""
 "Type \"help\" for help.\n"
 "\n"
@@ -1206,623 +1334,674 @@ msgstr ""
 "\"help\" でヘルプを表示します.\n"
 "\n"
 
-#: startup.c:430
+#: startup.c:425
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s: 表示用パラメータ \"%s\" をセットできませんでした\n"
 
-#: startup.c:469
+#: startup.c:464
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: 変数 \"%s\" を削除できませんでした\n"
 
-#: startup.c:479
+#: startup.c:474
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: 変数 \"%s\" をセットできませんでした\n"
 
-#: startup.c:516 startup.c:522
+#: startup.c:511 startup.c:517
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "詳細は '%s --help' をごらんください\n"
 
-#: startup.c:539
+#: startup.c:534
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: 警告：余分なコマンドラインオプション \"%s\" は無視されます\n"
 
-#: startup.c:604
+#: startup.c:599
 msgid "contains support for command-line editing"
 msgstr "コマンドライン編集機能のサポートが組み込まれています。"
 
-#: describe.c:68 describe.c:199 describe.c:326 describe.c:423 describe.c:543
-#: describe.c:618 describe.c:1972 describe.c:2086 describe.c:2140
-#: describe.c:2338 describe.c:2565 describe.c:2637 describe.c:2648
-#: describe.c:2707
+#: describe.c:68 describe.c:235 describe.c:462 describe.c:560 describe.c:681
+#: describe.c:756 describe.c:2114 describe.c:2234 describe.c:2289
+#: describe.c:2488 describe.c:2715 describe.c:2787 describe.c:2798
+#: describe.c:2857
 msgid "Schema"
 msgstr "スキーマ"
 
-#: describe.c:69 describe.c:144 describe.c:200 describe.c:327 describe.c:424
-#: describe.c:473 describe.c:544 describe.c:619 describe.c:1973
-#: describe.c:2087 describe.c:2141 describe.c:2269 describe.c:2339
-#: describe.c:2566 describe.c:2638 describe.c:2649 describe.c:2708
-#: describe.c:2898 describe.c:2957
+#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:561
+#: describe.c:611 describe.c:682 describe.c:757 describe.c:2115
+#: describe.c:2235 describe.c:2290 describe.c:2419 describe.c:2489
+#: describe.c:2716 describe.c:2788 describe.c:2799 describe.c:2858
+#: describe.c:3048 describe.c:3107
 msgid "Name"
 msgstr "名前"
 
-#: describe.c:70 describe.c:206 describe.c:241 describe.c:248
+#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
 msgid "Result data type"
 msgstr "結果のデータ型"
 
-#: describe.c:84 describe.c:88 describe.c:207 describe.c:242 describe.c:249
+#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
 msgid "Argument data types"
 msgstr "引数のデータ型"
 
-#: describe.c:112
+#: describe.c:113
 msgid "List of aggregate functions"
 msgstr "集約関数一覧"
 
-#: describe.c:133
+#: describe.c:134
+#, c-format
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr ""
 "このサーバのバージョン (%d.%d) はテーブルスペースをサポートしていません。\n"
 
-#: describe.c:145 describe.c:263 describe.c:474 describe.c:1980
-#: describe.c:2270 describe.c:2899 describe.c:2958
+#: describe.c:146 describe.c:334 describe.c:612 describe.c:2122
+#: describe.c:2420 describe.c:3049 describe.c:3108
 msgid "Owner"
 msgstr "所有者"
 
-#: describe.c:146
+#: describe.c:147
 msgid "Location"
 msgstr "場所"
 
-#: describe.c:174
+#: describe.c:175
 msgid "List of tablespaces"
 msgstr "テーブルスペース一覧"
 
-#: describe.c:262
+#: describe.c:212
+#, c-format
+msgid "\\df only takes [antwS+] as options\n"
+msgstr "\\dfはオプションとして[antwS+]のみを取ることができます\n"
+
+#: describe.c:218
+#, c-format
+msgid "\\df does not take a \"w\" option in %d.%d.\n"
+msgstr "%d.%d.では\\dfは\"w\"オプション受け付けません\n"
+
+#. translator: "agg" is short for "aggregate"
+#: describe.c:251 describe.c:297 describe.c:314
+msgid "agg"
+msgstr "agg（集約）"
+
+#: describe.c:252
+msgid "window"
+msgstr "window（ウィンドウ）"
+
+#: describe.c:253 describe.c:298 describe.c:315 describe.c:896
+msgid "trigger"
+msgstr "trigger（トリガ）"
+
+#: describe.c:254 describe.c:299 describe.c:316
+msgid "normal"
+msgstr "normal（通常）"
+
+#: describe.c:255 describe.c:300 describe.c:317 describe.c:684 describe.c:1222
+#: describe.c:2121 describe.c:2236 describe.c:3120
+msgid "Type"
+msgstr "型"
+
+#: describe.c:330
+msgid "immutable"
+msgstr "不変"
+
+#: describe.c:331
+msgid "stable"
+msgstr "安定"
+
+#: describe.c:332
+msgid "volatile"
+msgstr "揮発性"
+
+#: describe.c:333
 msgid "Volatility"
 msgstr "揮発性"
 
-#: describe.c:264
+#: describe.c:335
 msgid "Language"
 msgstr "言語"
 
-#: describe.c:265
+#: describe.c:336
 msgid "Source code"
 msgstr "ソースコード"
 
-#: describe.c:299
+#: describe.c:434
 msgid "List of functions"
 msgstr "関数一覧"
 
-#: describe.c:337
+#: describe.c:473
 msgid "Internal name"
 msgstr "内部名"
 
-#: describe.c:338 describe.c:490 describe.c:1990
+#: describe.c:474 describe.c:628 describe.c:2132
 msgid "Size"
 msgstr "サイズ"
 
-#: describe.c:350
+#: describe.c:486
 msgid "Elements"
 msgstr "要素"
 
-#: describe.c:392
+#: describe.c:529
 msgid "List of data types"
 msgstr "データ型一覧"
 
-#: describe.c:425
+#: describe.c:562
 msgid "Left arg type"
 msgstr "左辺の型"
 
-#: describe.c:426
+#: describe.c:563
 msgid "Right arg type"
 msgstr "右辺の型"
 
-#: describe.c:427
+#: describe.c:564
 msgid "Result type"
 msgstr "結果の型"
 
-#: describe.c:445
+#: describe.c:583
 msgid "List of operators"
 msgstr "演算子一覧"
 
-#: describe.c:475
+#: describe.c:613
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: describe.c:480
+#: describe.c:618
 msgid "Collation"
 msgstr "照合順序"
 
-#: describe.c:481
+#: describe.c:619
 msgid "Ctype"
 msgstr "Ctype(変換演算子)"
 
-#: describe.c:494
+#: describe.c:632
 msgid "Tablespace"
 msgstr "テーブルスペース"
 
-#: describe.c:511
+#: describe.c:649
 msgid "List of databases"
 msgstr "データベース一覧"
 
-#: describe.c:545 describe.c:713 describe.c:1974
+#: describe.c:683 describe.c:851 describe.c:2116
 msgid "table"
 msgstr "テーブル"
 
-#: describe.c:545 describe.c:714 describe.c:1975
+#: describe.c:683 describe.c:852 describe.c:2117
 msgid "view"
 msgstr "ビュー"
 
-#: describe.c:545 describe.c:716 describe.c:1977
+#: describe.c:683 describe.c:854 describe.c:2119
 msgid "sequence"
 msgstr "シーケンス"
 
-#: describe.c:546 describe.c:1078 describe.c:1979 describe.c:2088
-#: describe.c:2970
-msgid "Type"
-msgstr "型"
-
-#: describe.c:557
+#: describe.c:695
 msgid "Column access privileges"
 msgstr "アクセス権限を剥奪する"
 
-#: describe.c:583 describe.c:3065 describe.c:3069
+#: describe.c:721 describe.c:3215 describe.c:3219
 msgid "Access privileges"
 msgstr "アクセス権"
 
-#: describe.c:620
+#: describe.c:758
 msgid "Object"
 msgstr "オブジェクト"
 
-#: describe.c:632
+#: describe.c:770
 msgid "aggregate"
 msgstr "集約関数"
 
-#: describe.c:655
+#: describe.c:790
 msgid "function"
 msgstr "関数"
 
-#: describe.c:673
+#: describe.c:809
 msgid "operator"
 msgstr "演算子"
 
-#: describe.c:691
+#: describe.c:828
 msgid "data type"
 msgstr "データ型"
 
-#: describe.c:715 describe.c:1976
+#: describe.c:853 describe.c:2118
 msgid "index"
 msgstr "インデックス"
 
-#: describe.c:735
+#: describe.c:875
 msgid "rule"
 msgstr "ルール"
 
-#: describe.c:755
-msgid "trigger"
-msgstr "トリガ"
-
-#: describe.c:776
+#: describe.c:919
 msgid "Object descriptions"
 msgstr "オブジェクトの説明"
 
-#: describe.c:828
+#: describe.c:972
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "\"%s\" という名前のリレーションが見つかりません。\n"
 
-#: describe.c:965
+#: describe.c:1109
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "OID %s を持つリレーションが見つかりません。\n"
 
-#: describe.c:1040
+#: describe.c:1184
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "テーブル \"%s.%s\""
 
-#: describe.c:1044
+#: describe.c:1188
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "ビュー \"%s.%s\""
 
-#: describe.c:1048
+#: describe.c:1192
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "シーケンス \"%s.%s\""
 
-#: describe.c:1052
+#: describe.c:1196
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "インデックス \"%s.%s\""
 
-#: describe.c:1057
+#: describe.c:1201
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "特殊なリレーション \"%s.%s\""
 
-#: describe.c:1061
+#: describe.c:1205
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST テーブル \"%s.%s\""
 
-#: describe.c:1065
+#: describe.c:1209
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "複合型 \"%s.%s\""
 
-#: describe.c:1077
+#: describe.c:1221
 msgid "Column"
 msgstr "カラム"
 
-#: describe.c:1083
+#: describe.c:1227
 msgid "Modifiers"
 msgstr "修飾語"
 
-#: describe.c:1088
+#: describe.c:1232
 msgid "Value"
 msgstr "値"
 
-#: describe.c:1092
+#: describe.c:1236
 msgid "Storage"
 msgstr "ストレージ"
 
-#: describe.c:1134
+#: describe.c:1278
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1143
+#: describe.c:1287
+#, c-format
 msgid "default %s"
 msgstr "デフォルト %s"
 
-#: describe.c:1209
+#: describe.c:1353
 msgid "primary key, "
 msgstr "プライマリキー, "
 
-#: describe.c:1211
+#: describe.c:1355
 msgid "unique, "
 msgstr "ユニーク, "
 
-#: describe.c:1217
+#: describe.c:1361
+#, c-format
 msgid "for table \"%s.%s\""
 msgstr "テーブル \"%s.%s\" 用"
 
-#: describe.c:1221
+#: describe.c:1365
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", 述語 (%s)"
 
-#: describe.c:1224
+#: describe.c:1368
 msgid ", clustered"
 msgstr ", クラスタ化済み"
 
-#: describe.c:1227
+#: describe.c:1371
 msgid ", invalid"
 msgstr ", 無効"
 
-#: describe.c:1241
+#: describe.c:1385
 msgid "View definition:"
 msgstr "ビュー定義:"
 
-#: describe.c:1258 describe.c:1511
+#: describe.c:1402 describe.c:1655
 msgid "Rules:"
 msgstr "ルール:"
 
-#: describe.c:1305
+#: describe.c:1449
 msgid "Indexes:"
 msgstr "インデックス:"
 
-#: describe.c:1365
+#: describe.c:1509
 msgid "Check constraints:"
 msgstr "CHECK 制約:"
 
-#: describe.c:1396
+#: describe.c:1540
 msgid "Foreign-key constraints:"
 msgstr "外部キー制約:"
 
-#: describe.c:1427
+#: describe.c:1571
 msgid "Referenced by:"
 msgstr "参照元："
 
 #. translator: the first %s is a FK name, the following are
 #. * a table name and the FK definition
-#: describe.c:1432
+#: describe.c:1576
+#, c-format
 msgid "  \"%s\" IN %s %s"
 msgstr " %2$s %3$s の \"%1$s\""
 
-#: describe.c:1514
+#: describe.c:1658
 msgid "Disabled rules:"
 msgstr "無効にされたルール："
 
-#: describe.c:1517
+#: describe.c:1661
 msgid "Rules firing always:"
 msgstr "常に無視されるルール"
 
-#: describe.c:1520
+#: describe.c:1664
 msgid "Rules firing on replica only:"
 msgstr "レプリカでのみ無視されるルール"
 
-#: describe.c:1616
+#: describe.c:1760
 msgid "Triggers:"
 msgstr "トリガ:"
 
-#: describe.c:1619
+#: describe.c:1763
 msgid "Disabled triggers:"
 msgstr "無効にされたトリガ："
 
-#: describe.c:1622
+#: describe.c:1766
 msgid "Triggers firing always:"
 msgstr "常に無視されるトリガ"
 
-#: describe.c:1625
+#: describe.c:1769
 msgid "Triggers firing on replica only:"
 msgstr "レプリカでのみ無視されるトリガ"
 
-#: describe.c:1658
+#: describe.c:1802
 msgid "Inherits"
 msgstr "継承"
 
-#: describe.c:1673
+#: describe.c:1817
 msgid "Has OIDs"
 msgstr "OID を持つ"
 
-#: describe.c:1676 describe.c:2144 describe.c:2216
+#: describe.c:1820 describe.c:2293 describe.c:2366
 msgid "yes"
 msgstr "yes"
 
-#: describe.c:1676 describe.c:2144 describe.c:2216
+#: describe.c:1820 describe.c:2293 describe.c:2366
 msgid "no"
 msgstr "no"
 
-#: describe.c:1684 describe.c:2908 describe.c:2972 describe.c:3028
+#: describe.c:1828 describe.c:3058 describe.c:3122 describe.c:3178
 msgid "Options"
 msgstr "オプション"
 
-#: describe.c:1769
+#: describe.c:1913
+#, c-format
 msgid "Tablespace: \"%s\""
 msgstr "テーブルスペース \"%s\""
 
 #. translator: before this string there's an index
 #. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:1779
+#: describe.c:1923
+#, c-format
 msgid ", tablespace \"%s\""
 msgstr "テーブルスペース \"%s\""
 
-#: describe.c:1857
+#: describe.c:2001
 msgid "List of roles"
 msgstr "ロール一覧"
 
-#: describe.c:1859
+#: describe.c:2003
 msgid "Role name"
 msgstr "ロール名"
 
-#: describe.c:1860
+#: describe.c:2004
 msgid "Attributes"
 msgstr "属性"
 
-#: describe.c:1861
+#: describe.c:2005
 msgid "Member of"
 msgstr "メンバー"
 
-#: describe.c:1872
+#: describe.c:2016
 msgid "Superuser"
 msgstr "スーパーユーザ"
 
-#: describe.c:1875
+#: describe.c:2019
 msgid "No inheritance"
 msgstr "継承なし"
 
-#: describe.c:1878
+#: describe.c:2022
 msgid "Create role"
 msgstr "ロールを作成できる"
 
-#: describe.c:1881
+#: describe.c:2025
 msgid "Create DB"
 msgstr "DBを作成できる"
 
-#: describe.c:1884
+#: describe.c:2028
 msgid "Cannot login"
 msgstr "ログインできない"
 
-#: describe.c:1893
+#: describe.c:2037
 msgid "No connections"
 msgstr "接続なし"
 
-#: describe.c:1895
+#: describe.c:2039
+#, c-format
 msgid "1 connection"
-msgstr "1 個の接続"
-
-#: describe.c:1897
-msgid "%d connections"
-msgstr "%d 個の接続"
+msgid_plural "%d connections"
+msgstr[0] "1 個の接続"
+msgstr[1] "%d個の接続"
 
-#: describe.c:1978
+#: describe.c:2120
 msgid "special"
 msgstr "特殊"
 
-#: describe.c:1985
+#: describe.c:2127
 msgid "Table"
 msgstr "テーブル"
 
-#: describe.c:2038
+#: describe.c:2186
+#, c-format
 msgid "No matching relations found.\n"
 msgstr "マッチするリレーションが見つかりません\n"
 
-#: describe.c:2040
+#: describe.c:2188
+#, c-format
 msgid "No relations found.\n"
 msgstr "リレーションがありません。\n"
 
-#: describe.c:2045
+#: describe.c:2193
 msgid "List of relations"
 msgstr "リレーションの一覧"
 
-#: describe.c:2089
+#: describe.c:2237
 msgid "Modifier"
 msgstr "修飾語"
 
-#: describe.c:2090
+#: describe.c:2238
 msgid "Check"
 msgstr "チェック"
 
-#: describe.c:2107
+#: describe.c:2256
 msgid "List of domains"
 msgstr "ドメイン一覧"
 
-#: describe.c:2142
+#: describe.c:2291
 msgid "Source"
 msgstr "ソース"
 
-#: describe.c:2143
+#: describe.c:2292
 msgid "Destination"
 msgstr "宛先"
 
-#: describe.c:2145
+#: describe.c:2294
 msgid "Default?"
 msgstr "デフォルト？"
 
-#: describe.c:2162
+#: describe.c:2312
 msgid "List of conversions"
 msgstr "変換ルール一覧"
 
-#: describe.c:2213
+#: describe.c:2363
 msgid "Source type"
 msgstr "ソースの型"
 
-#: describe.c:2214
+#: describe.c:2364
 msgid "Target type"
 msgstr "ターゲットの型"
 
-#: describe.c:2215 describe.c:2475
+#: describe.c:2365 describe.c:2625
 msgid "Function"
 msgstr "関数"
 
-#: describe.c:2216
+#: describe.c:2366
 msgid "in assignment"
 msgstr "代入"
 
-#: describe.c:2217
+#: describe.c:2367
 msgid "Implicit?"
 msgstr "暗黙?"
 
-#: describe.c:2243
+#: describe.c:2393
 msgid "List of casts"
 msgstr "キャスト一覧"
 
-#: describe.c:2298
+#: describe.c:2448
 msgid "List of schemas"
 msgstr "スキーマ一覧"
 
-#: describe.c:2321 describe.c:2554 describe.c:2622 describe.c:2690
+#: describe.c:2471 describe.c:2704 describe.c:2772 describe.c:2840
+#, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr ""
 "このサーバのバージョン (%d.%d) はテーブルスペースをサポートしていません。\n"
 
-#: describe.c:2355
+#: describe.c:2505
 msgid "List of text search parsers"
 msgstr "テキスト検索用パーサ一覧"
 
-#: describe.c:2398
+#: describe.c:2548
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "テキスト検索用パーサ \"%s\" が見つかりません。\n"
 
-#: describe.c:2473
+#: describe.c:2623
 msgid "Start parse"
 msgstr "パース起動"
 
-#: describe.c:2474
+#: describe.c:2624
 msgid "Method"
 msgstr "メソッド"
 
-#: describe.c:2478
+#: describe.c:2628
 msgid "Get next token"
 msgstr "次のトークンを取得"
 
-#: describe.c:2480
+#: describe.c:2630
 msgid "End parse"
 msgstr "パース終了"
 
-#: describe.c:2482
+#: describe.c:2632
 msgid "Get headline"
 msgstr "見出しの取得"
 
-#: describe.c:2484
+#: describe.c:2634
 msgid "Get token types"
 msgstr "トークンタイプの取得"
 
-#: describe.c:2494
+#: describe.c:2644
+#, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "テキスト検索用パーサ \"%s.%s\""
 
-#: describe.c:2496
+#: describe.c:2646
+#, c-format
 msgid "Text search parser \"%s\""
 msgstr "テキスト検索用パーサ \"%s\""
 
-#: describe.c:2514
+#: describe.c:2664
 msgid "Token name"
 msgstr "トークン名"
 
-#: describe.c:2525
+#: describe.c:2675
+#, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "パーサ \"%s.%s\" のトークンタイプ"
 
-#: describe.c:2527
+#: describe.c:2677
+#, c-format
 msgid "Token types for parser \"%s\""
 msgstr "パーサ \"%s\" のトークンタイプ"
 
-#: describe.c:2576
+#: describe.c:2726
 msgid "Template"
 msgstr "テンプレート"
 
-#: describe.c:2577
+#: describe.c:2727
 msgid "Init options"
 msgstr "初期化オプション:"
 
-#: describe.c:2599
+#: describe.c:2749
 msgid "List of text search dictionaries"
 msgstr "テキスト検索用辞書の一覧"
 
-#: describe.c:2639
+#: describe.c:2789
 msgid "Init"
 msgstr "初期化"
 
-#: describe.c:2640
+#: describe.c:2790
 msgid "Lexize"
 msgstr "Lex 処理"
 
-#: describe.c:2667
+#: describe.c:2817
 msgid "List of text search templates"
 msgstr "テキスト検索用テンプレート一覧"
 
-#: describe.c:2724
+#: describe.c:2874
 msgid "List of text search configurations"
 msgstr "テキスト検索用設定一覧"
 
-#: describe.c:2768
+#: describe.c:2918
+#, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "テキスト検索用設定 \"%s\" が見つかりません。\n"
 
-#: describe.c:2834
+#: describe.c:2984
 msgid "Token"
 msgstr "トークン"
 
-#: describe.c:2835
+#: describe.c:2985
 msgid "Dictionaries"
 msgstr "辞書"
 
-#: describe.c:2846
+#: describe.c:2996
+#, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "テキスト検索用設定 \"%s.%s\""
 
-#: describe.c:2849
+#: describe.c:2999
+#, c-format
 msgid "Text search configuration \"%s\""
 msgstr "テキスト検索用設定 \"%s\""
 
-#: describe.c:2853
+#: describe.c:3003
+#, c-format
 msgid ""
 "\n"
 "Parser: \"%s.%s\""
@@ -1830,7 +2009,8 @@ msgstr ""
 "\n"
 "パーサ： \"%s.%s\""
 
-#: describe.c:2856
+#: describe.c:3006
+#, c-format
 msgid ""
 "\n"
 "Parser: \"%s\""
@@ -1838,51 +2018,51 @@ msgstr ""
 "\n"
 "パーサ：\"%s\""
 
-#: describe.c:2888
+#: describe.c:3038
+#, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr ""
 "このサーバのバージョン (%d.%d) は外部データラッパーをサポートしていません。\n"
 
-#: describe.c:2900
+#: describe.c:3050
 msgid "Validator"
-msgstr ""
+msgstr "バリデータ"
 
-#: describe.c:2924
+#: describe.c:3074
 msgid "List of foreign-data wrappers"
 msgstr "外部データラッパーの一覧"
 
-#: describe.c:2947
-msgid "The server (version %d.%d) does not support foreign-data servers.\n"
-msgstr ""
-"このサーバのバージョン (%d.%d) は外部データラッパーをサポートしていません。\n"
+#: describe.c:3097
+#, c-format
+msgid "The server (version %d.%d) does not support foreign servers.\n"
+msgstr "このサーバ(バージョン%d.%d)は外部サーバをサポートしていません。\n"
 
-#: describe.c:2959
-msgid "Foreign-data wrapper\n"
-msgstr "外部データラッパー\n"
+#: describe.c:3109
+msgid "Foreign-data wrapper"
+msgstr "外部データラッパー"
 
-#: describe.c:2971
+#: describe.c:3121
 msgid "Version"
 msgstr "バージョン"
 
-#: describe.c:2990
+#: describe.c:3140
 msgid "List of foreign servers"
 msgstr "外部サーバ一覧"
 
-#: describe.c:3013
-msgid ""
-"The server (version %d.%d) does not support foreign-data user mappings.\n"
-msgstr ""
-"このサーバのバージョン (%d) は外部データラッパーをサポートしていません。\n"
+#: describe.c:3163
+#, c-format
+msgid "The server (version %d.%d) does not support user mappings.\n"
+msgstr "このサーバ(バージョン%d.%d)はユーザマップをサポートしていません。\n"
 
-#: describe.c:3022
+#: describe.c:3172
 msgid "Server"
 msgstr "サーバ"
 
-#: describe.c:3023
-msgid "Username"
+#: describe.c:3173
+msgid "User name"
 msgstr "ユーザ名"
 
-#: describe.c:3043
+#: describe.c:3193
 msgid "List of user mappings"
 msgstr "ユーザマッピングの一覧"
 
@@ -2792,8 +2972,7 @@ msgstr ""
 "\n"
 "CREATE CAST (元の型 AS キャスト後の型)\n"
 "    WITHOUT FUNCTION\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]"
-"\n"
+"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
 "CREATE CAST (元の型 AS キャスト後の型)\n"
 "    WITH INOUT\n"
 "    [ AS ASSIGNMENT | AS IMPLICIT ]"
@@ -2844,8 +3023,8 @@ msgid ""
 "    [ [ WITH ] [ OWNER [=] dbowner ]\n"
 "           [ TEMPLATE [=] template ]\n"
 "           [ ENCODING [=] encoding ]\n"
-"           [ COLLATE [=] collate ]\n"
-"           [ CTYPE [=] 変換演算子 ]\n"
+"           [ LC_COLLATE [=] lc_collate ]\n"
+"           [ LC_CTYPE [=] lc_ctype ]\n"
 "           [ TABLESPACE [=] tablespace ]\n"
 "           [ CONNECTION LIMIT [=] connlimit ] ]"
 msgstr ""
@@ -2853,8 +3032,8 @@ msgstr ""
 "    [ [ WITH ] [ OWNER [=] データベースの所有者 ]\n"
 "           [ TEMPLATE [=] テンプレート名 ]\n"
 "           [ ENCODING [=] エンコーディング ]\n"
-"           [ COLLATE [=] 照合順序 ]\n"
-"           [ CTYPE [=] ctype ]\n"
+"           [ LC_COLLATE [=] 照合順序 ]\n"
+"           [ LC_CTYPE [=] lc_ctype ]\n"
 "           [ TABLESPACE [=] テーブルスペース名 ] ]\n"
 "           [ CONNECTION LIMIT [=] 最大接続数 ] ]"
 
@@ -3123,7 +3302,8 @@ msgid ""
 msgstr ""
 "CREATE [ OR REPLACE ] RULE ルール名 AS ON イベント\n"
 "    TO テーブル名 [ WHERE 条件 ]\n"
-"    DO [ ALSO | INSTEAD ] { NOTHING | コマンド | ( コマンド ; コマンド ... ) }"
+"    DO [ ALSO | INSTEAD ] { NOTHING | コマンド | ( コマンド ; コマン"
+"ド ... ) }"
 
 #: sql_help.h:237
 msgid "define a new schema"
@@ -4009,8 +4189,8 @@ msgid ""
 "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 msgstr ""
 "INSERT INTO テーブル名 [ ( カラム名 [, ...] ) ]\n"
-"    { DEFAULT VALUES | VALUES ( { 評価式 | DEFAULT } [, ...] ) [, ...] | "
-"クエリー文字列 }\n"
+"    { DEFAULT VALUES | VALUES ( { 評価式 | DEFAULT } [, ...] ) [, ...] | クエ"
+"リー文字列 }\n"
 "    [ RETURNING * | 出力評価式 [ AS 出力名 ] [, ...] ]"
 
 #: sql_help.h:457
@@ -4296,61 +4476,71 @@ msgstr "テーブルもしくはビューから行を取り出す"
 
 #: sql_help.h:522 sql_help.h:558 sql_help.h:582
 msgid ""
+"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
+"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
+"    * | expression [ [ AS ] output_name ] [, ...]\n"
+"    [ FROM from_item [, ...] ]\n"
+"    [ WHERE condition ]\n"
+"    [ GROUP BY expression [, ...] ]\n"
+"    [ HAVING condition [, ...] ]\n"
+"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
+"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
+"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
+"LAST } ] [, ...] ]\n"
+"    [ LIMIT { count | ALL } ]\n"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
+"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]\n"
+"\n"
+"where from_item can be one of:\n"
+"\n"
+"    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
+"    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
+"    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
+"    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "
+"[, ...] | column_definition [, ...] ) ]\n"
+"    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"
+"    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
+"( join_column [, ...] ) ]\n"
+"\n"
+"and with_query is:\n"
+"\n"
+"    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
+"\n"
+"TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
+msgstr ""
 "[ WITH [ RECURSIVE ] WITHクエリー [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( 評価式 [, ...] ) ] ]\n"
-"    * | 評価式 [ [ AS ] 出力名 ] [, ...]\n"
+"    * | 評価式 [ [ AS ] 出力項目名 ] [, ...]\n"
 "    [ FROM FROM項目 [, ...] ]\n"
 "    [ WHERE 条件 ]\n"
 "    [ GROUP BY 評価式 [, ...] ]\n"
 "    [ HAVING 条件 [, ...] ]\n"
 "    [ WINDOW ウィンドウ名 AS ( ウィンドウ定義 ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] SELECT句 ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING 演算子名 ] [ NULLS { FIRST | "
+"    [ ORDER BY 評価式 [ ASC | DESC | USING 演算子 ] [ NULLS { FIRST | "
 "LAST } ] [, ...] ]\n"
 "    [ LIMIT { 行数 | ALL } ]\n"
 "    [ OFFSET 開始行番号 [ ROW | ROWS ] ]\n"
 "    [ FETCH { FIRST | NEXT } [ 行数 ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF テーブル名 [, ...] ] [ NOWAIT ] [...] ]\n"
 "\n"
-"FROM項目は以下の通り：\n"
+"ここでFROM項目は以下のいずれかです。\n"
 "\n"
-"    [ ONLY ] テーブル名 [ * ] [ [ AS ] 別名 [ ( カラム別名 [, ...] ) ] ]\n"
-"    ( SELECT句 ) [ AS ] 別名 [ ( カラム別名 [, ...] ) ]\n"
-"    WITHクエリー名 [ [ AS ] 別名 [ ( カラム別名 [, ...] ) ] ]\n"
-"    関数名 ( [ 引数 [, ...] ] ) [ AS ] 別名 [ ( カラム別名 "
-"[, ...] | カラム定義 [, ...] ) ]\n"
-"    関数名 ( [ 引数 [, ...] ] ) AS ( カラム定義 [, ...] )\n"
-"    FROM項目 [ NATURAL ] JOINタイプ FROM項目 [ ON JOIN条件 | USING "
-"( JOIN対象カラム [, ...] ) ]\n"
+"    [ ONLY ] テーブル名 [ * ] [ [ AS ] 別名 [ ( 列の別名 [, ...] ) ] ]\n"
+"    ( select ) [ AS ] 別名 [ ( 列の別名 [, ...] ) ]\n"
+"    WITHクエリー名 [ [ AS ] 別名 [ ( 列の別名 [, ...] ) ] ]\n"
+"    関数名 ( [ 引数 [, ...] ] ) [ AS ] alias [ ( 列の別名 [, ...] | 列の定義 "
+"[, ...] ) ]\n"
+"    関数名 ( [ 引数 [, ...] ] ) AS ( 列の定義 [, ...] )\n"
+"    FROM項目 [ NATURAL ] 結合種類 FROM項目 [ ON 結合条件 | USING \"( 結合列 "
+"[, ...] ) ]\n"
 "\n"
-"WITHクエリーは以下の通り：\n"
+"WITHクエリーは以下の通りです。\n"
 "\n"
-"    WITHクエリー名 [ ( カラム名 [, ...] ) ] AS ( SELECT句 )\n"
+"    WITHクエリー名 [ ( 列名 [, ...] ) ] AS ( select )\n"
 "\n"
 "TABLE { [ ONLY ] テーブル名 [ * ] | WITHクエリー名 }"
-msgstr ""
-"SELECT [ ALL | DISTINCT [ ON ( 評価式 [, ...] ) ] ]\n"
-"    * | 評価式 [ AS 出力項目名 ] [, ...]\n"
-"    [ FROM FROM項目 [, ...] ]\n"
-"    [ WHERE 条件 ]\n"
-"    [ GROUP BY 評価式 [, ...] ]\n"
-"    [ HAVING 条件 [, ...] ]\n"
-"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] SELECT句 ]\n"
-"    [ ORDER BY 評価式 [ ASC | DESC | USING 演算子 ] [ NULLS { FIRST | "
-"LAST } ] [, ...] ]\n"
-"    [ LIMIT { 行数 | ALL } ]\n"
-"    [ OFFSET 開始行番号 ]\n"
-"    [ FOR { UPDATE | SHARE }  [ OF テーブル名 [, ...] ] [ NOWAIT ] [...] ]\n"
-"\n"
-"FROM項目は以下のいずれか：\n"
-"\n"
-"    [ ONLY ] テーブル名 [ * ] [ [ AS ] 別名 [ ( カラムの別名 [, ...] ) ] ]\n"
-"    ( SELECT句 ) [ AS ] 別名 [ ( カラムの別名 [, ...] ) ]\n"
-"    関数名 ( [ 引数 [, ...] ] ) [ AS ] 別名 [ ( カラムの別名 [, ...] | カラム"
-"定義 [, ...] ) ]\n"
-"    関数名 ( [ 引数 [, ...] ] ) AS ( カラム定義 [, ...] )\n"
-"    FROM項目 [ NATURAL ] JOINタイプ FROM項目 [ ON JOIN条件 | USING ( JOIN対象"
-"カラム [, ...] ) ]"
 
 #: sql_help.h:526
 msgid ""
@@ -4531,8 +4721,7 @@ msgid ""
 msgstr ""
 "UPDATE [ ONLY ] テーブル名 [ [ AS ] 別名 ]\n"
 "    SET { カラム名 = { 評価式 | DEFAULT } |\n"
-"          ( カラム名 [, ...] ) = ( { 評価式 | DEFAULT } [, ...] ) } "
-"[, ...]\n"
+"          ( カラム名 [, ...] ) = ( { 評価式 | DEFAULT } [, ...] ) } [, ...]\n"
 "    [ FROM FROM項目並び ]\n"
 "    [ WHERE 条件 | WHERE CURRENT OF カーソル名 ]\n"
 "    [ RETURNING * | 出力評価式 [ AS 出力名 ] [, ...] ]"
@@ -4623,3 +4812,75 @@ msgstr "子プロセスがシグナル %d で終了させられました。"
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "子プロセスが認識できないステータス %d により終了しました。"
+
+#~ msgid "  \\df[S+] [PATTERN]      list functions\n"
+#~ msgstr "  \\df[S+]  [パターン]   関数一覧を表示\n"
+
+#~ msgid "External\n"
+#~ msgstr "外部\n"
+
+#~ msgid "(%lu rows)"
+#~ msgstr "(%lu 行)"
+
+#~ msgid "%d connections"
+#~ msgstr "%d 個の接続"
+
+#~ msgid ""
+#~ "[ WITH [ RECURSIVE ] WITHクエリー [, ...] ]\n"
+#~ "SELECT [ ALL | DISTINCT [ ON ( 評価式 [, ...] ) ] ]\n"
+#~ "    * | 評価式 [ [ AS ] 出力名 ] [, ...]\n"
+#~ "    [ FROM FROM項目 [, ...] ]\n"
+#~ "    [ WHERE 条件 ]\n"
+#~ "    [ GROUP BY 評価式 [, ...] ]\n"
+#~ "    [ HAVING 条件 [, ...] ]\n"
+#~ "    [ WINDOW ウィンドウ名 AS ( ウィンドウ定義 ) [, ...] ]\n"
+#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] SELECT句 ]\n"
+#~ "    [ ORDER BY expression [ ASC | DESC | USING 演算子名 ] [ NULLS { FIRST "
+#~ "| LAST } ] [, ...] ]\n"
+#~ "    [ LIMIT { 行数 | ALL } ]\n"
+#~ "    [ OFFSET 開始行番号 [ ROW | ROWS ] ]\n"
+#~ "    [ FETCH { FIRST | NEXT } [ 行数 ] { ROW | ROWS } ONLY ]\n"
+#~ "    [ FOR { UPDATE | SHARE } [ OF テーブル名 [, ...] ] [ NOWAIT ] "
+#~ "[...] ]\n"
+#~ "\n"
+#~ "FROM項目は以下の通り：\n"
+#~ "\n"
+#~ "    [ ONLY ] テーブル名 [ * ] [ [ AS ] 別名 [ ( カラム別名 [, ...] ) ] ]\n"
+#~ "    ( SELECT句 ) [ AS ] 別名 [ ( カラム別名 [, ...] ) ]\n"
+#~ "    WITHクエリー名 [ [ AS ] 別名 [ ( カラム別名 [, ...] ) ] ]\n"
+#~ "    関数名 ( [ 引数 [, ...] ] ) [ AS ] 別名 [ ( カラム別名 [, ...] | カラ"
+#~ "ム定義 [, ...] ) ]\n"
+#~ "    関数名 ( [ 引数 [, ...] ] ) AS ( カラム定義 [, ...] )\n"
+#~ "    FROM項目 [ NATURAL ] JOINタイプ FROM項目 [ ON JOIN条件 | USING ( JOIN"
+#~ "対象カラム [, ...] ) ]\n"
+#~ "\n"
+#~ "WITHクエリーは以下の通り：\n"
+#~ "\n"
+#~ "    WITHクエリー名 [ ( カラム名 [, ...] ) ] AS ( SELECT句 )\n"
+#~ "\n"
+#~ "TABLE { [ ONLY ] テーブル名 [ * ] | WITHクエリー名 }"
+#~ msgstr ""
+#~ "SELECT [ ALL | DISTINCT [ ON ( 評価式 [, ...] ) ] ]\n"
+#~ "    * | 評価式 [ AS 出力項目名 ] [, ...]\n"
+#~ "    [ FROM FROM項目 [, ...] ]\n"
+#~ "    [ WHERE 条件 ]\n"
+#~ "    [ GROUP BY 評価式 [, ...] ]\n"
+#~ "    [ HAVING 条件 [, ...] ]\n"
+#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] SELECT句 ]\n"
+#~ "    [ ORDER BY 評価式 [ ASC | DESC | USING 演算子 ] [ NULLS { FIRST | "
+#~ "LAST } ] [, ...] ]\n"
+#~ "    [ LIMIT { 行数 | ALL } ]\n"
+#~ "    [ OFFSET 開始行番号 ]\n"
+#~ "    [ FOR { UPDATE | SHARE }  [ OF テーブル名 [, ...] ] [ NOWAIT ] "
+#~ "[...] ]\n"
+#~ "\n"
+#~ "FROM項目は以下のいずれか：\n"
+#~ "\n"
+#~ "    [ ONLY ] テーブル名 [ * ] [ [ AS ] 別名 [ ( カラムの別名 "
+#~ "[, ...] ) ] ]\n"
+#~ "    ( SELECT句 ) [ AS ] 別名 [ ( カラムの別名 [, ...] ) ]\n"
+#~ "    関数名 ( [ 引数 [, ...] ] ) [ AS ] 別名 [ ( カラムの別名 [, ...] | カ"
+#~ "ラム定義 [, ...] ) ]\n"
+#~ "    関数名 ( [ 引数 [, ...] ] ) AS ( カラム定義 [, ...] )\n"
+#~ "    FROM項目 [ NATURAL ] JOINタイプ FROM項目 [ ON JOIN条件 | USING ( JOIN"
+#~ "対象カラム [, ...] ) ]"
diff --git a/src/bin/psql/po/pt_BR.po b/src/bin/psql/po/pt_BR.po
index fbaae2c587..a60a7adc6c 100644
--- a/src/bin/psql/po/pt_BR.po
+++ b/src/bin/psql/po/pt_BR.po
@@ -1,325 +1,378 @@
-# "psql" translation to Brazilian Portuguese Language.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2008.
+# Brazilian Portuguese message translation file for psql
+# Copyright (C) 2009 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-31 00:19-0200\n"
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2009-05-06 20:24-0300\n"
 "PO-Revision-Date: 2005-11-02 10:30-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: command.c:120
+#: command.c:112
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
-msgstr "Comando inv�lido \\%s. Tente \\? para ajuda.\n"
+msgstr "Comando inválido \\%s. Tente \\? para ajuda.\n"
 
-#: command.c:122
+#: command.c:114
 #, c-format
 msgid "invalid command \\%s\n"
-msgstr "comando inv�lido \\%s\n"
+msgstr "comando inválido \\%s\n"
 
-#: command.c:133
+#: command.c:125
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: argumento extra \"%s\" ignorado\n"
 
-#: command.c:275
+#: command.c:267
 #, c-format
 msgid "could not get home directory: %s\n"
-msgstr "n�o p�de alternar para diret�rio base do usu�rio: %s\n"
+msgstr "não pôde alternar para diretório base do usuário: %s\n"
 
-#: command.c:291
+#: command.c:283
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
-msgstr "\\%s: n�o p�de mudar diret�rio para \"%s\": %s\n"
+msgstr "\\%s: não pôde mudar diretório para \"%s\": %s\n"
 
-#: command.c:325 common.c:921
+#: command.c:316 common.c:935
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Tempo: %.3f ms\n"
 
-#: command.c:449 command.c:949
+#: command.c:468 command.c:496 command.c:1035
 msgid "no query buffer\n"
 msgstr "nenhum buffer de consulta\n"
 
-#: command.c:512
+#: command.c:538
+msgid "No changes"
+msgstr "Nenhuma alteração"
+
+#: command.c:592
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
-"%s: nome da codifica��o � inv�lido ou procedimento de convers�o n�o foi "
+"%s: nome da codificação é inválido ou procedimento de conversão não foi "
 "encontrado\n"
 
-#: command.c:580 command.c:614 command.c:628 command.c:645 command.c:749
-#: command.c:799 command.c:929 command.c:960
+#: command.c:660 command.c:694 command.c:708 command.c:725 command.c:829
+#: command.c:879 command.c:1015 command.c:1046
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: faltando argumento requerido\n"
 
-#: command.c:677
+#: command.c:757
 msgid "Query buffer is empty."
-msgstr "Buffer de consulta est� vazio."
+msgstr "Buffer de consulta está vazio."
 
-#: command.c:687
+#: command.c:767
 msgid "Enter new password: "
 msgstr "Digite nova senha: "
 
-#: command.c:688
+#: command.c:768
 msgid "Enter it again: "
 msgstr "Digite-a novamente: "
 
-#: command.c:692
+#: command.c:772
 #, c-format
 msgid "Passwords didn't match.\n"
-msgstr "Senhas n�o correspondem.\n"
+msgstr "Senhas não correspondem.\n"
 
-#: command.c:710
+#: command.c:790
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Criptografia de senha falhou.\n"
 
-#: command.c:778 command.c:879 command.c:934
+#: command.c:858 command.c:959 command.c:1020
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: erro\n"
 
-#: command.c:819
+#: command.c:899
 msgid "Query buffer reset (cleared)."
 msgstr "Buffer de consulta reiniciado (limpo)."
 
-#: command.c:832
+#: command.c:912
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
-msgstr "Hist�rico escrito para arquivo \"%s/%s\".\n"
+msgstr "Histórico escrito para arquivo \"%s/%s\".\n"
 
-#: command.c:870 common.c:50 common.c:64 mainloop.c:67 print.c:56 print.c:70
-#: print.c:885
+#: command.c:950 common.c:52 common.c:66 input.c:198 mainloop.c:69
+#: mainloop.c:227 print.c:61 print.c:75
 #, c-format
 msgid "out of memory\n"
-msgstr "sem mem�ria\n"
+msgstr "sem memória\n"
 
-#: command.c:915
+#: command.c:1000
 msgid "Timing is on."
-msgstr "Tempo de execu��o est� habilitado."
+msgstr "Tempo de execução está habilitado."
 
-#: command.c:917
+#: command.c:1002
 msgid "Timing is off."
-msgstr "Tempo de execu��o est� desabilitado."
+msgstr "Tempo de execução está desabilitado."
 
-#: command.c:977 command.c:997 command.c:1395 command.c:1402 command.c:1411
-#: command.c:1421 command.c:1430 command.c:1444 command.c:1458 command.c:1491
-#: common.c:135 copy.c:509 copy.c:573
+#: command.c:1063 command.c:1083 command.c:1581 command.c:1588 command.c:1597
+#: command.c:1607 command.c:1616 command.c:1630 command.c:1647 command.c:1680
+#: common.c:137 copy.c:517 copy.c:581
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1079 startup.c:179
+#: command.c:1165 startup.c:159
 msgid "Password: "
 msgstr "Senha: "
 
-#: command.c:1086 startup.c:182 startup.c:184
+#: command.c:1172 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
-msgstr "Senha para usu�rio %s: "
+msgstr "Senha para usuário %s: "
 
-#: command.c:1182 common.c:181 common.c:458 common.c:523 common.c:809
-#: common.c:834 common.c:907 copy.c:644 copy.c:689 copy.c:818
+#: command.c:1268 command.c:2110 common.c:183 common.c:460 common.c:525
+#: common.c:811 common.c:836 common.c:920 copy.c:652 copy.c:697 copy.c:826
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1186
+#: command.c:1272
 msgid "Previous connection kept\n"
-msgstr "Conex�o anterior mantida\n"
+msgstr "Conexão anterior mantida\n"
 
-#: command.c:1190
+#: command.c:1276
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1213
+#: command.c:1300
 #, c-format
 msgid "You are now connected to database \"%s\""
-msgstr "Voc� est� conectado ao banco de dados \"%s\" agora"
+msgstr "Você está conectado ao banco de dados \"%s\" agora"
 
-#: command.c:1216
+#: command.c:1303
 #, c-format
 msgid " on host \"%s\""
-msgstr " na m�quina \"%s\""
+msgstr " na máquina \"%s\""
 
-#: command.c:1219
+#: command.c:1306
 #, c-format
 msgid " at port \"%s\""
 msgstr " na porta \"%s\""
 
-#: command.c:1222
+#: command.c:1309
 #, c-format
 msgid " as user \"%s\""
-msgstr " como usu�rio \"%s\""
+msgstr " como usuário \"%s\""
+
+#: command.c:1344
+#, c-format
+msgid "%s (%s, server %s)\n"
+msgstr "%s (%s, servidor %s)\n"
+
+#: command.c:1351
+#, c-format
+msgid ""
+"WARNING: %s version %d.%d, server version %d.%d.\n"
+"         Some psql features might not work.\n"
+msgstr ""
+"AVISO: %s versão %d.%d, servidor versão %d.%d.\n"
+"         Algumas funcionalidades do psql podem não funcionar.\n"
+
+#: command.c:1381
+#, c-format
+msgid "SSL connection (cipher: %s, bits: %i)\n"
+msgstr "conexão SSL (cifra: %s, bits: %i)\n"
+
+#: command.c:1390
+#, c-format
+msgid "SSL connection (unknown cipher)\n"
+msgstr "conexão SSL (cifra desconhecida)\n"
+"\n"
+
+#: command.c:1411
+#, c-format
+msgid ""
+"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
+"         8-bit characters might not work correctly. See psql reference\n"
+"         page \"Notes for Windows users\" for details.\n"
+msgstr ""
+"AVISO: página de código do Console (%u) difere da página de código do "
+"Windows (%u)\n"
+"         caracteres de 8 bits podem não funcionar corretamente. Veja página "
+"de\n"
+"         referência do psql \"Notes for Windows users\" para obter "
+"detalhes.\n"
 
-#: command.c:1314
+#: command.c:1500
 #, c-format
 msgid "could not start editor \"%s\"\n"
-msgstr "n�o p�de iniciar o editor \"%s\"\n"
+msgstr "não pôde iniciar o editor \"%s\"\n"
 
-#: command.c:1316
+#: command.c:1502
 msgid "could not start /bin/sh\n"
-msgstr "n�o p�de iniciar /bin/sh\n"
+msgstr "não pôde iniciar /bin/sh\n"
 
-#: command.c:1353
+#: command.c:1539
 #, c-format
 msgid "cannot locate temporary directory: %s"
-msgstr "n�o p�de localizar diret�rio tempor�rio: %s"
+msgstr "não pôde localizar diretório temporário: %s"
 
-#: command.c:1380
+#: command.c:1566
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
-msgstr "n�o p�de abrir arquivo tempor�rio \"%s\": %s\n"
+msgstr "não pôde abrir arquivo temporário \"%s\": %s\n"
 
-#: command.c:1570
-msgid "\\pset: allowed formats are unaligned, aligned, html, latex, troff-ms\n"
+#: command.c:1764
+msgid ""
+"\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
+"ms\n"
 msgstr ""
-"\\pset: formatos permitidos s�o unaligned, aligned, html, latex, troff-ms\n"
+"\\pset: formatos permitidos são unaligned, aligned, wrapped, html, latex, troff-ms\n"
 
-#: command.c:1575
+#: command.c:1769
 #, c-format
 msgid "Output format is %s.\n"
-msgstr "Formato de sa�da � %s.\n"
+msgstr "Formato de saída é %s.\n"
 
-#: command.c:1585
+#: command.c:1779
 #, c-format
 msgid "Border style is %d.\n"
-msgstr "Estilo de borda � %d.\n"
+msgstr "Estilo de borda é %d.\n"
 
-#: command.c:1597
+#: command.c:1791
 #, c-format
 msgid "Expanded display is on.\n"
-msgstr "Exibi��o expandida est� habilitada.\n"
+msgstr "Exibição expandida está habilitada.\n"
 
-#: command.c:1598
+#: command.c:1792
 #, c-format
 msgid "Expanded display is off.\n"
-msgstr "Exibi��o expandida est� desabilitada.\n"
+msgstr "Exibição expandida está desabilitada.\n"
 
-#: command.c:1611
+#: command.c:1805
 msgid "Showing locale-adjusted numeric output."
-msgstr "Exibindo formato num�rico baseado na configura��o regional."
+msgstr "Exibindo formato numérico baseado na configuração regional."
 
-#: command.c:1613
+#: command.c:1807
 msgid "Locale-adjusted numeric output is off."
-msgstr "Formato num�rico baseado no idioma est� desabilitado."
+msgstr "Formato numérico baseado no idioma está desabilitado."
 
-#: command.c:1626
+#: command.c:1820
 #, c-format
 msgid "Null display is \"%s\".\n"
-msgstr "Exibi��o nula � \"%s\".\n"
+msgstr "Exibição nula é \"%s\".\n"
 
-#: command.c:1638
+#: command.c:1832
 #, c-format
 msgid "Field separator is \"%s\".\n"
-msgstr "Separador de campos � \"%s\".\n"
+msgstr "Separador de campos é \"%s\".\n"
 
-#: command.c:1652
+#: command.c:1846
 #, c-format
 msgid "Record separator is <newline>."
-msgstr "Separador de registros � <novalinha>."
+msgstr "Separador de registros é <novalinha>."
 
-#: command.c:1654
+#: command.c:1848
 #, c-format
 msgid "Record separator is \"%s\".\n"
-msgstr "Separador de registros � \"%s\".\n"
+msgstr "Separador de registros é \"%s\".\n"
 
-#: command.c:1668
+#: command.c:1862
 msgid "Showing only tuples."
 msgstr "Mostrando apenas tuplas."
 
-#: command.c:1670
+#: command.c:1864
 msgid "Tuples only is off."
-msgstr "Somente tuplas est� desabilitado."
+msgstr "Somente tuplas está desabilitado."
 
-#: command.c:1686
+#: command.c:1880
 #, c-format
 msgid "Title is \"%s\".\n"
-msgstr "T�tulo � \"%s\".\n"
+msgstr "Título é \"%s\".\n"
 
-#: command.c:1688
+#: command.c:1882
 #, c-format
 msgid "Title is unset.\n"
-msgstr "T�tulo n�o est� definido.\n"
+msgstr "Título não está definido.\n"
 
-#: command.c:1704
+#: command.c:1898
 #, c-format
 msgid "Table attribute is \"%s\".\n"
-msgstr "Atributo de tabela � \"%s\".\n"
+msgstr "Atributo de tabela é \"%s\".\n"
 
-#: command.c:1706
+#: command.c:1900
 #, c-format
 msgid "Table attributes unset.\n"
-msgstr "Atributos de tabela n�o est�o definidos.\n"
+msgstr "Atributos de tabela não estão definidos.\n"
 
-#: command.c:1727
+#: command.c:1921
 msgid "Pager is used for long output."
-msgstr "Pagina��o � usada para sa�da longa."
+msgstr "Paginação é usada para saída longa."
 
-#: command.c:1729
+#: command.c:1923
 msgid "Pager is always used."
-msgstr "Pagina��o � sempre utilizada."
+msgstr "Paginação é sempre utilizada."
 
-#: command.c:1731
+#: command.c:1925
 msgid "Pager usage is off."
-msgstr "Uso de pagina��o est� desabilitado."
+msgstr "Uso de paginação está desabilitado."
 
-#: command.c:1745
+#: command.c:1939
 msgid "Default footer is on."
-msgstr "Rodap� padr�o est� habilitado."
+msgstr "Rodapé padrão está habilitado."
 
-#: command.c:1747
+#: command.c:1941
 msgid "Default footer is off."
-msgstr "Rodap� padr�o est� desabilitado."
+msgstr "Rodapé padrão está desabilitado."
+
+#: command.c:1952
+#, c-format
+msgid "Target width for \"wrapped\" format is %d.\n"
+msgstr "largura para formato \"wrapped\" é %d.\n"
 
-#: command.c:1753
+#: command.c:1957
 #, c-format
 msgid "\\pset: unknown option: %s\n"
-msgstr "\\pset: op��o desconhecida: %s\n"
+msgstr "\\pset: opção desconhecida: %s\n"
 
-#: command.c:1808
+#: command.c:2011
 msgid "\\!: failed\n"
 msgstr "\\!: falhou\n"
 
-#: common.c:43
+#: common.c:45
 #, c-format
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgstr "%s: pg_strdup: n�o pode duplicar ponteiro nulo (erro interno)\n"
+msgstr "%s: pg_strdup: não pode duplicar ponteiro nulo (erro interno)\n"
 
-#: common.c:88
+#: common.c:90
 msgid "out of memory"
-msgstr "sem mem�ria"
+msgstr "sem memória"
 
-#: common.c:341
+#: common.c:343
 msgid "connection to server was lost\n"
-msgstr "conex�o com servidor foi perdida\n"
+msgstr "conexão com servidor foi perdida\n"
 
-#: common.c:345
+#: common.c:347
 msgid "The connection to the server was lost. Attempting reset: "
-msgstr "A conex�o com servidor foi perdida. Tentando reiniciar: "
+msgstr "A conexão com servidor foi perdida. Tentando reiniciar: "
 
-#: common.c:350
+#: common.c:352
 msgid "Failed.\n"
 msgstr "Falhou.\n"
 
-#: common.c:357
+#: common.c:359
 msgid "Succeeded.\n"
 msgstr "Sucedido.\n"
 
-#: common.c:491 common.c:766
+#: common.c:493 common.c:768
 msgid "You are currently not connected to a database.\n"
-msgstr "Voc� n�o est� conectado ao banco de dados.\n"
+msgstr "Você não está conectado ao banco de dados.\n"
 
-#: common.c:497 common.c:504 common.c:792
+#: common.c:499 common.c:506 common.c:794
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -332,14 +385,14 @@ msgstr ""
 "**************************\n"
 "\n"
 
-#: common.c:556
+#: common.c:558
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr ""
-"Notifica��o ass�ncrona \"%s\" recebida do processo do servidor com PID %d.\n"
+"Notificação assíncrona \"%s\" recebida do processo do servidor com PID %d.\n"
 
-#: common.c:774
+#: common.c:776
 #, c-format
 msgid ""
 "***(Single step mode: verify command)"
@@ -354,57 +407,58 @@ msgstr ""
 "***(pressione Enter para prosseguir ou digite x e Enter para cancelar)"
 "********************\n"
 
-#: common.c:825
+#: common.c:827
 #, c-format
 msgid ""
-"The server version (%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+"The server (version %d.%d) does not support savepoints for "
+"ON_ERROR_ROLLBACK.\n"
 msgstr ""
-"A vers�o do servidor (%d) n�o suporta pontos de salvamento para "
+"O servidor (versão %d.%d) não suporta pontos de salvamento para "
 "ON_ERROR_ROLLBACK.\n"
 
-#: copy.c:124
+#: copy.c:120
 msgid "\\copy: arguments required\n"
-msgstr "\\copy: argumentos s�o requeridos\n"
+msgstr "\\copy: argumentos são requeridos\n"
 
-#: copy.c:391
+#: copy.c:399
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
-msgstr "\\copy: erro de an�lise em \"%s\"\n"
+msgstr "\\copy: erro de análise em \"%s\"\n"
 
-#: copy.c:393
+#: copy.c:401
 msgid "\\copy: parse error at end of line\n"
-msgstr "\\copy: erro de an�lise no fim da linha\n"
+msgstr "\\copy: erro de análise no fim da linha\n"
 
-#: copy.c:520
+#: copy.c:528
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
-msgstr "%s: n�o pode copiar de/para o diret�rio\n"
+msgstr "%s: não pode copiar de/para o diretório\n"
 
-#: copy.c:546
+#: copy.c:554
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:550 copy.c:564
+#: copy.c:558 copy.c:572
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: resposta inesperada (%d)\n"
 
-#: copy.c:619 copy.c:629
+#: copy.c:627 copy.c:637
 #, c-format
 msgid "could not write COPY data: %s\n"
-msgstr "n�o p�de escrever dados utilizando COPY: %s\n"
+msgstr "não pôde escrever dados utilizando COPY: %s\n"
 
-#: copy.c:636
+#: copy.c:644
 #, c-format
 msgid "COPY data transfer failed: %s"
-msgstr "transfer�ncia de dados utilizando COPY falhou: %s"
+msgstr "transferência de dados utilizando COPY falhou: %s"
 
-#: copy.c:684
+#: copy.c:692
 msgid "canceled by user"
-msgstr "cancelado pelo usu�rio"
+msgstr "cancelado pelo usuário"
 
-#: copy.c:699
+#: copy.c:707
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -412,7 +466,7 @@ msgstr ""
 "Informe os dados a serem copiados seguido pelo caracter de nova linha.\n"
 "Finalize com uma barra invertida e um ponto na linha."
 
-#: copy.c:811
+#: copy.c:819
 msgid "aborted because of read failure"
 msgstr "interrompido devido a falha de leitura"
 
@@ -427,615 +481,710 @@ msgstr "desabilitado"
 #: help.c:74
 #, c-format
 msgid "could not get current user name: %s\n"
-msgstr "n�o p�de obter nome de usu�rio atual: %s\n"
+msgstr "não pôde obter nome de usuário atual: %s\n"
 
-#: help.c:87
+#: help.c:86
 #, c-format
 msgid ""
-"This is psql %s, the PostgreSQL interactive terminal.\n"
+"psql is the PostgreSQL interactive terminal.\n"
 "\n"
 msgstr ""
-"Este � o psql %s, o terminal iterativo do PostgreSQL.\n"
+"psql é o terminal iterativo do PostgreSQL.\n"
 "\n"
 
-#: help.c:89
-msgid "Usage:"
-msgstr "Uso:"
+#: help.c:87
+#, c-format
+msgid "Usage:\n"
+msgstr "Uso:\n"
+
+#: help.c:88
+#, c-format
+msgid ""
+"  psql [OPTION]... [DBNAME [USERNAME]]\n"
+"\n"
+msgstr ""
+"  psql [OPÇÃO]... [NOMEBD [USUÁRIO]]\n"
+"\n"
 
 #: help.c:90
-msgid "  psql [OPTIONS]... [DBNAME [USERNAME]]\n"
-msgstr " psql [OP��ES]... [NOMEBD [USU�RIO]]\n"
+#, c-format
+msgid "General options:\n"
+msgstr "Opções gerais:\n"
 
-#: help.c:92
-msgid "General options:"
-msgstr "Op��es gerais:"
+#: help.c:95
+#, c-format
+msgid ""
+"  -c, --command=COMMAND    run only single command (SQL or internal) and "
+"exit\n"
+msgstr ""
+"  -c, --command=COMANDO    executa somente um comando (SQL ou interno) e termina\n"
 
-#: help.c:97
+#: help.c:96
 #, c-format
 msgid ""
-"  -d DBNAME       specify database name to connect to (default: \"%s\")\n"
+"  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr ""
-"  -d NOMEBD       especifica o nome do banco de dados ao qual quer se "
-"conectar (padr�o: \"%s\")\n"
+"  -d, --dbname=NOMEBD      especifica o nome do banco de dados ao qual quer se "
+"conectar (padrão: \"%s\")\n"
+
+#: help.c:97
+#, c-format
+msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
+msgstr "  -f, --file=ARQUIVO       executa comandos de um arquivo e termina\n"
 
 #: help.c:98
-msgid "  -c COMMAND      run only single command (SQL or internal) and exit"
-msgstr ""
-"  -c COMANDO      executa somente um comando (SQL ou interno) e termina"
+#, c-format
+msgid "  -l, --list               list available databases, then exit\n"
+msgstr "  -l, --list               lista os bancos de dados disponíveis e termina\n"
 
 #: help.c:99
-msgid "  -f FILENAME     execute commands from file, then exit"
-msgstr "  -f ARQUIVO      executa comandos de um arquivo e termina"
-
-#: help.c:100
-msgid "  -1 (\"one\")      execute command file as a single transaction"
+# fuzzy, c-format
+msgid ""
+"  -v, --set=, --variable=NAME=VALUE\n"
+"                           set psql variable NAME to VALUE\n"
 msgstr ""
-"  -1 (\"um\")       executa o arquivo com comandos em uma transa��o �nica"
+"  -v, --set=, --variable=NOME=VALOR\n"
+"                           define variável NOME como VALOR no psql\n"
 
 #: help.c:101
-msgid "  -l              list available databases, then exit"
-msgstr "  -l              lista os bancos de dados dispon�veis e termina"
+#, c-format
+msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
+msgstr "  -X, --no-psqlrc          não lê o arquivo de inicialização (~/.psqlrc)\n"
 
 #: help.c:102
-msgid "  -v NAME=VALUE   set psql variable NAME to VALUE"
-msgstr "  -v NOME=VALOR   define vari�vel NOME para VALOR no psql"
-
-#: help.c:103
-msgid "  -X              do not read startup file (~/.psqlrc)"
-msgstr "  -X              n�o l� o arquivo de inicializa��o (~/.psqlrc)"
+#, c-format
+msgid ""
+"  -1 (\"one\"), --single-transaction\n"
+"                           execute command file as a single transaction\n"
+msgstr ""
+"  -1 (\"um\"), --single-transaction\n"
+"                           executa comandos do arquivo como uma transação única\n"
 
 #: help.c:104
-msgid "  --help          show this help, then exit"
-msgstr "  --help          mostra esta ajuda e termina"
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   mostra esta ajuda e termina\n"
 
 #: help.c:105
-msgid "  --version       output version information, then exit"
-msgstr "  --version       mostra informa��o sobre a vers�o e termina"
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr ""
+"  --version                mostra informação sobre a versão e termina\n"
 
 #: help.c:107
+#, c-format
 msgid ""
 "\n"
-"Input and output options:"
+"Input and output options:\n"
 msgstr ""
 "\n"
-"Op��es de entrada e sa�da:"
+"Opções de entrada e saída:\n"
 
 #: help.c:108
-msgid "  -a              echo all input from script"
-msgstr "  -a              mostra toda entrada do script"
+#, c-format
+msgid "  -a, --echo-all           echo all input from script\n"
+msgstr "  -a, --echo-all           mostra toda entrada do script\n"
 
 #: help.c:109
-msgid "  -e              echo commands sent to server"
-msgstr "  -e              mostra comandos enviados ao servidor"
+#, c-format
+msgid "  -e, --echo-queries       echo commands sent to server\n"
+msgstr "  -e, --echo-queries       mostra comandos enviados ao servidor\n"
 
 #: help.c:110
-msgid "  -E              display queries that internal commands generate"
-msgstr "  -E              mostra consultas que os comandos internos geram"
+#, c-format
+msgid ""
+"  -E, --echo-hidden        display queries that internal commands generate\n"
+msgstr ""
+"  -E, --echo-hidden        mostra consultas que os comandos internos geram\n"
 
 #: help.c:111
-msgid "  -q              run quietly (no messages, only query output)"
-msgstr ""
-"  -q              executa silenciosamente (sem mensagens, somente sa�da da "
-"consulta)"
+#, c-format
+msgid "  -L, --log-file=FILENAME  send session log to file\n"
+msgstr "  -L, --log-file=ARQUIVO   envia log da sessão para arquivo\n"
 
 #: help.c:112
-msgid "  -o FILENAME     send query results to file (or |pipe)"
+#, c-format
+msgid ""
+"  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
-"  -o ARQUIVO      envia resultados da consulta para um arquivo (ou |pipe)"
+"  -n, --no-readline        desabilita edição de linha de comando melhorada (readline)\n"
 
 #: help.c:113
-msgid "  -n              disable enhanced command line editing (readline)"
-msgstr ""
-"  -n              desabilita edi��o de linha de comando melhorada (readline)"
+#, c-format
+msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
+msgstr "  -o, --output=ARQUIVO     envia resultados da consulta para um arquivo (ou |pipe)\n"
 
 #: help.c:114
-msgid "  -s              single-step mode (confirm each query)"
-msgstr "  -s              modo passo-a-passo (confirma cada consulta)"
+#, c-format
+msgid ""
+"  -q, --quiet              run quietly (no messages, only query output)\n"
+msgstr ""
+"  -q, --quiet              executa silenciosamente (sem mensagens, somente saída da "
+"consulta)\n"
 
 #: help.c:115
-msgid "  -S              single-line mode (end of line terminates SQL command)"
-msgstr ""
-"  -S              modo linha �nica (fim da linha termina o comando SQL)"
+#, c-format
+msgid "  -s, --single-step        single-step mode (confirm each query)\n"
+msgstr "  -s, --single-step        modo passo-a-passo (confirma cada consulta)\n"
 
 #: help.c:116
-msgid "  -L FILENAME     send session log to file"
-msgstr "  -L ARQUIVO      envia log da sess�o para arquivo"
+#, c-format
+msgid ""
+"  -S, --single-line        single-line mode (end of line terminates SQL "
+"command)\n"
+msgstr ""
+"  -S, --single-line        modo linha única (fim da linha termina o comando SQL)\n"
 
 #: help.c:118
+#, c-format
 msgid ""
 "\n"
-"Output format options:"
+"Output format options:\n"
 msgstr ""
 "\n"
-"Op��es para formato de sa�da:"
+"Opções para formato de saída:\n"
 
 #: help.c:119
-msgid "  -A              unaligned table output mode (-P format=unaligned)"
-msgstr ""
-"  -A              modo de sa�da em tabela desalinhada (-P format=unaligned)"
+#, c-format
+msgid "  -A, --no-align           unaligned table output mode\n"
+msgstr "  -A, --no-align           modo de saída em tabela desalinhada\n"
 
 #: help.c:120
-msgid "  -H              HTML table output mode (-P format=html)"
-msgstr "  -H              modo de sa�da em tabela HTML (-P format=html)"
-
-#: help.c:121
-msgid "  -t              print rows only (-P tuples_only)"
-msgstr "  -t              exibe somente os registros (-P tuples_only)"
-
-#: help.c:122
+#, c-format
 msgid ""
-"  -T TEXT         set HTML table tag attributes (width, border) (-P "
-"tableattr=)"
+"  -F, --field-separator=STRING\n"
+"                           set field separator (default: \"%s\")\n"
 msgstr ""
-"  -T TEXTO        define atributos do marcador table do HTML (width, border) "
-"(-P tableattr=)"
+"  -F, --field-separator=SEPARADOR\n"
+"                           define separador de campos (padrão: \"%s\")\n"
 
 #: help.c:123
-msgid "  -x              turn on expanded table output (-P expanded)"
-msgstr "  -x              habilita sa�da em tabela expandida (-P expanded)"
+#, c-format
+msgid "  -H, --html               HTML table output mode\n"
+msgstr "  -H, --html               modo de saída em tabela HTML\n"
 
 #: help.c:124
-msgid "  -P VAR[=ARG]    set printing option VAR to ARG (see \\pset command)"
+#, c-format
+msgid ""
+"  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
+"command)\n"
 msgstr ""
-"  -P VAR[=ARG]    define op��o de exibi��o VAR para ARG (veja comando \\pset)"
+"  -P, --pset=VAR[=ARG]     define opção de exibição VAR para ARG (veja comando \\pset)\n"
 
 #: help.c:125
 #, c-format
 msgid ""
-"  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"
+"  -R, --record-separator=STRING\n"
+"                           set record separator (default: newline)\n"
 msgstr ""
-"  -F SEPARADOR    define separador de campos (padr�o: \"%s\") (-P "
-"fieldsep=)\n"
+"  -R, --record-separator=SEPARADOR\n"
+"                           define separador de registros (padrão: nova linha)\n"
 
 #: help.c:127
+#, c-format
+msgid "  -t, --tuples-only        print rows only\n"
+msgstr "  -t, --tuples-only        exibe somente registros\n"
+
+#: help.c:128
+#, c-format
 msgid ""
-"  -R STRING       set record separator (default: newline) (-P recordsep=)"
+"  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
+"border)\n"
 msgstr ""
-"  -R SEPARADOR    define separador de registros (padr�o: novalinha) (-P "
-"recordsep=)"
+"  -T, --table-attr=TEXTO   define atributos do marcador table do HTML (i.e. width, border)\n"
 
 #: help.c:129
+#, c-format
+msgid "  -x, --expanded           turn on expanded table output\n"
+msgstr "  -x, --expanded           habilita saída em tabela expandida\n"
+
+#: help.c:131
+#, c-format
 msgid ""
 "\n"
-"Connection options:"
+"Connection options:\n"
 msgstr ""
 "\n"
-"Op��es de conex�o:"
+"Opções de conexão:\n"
 
-#: help.c:132
+#: help.c:134
 #, c-format
 msgid ""
-"  -h HOSTNAME     database server host or socket directory (default: \"%s"
-"\")\n"
+"  -h, --host=HOSTNAME      database server host or socket directory "
+"(default: \"%s\")\n"
 msgstr ""
-"  -h M�QUINA      m�quina do servidor de banco de dados ou diret�rio do "
-"soquete (padr�o: \"%s\")\n"
+"  -h, --host=MÁQUINA       máquina do servidor de banco de dados ou diretório do "
+"soquete (padrão: \"%s\")\n"
 
-#: help.c:133
+#: help.c:135
 msgid "local socket"
 msgstr "soquete local"
 
-#: help.c:136
+#: help.c:138
 #, c-format
-msgid "  -p PORT         database server port (default: \"%s\")\n"
-msgstr ""
-"  -P PORTA        porta do servidor de banco de dados (padr�o: \"%s\")\n"
+msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
+msgstr "  -p, --port=PORTA         porta do servidor de banco de dados (padrão: \"%s\")\n"
 
-#: help.c:142
+#: help.c:144
 #, c-format
-msgid "  -U NAME         database user name (default: \"%s\")\n"
-msgstr "  -U USU�RIO      nome de usu�rio do banco de dados (padr�o: \"%s\")\n"
+msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
+msgstr "  -U, --username=USUÁRIO   nome de usuário do banco de dados (padrão: \"%s\")\n"
 
-#: help.c:143
-msgid "  -W              force password prompt (should happen automatically)"
-msgstr "  -W              pergunta senha (pode ocorrer automaticamente)"
+#: help.c:145
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        nunca pergunta senha\n"
 
 #: help.c:146
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           pergunta senha (pode ocorrer automaticamente)\n"
+
+#: help.c:148
+#, c-format
 msgid ""
 "\n"
-"For more information, type \"\\?\" (for internal commands) or \"\\help\"\n"
-"(for SQL commands) from within psql, or consult the psql section in\n"
-"the PostgreSQL documentation.\n"
+"For more information, type \"\\?\" (for internal commands) or \"\\help"
+"\" (for SQL\n"
+"commands) from within psql, or consult the psql section in the PostgreSQL\n"
+"documentation.\n"
 "\n"
-"Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr ""
 "\n"
-"Para obter informa��es adicionais, digite \"\\?\" (para comandos internos) "
+"Para obter informações adicionais, digite \"\\?\" (para comandos internos) "
 "ou \"\\help\"\n"
-"(para comandos SQL) no psql, ou consulte a se��o do psql na\n"
-"documenta��o do PostgreSQL.\n"
+"(para comandos SQL) no psql, ou consulte a seção do psql na\n"
+"documentação do PostgreSQL.\n"
 "\n"
-"Relate erros a <pgsql-bugs@postgresql.org>."
 
-#: help.c:171
+#: help.c:151
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Relate erros a <pgsql-bugs@postgresql.org>.\n"
+
+#: help.c:169
 #, c-format
 msgid "General\n"
 msgstr "Geral\n"
 
+#: help.c:170
+#, c-format
+msgid ""
+"  \\copyright             show PostgreSQL usage and distribution terms\n"
+msgstr ""
+"  \\copyright             mostra termos de uso e distribuição do PostgreSQL\n"
+
+#: help.c:171
+#, c-format
+msgid ""
+"  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
+msgstr ""
+"  \\g [ARQUIVO] ou ;      executa consulta (e envia os resultados para arquivo ou |pipe)\n"
+
 #: help.c:172
 #, c-format
 msgid ""
-"  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
-"                 connect to new database (currently \"%s\")\n"
+"  \\h [NAME]              help on syntax of SQL commands, * for all "
+"commands\n"
 msgstr ""
-"  \\c[onnect] [NOMEBD|- USU�RIO|- M�QUINA|- PORTA|-]\n"
-"                 conecta a um outro banco de dados (atual \"%s\")\n"
+"  \\h [NOME]              mostra sintaxe dos comandos SQL, * para todos os comandos\n"
 
-#: help.c:175
+#: help.c:173
 #, c-format
-msgid "  \\cd [DIR]      change the current working directory\n"
-msgstr "  \\cd [DIRET�RIO] muda o diret�rio de trabalho atual\n"
+msgid "  \\q                     quit psql\n"
+msgstr "  \\q                     sair do psql\n"
 
 #: help.c:176
 #, c-format
-msgid "  \\copyright     show PostgreSQL usage and distribution terms\n"
-msgstr "  \\copyright     mostra termos de uso e distribui��o do PostgreSQL\n"
+msgid "Query Buffer\n"
+msgstr "Buffer de consulta\n"
 
 #: help.c:177
 #, c-format
 msgid ""
-"  \\encoding [ENCODING]\n"
-"                 show or set client encoding\n"
+"  \\e [FILE]              edit the query buffer (or file) with external "
+"editor\n"
 msgstr ""
-"  \\encoding [CODIFICA��O]\n"
-"                 mostra ou define codifica��o do cliente\n"
+"  \\e [ARQUIVO]           edita o buffer de consulta (ou arquivo) com um editor "
+"externo\n"
 
-#: help.c:179
+#: help.c:178
 #, c-format
-msgid "  \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
+msgid ""
+"  \\ef [FUNCNAME]         edit function definition with external editor\n"
 msgstr ""
-"  \\h [NOME]      mostra sintaxe dos comandos SQL, * para todos os comandos\n"
+"  \\ef [NOMEFUNÇÃO]       edita a definição de função com um editor externo\n"
+
+#: help.c:179
+#, c-format
+msgid "  \\p                     show the contents of the query buffer\n"
+msgstr "  \\p                     mostra o conteúdo do buffer de consulta\n"
 
 #: help.c:180
 #, c-format
-msgid "  \\q             quit psql\n"
-msgstr "  \\q             sair do psql\n"
+msgid "  \\r                     reset (clear) the query buffer\n"
+msgstr "  \\r                     reinicia (apaga) o buffer de consulta\n"
 
-#: help.c:181
+#: help.c:182
 #, c-format
-msgid ""
-"  \\set [NAME [VALUE]]\n"
-"                 set internal variable, or list all if no parameters\n"
-msgstr ""
-"  \\set [NOME [VALOR]]\n"
-"                 define vari�vel interna ou lista todos caso n�o tenha "
-"par�metros\n"
+msgid "  \\s [FILE]              display history or save it to file\n"
+msgstr "  \\s [ARQUIVO]           mostra histórico ou grava-o em um arquivo\n"
 
-#: help.c:183
+#: help.c:184
 #, c-format
-msgid "  \\timing        toggle timing of commands (currently %s)\n"
-msgstr ""
-"  \\timing        alterna para dura��o da execu��o de comandos (atualmente %"
-"s)\n"
+msgid "  \\w FILE                write query buffer to file\n"
+msgstr "  \\w [ARQUIVO]           escreve o buffer de consulta para arquivo\n"
 
-#: help.c:185
+#: help.c:187
 #, c-format
-msgid "  \\unset NAME    unset (delete) internal variable\n"
-msgstr "  \\unset NOME    apaga (exclui) vari�vel interna\n"
+msgid "Input/Output\n"
+msgstr "Entrada/Saída\n"
 
-#: help.c:186
+#: help.c:188
 #, c-format
 msgid ""
-"  \\prompt [TEXT] NAME\n"
-"                 prompt user to set internal variable\n"
+"  \\copy ...              perform SQL COPY with data stream to the client "
+"host\n"
 msgstr ""
-"  \\prompt [TEXTO] NOME\n"
-"                 pergunta o usu�rio ao definir uma vari�vel interna\n"
+"  \\copy ...              realiza comando SQL COPY dos dados para máquina cliente\n"
 
-#: help.c:188
+#: help.c:189
+#, c-format
+msgid "  \\echo [STRING]         write string to standard output\n"
+msgstr "  \\echo [TEXTO]         escreve cadeia de caracteres na saída padrão\n"
+
+#: help.c:190
 #, c-format
-msgid "  \\! [COMMAND]   execute command in shell or start interactive shell\n"
-msgstr "  \\! [COMANDO]   executa comando na shell ou inicia shell iterativa\n"
+msgid "  \\i FILE                execute commands from file\n"
+msgstr "  \\i ARQUIVO             executa comandos de um arquivo\n"
 
 #: help.c:191
 #, c-format
-msgid "Query Buffer\n"
-msgstr "Buffer de consulta\n"
+msgid "  \\o [FILE]              send all query results to file or |pipe\n"
+msgstr "  \\o [ARQUIVO]           envia todos os resultados da consulta para arquivo ou |pipe\n"
 
 #: help.c:192
 #, c-format
 msgid ""
-"  \\e [FILE]      edit the query buffer (or file) with external editor\n"
+"  \\qecho [STRING]        write string to query output stream (see \\o)\n"
 msgstr ""
-"  \\e [ARQUIVO]   edita o buffer de consulta (ou arquivo) com um editor "
-"externo\n"
+"  \\qecho [TEXTO]         escreve cadeia de caracteres para saída da consulta (veja \\o)\n"
 
-#: help.c:193
+#: help.c:195
 #, c-format
-msgid ""
-"  \\g [FILE]      send query buffer to server (and results to file or |"
-"pipe)\n"
-msgstr ""
-"  \\g [ARQUIVO]   envia o buffer de consulta para o servidor (e os "
-"resultados para arquivo ou |pipe)\n"
+msgid "Informational\n"
+msgstr "Informativo\n"
 
-#: help.c:194
+#: help.c:196
 #, c-format
-msgid "  \\p             show the contents of the query buffer\n"
-msgstr "  \\p             mostra o conte�do do buffer de consulta\n"
+msgid "  (options: S = show system objects, + = additional detail)\n"
+msgstr "  (opções: S = mostra objetos do sistema, + = detalhes)\n"
 
-#: help.c:195
+#: help.c:197
 #, c-format
-msgid "  \\r             reset (clear) the query buffer\n"
-msgstr "  \\r             reinicia (apaga) o buffer de consulta\n"
+msgid "  \\d[S+]                 list tables, views, and sequences\n"
+msgstr "  \\d[S+]                 lista tabelas, visões e sequências\n"
 
-#: help.c:197
+#: help.c:198
 #, c-format
-msgid "  \\s [FILE]      display history or save it to file\n"
-msgstr "  \\s [ARQUIVO]   mostra hist�rico ou grava-o em um arquivo\n"
+msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgstr "  \\d[S+]  NOME           descreve tabela, visão, sequência ou índice\n"
 
 #: help.c:199
 #, c-format
-msgid "  \\w FILE        write query buffer to file\n"
-msgstr "  \\w [ARQUIVO]   escreve o buffer de consulta para arquivo\n"
+msgid "  \\da[+]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[+]  [MODELO]       lista funções de agregação\n"
+
+#: help.c:200
+#, c-format
+msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
+msgstr "  \\db[+]  [MODELO]       lista tablespaces\n"
+
+#: help.c:201
+#, c-format
+msgid "  \\dc[S]  [PATTERN]      list conversions\n"
+msgstr "  \\dc[S]  [MODELO]       lista conversões\n"
 
 #: help.c:202
 #, c-format
-msgid "Input/Output\n"
-msgstr "Entrada/Sa�da\n"
+msgid "  \\dC     [PATTERN]      list casts\n"
+msgstr "  \\dC     [MODELO]       lista conversões de tipos\n"
 
 #: help.c:203
 #, c-format
-msgid "  \\echo [STRING] write string to standard output\n"
-msgstr "  \\echo [STRING] escreve cadeia de caracteres na sa�da padr�o\n"
+msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
+msgstr "  \\dd[S]  [MODELO]       mostra comentário do objeto\n"
 
 #: help.c:204
 #, c-format
-msgid "  \\i FILE        execute commands from file\n"
-msgstr "  \\i ARQUIVO     executa comandos de um arquivo\n"
+msgid "  \\dD[S]  [PATTERN]      list domains\n"
+msgstr "  \\dD[S]  [MODELO]       lista domínios\n"
 
 #: help.c:205
-#, c-format
-msgid "  \\o [FILE]      send all query results to file or |pipe\n"
-msgstr ""
-"  \\o [ARQUIVO]   envia todos os resultados da consulta para arquivo ou |"
-"pipe\n"
+#, fuzzy, c-format
+msgid "  \\des[+] [PATTERN]      list foreign servers\n"
+msgstr "  \\des[+] [MODELO]       lista servidores externos\n"
 
 #: help.c:206
-#, c-format
+#, fuzzy, c-format
+msgid "  \\deu[+] [PATTERN]      list user mappings\n"
+msgstr "  \\deu[+] [MODELO]       lista mapeamento de usuários\n"
+
+#: help.c:207
+#, fuzzy, c-format
+msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
+msgstr "  \\dew[+] [MODELO]       lista grupos\n"
+
+#: help.c:208
+#, fuzzy, c-format
 msgid ""
-"  \\qecho [STRING]\n"
-"                 write string to query output stream (see \\o)\n"
+"  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
 msgstr ""
-"  \\qecho [STRING]\n"
-"                 escreve cadeia de caracteres para sa�da da consulta (veja "
-"\\o)\n"
+"  \\df[antw][S+] [MODELO] lista funções [somente agg/normal/gatilho/window]\n"
+
+#: help.c:209
+#, c-format
+msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
+msgstr "  \\dF[+]  [MODELO]       lista configurações de busca textual\n"
 
 #: help.c:210
 #, c-format
-msgid "Informational\n"
-msgstr "Informativo\n"
+msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
+msgstr "  \\dFd[+] [MODELO]       lista dicionários de busca textual\n"
 
 #: help.c:211
 #, c-format
-msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
-msgstr "  \\d [NOME]      descreve tabela, �ndice, sequ�ncia ou vis�o\n"
+msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
+msgstr "  \\dFp[+] [MODELO]       lista analisadores de busca textual\n"
 
 #: help.c:212
 #, c-format
-msgid ""
-"  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
-"                 list tables/indexes/sequences/views/system tables\n"
-msgstr ""
-"  \\d{t|i|s|v|S} [MODELO] (adicione \"+\" para obter mais detalhe)\n"
-"                 lista tabelas/�ndices/sequ�ncias/vis�es/tabelas do sistema\n"
+msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
+msgstr "  \\dFt[+] [MODELO]       lista modelos de busca textual\n"
+
+#: help.c:213
+#, fuzzy, c-format
+msgid "  \\dg     [PATTERN]      list roles (groups)\n"
+msgstr "  \\dg     [MODELO]       lista roles (grupos)\n"
 
 #: help.c:214
 #, c-format
-msgid "  \\da [PATTERN]  list aggregate functions\n"
-msgstr "  \\da [MODELO]   lista fun��es de agrega��o\n"
+msgid "  \\di[S+] [PATTERN]      list indexes\n"
+msgstr "  \\di[S+] [MODELO]       lista índices\n"
 
 #: help.c:215
 #, c-format
-msgid "  \\db [PATTERN]  list tablespaces (add \"+\" for more detail)\n"
-msgstr ""
-"  \\db [MODELO]   lista tablespaces (adicione \"+\" para obter mais "
-"detalhe)\n"
+msgid "  \\dl                    list large objects, same as \\lo_list\n"
+msgstr "  \\dl                    lista objetos grandes, mesmo que \\lo_list\n"
 
 #: help.c:216
 #, c-format
-msgid "  \\dc [PATTERN]  list conversions\n"
-msgstr "  \\dc [MODELO]   lista convers�es\n"
+msgid "  \\dn[+]  [PATTERN]      list schemas\n"
+msgstr "  \\dn[+]  [MODELO]       lista esquemas\n"
 
 #: help.c:217
 #, c-format
-msgid "  \\dC            list casts\n"
-msgstr "  \\dC            lista convers�es de tipos\n"
+msgid "  \\do[S]  [PATTERN]      list operators\n"
+msgstr "  \\do[S]  [MODELO]       lista operadores\n"
 
 #: help.c:218
 #, c-format
-msgid "  \\dd [PATTERN]  show comment for object\n"
-msgstr "  \\dd [MODELO]   mostra coment�rio do objeto\n"
+msgid ""
+"  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
+msgstr ""
+"  \\dp     [MODELO]       lista privilégios de acesso de tabelas, visões e sequências\n"
 
 #: help.c:219
 #, c-format
-msgid "  \\dD [PATTERN]  list domains\n"
-msgstr "  \\dD [MODELO]   lista dom�nios\n"
+msgid "  \\ds[S+] [PATTERN]      list sequences\n"
+msgstr "  \\ds[S+] [MODELO]       lista sequências\n"
 
 #: help.c:220
 #, c-format
-msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
-msgstr ""
-"  \\df [MODELO]   lista fun��es (adicione \"+\" para obter mais detalhe)\n"
+msgid "  \\dt[S+] [PATTERN]      list tables\n"
+msgstr "  \\dt[S+] [MODELO]       lista tabelas\n"
 
 #: help.c:221
 #, c-format
-msgid ""
-"  \\dF [PATTERN]  list text search configurations (add \"+\" for more "
-"detail)\n"
-msgstr ""
-"  \\dF [MODELO]   lista configura��es de busca textual (adicione \"+\" para "
-"obter mais detalhe)\n"
+msgid "  \\dT[S+] [PATTERN]      list data types\n"
+msgstr "  \\dT[S+] [MODELO]       lista tipos de dados\n"
 
 #: help.c:222
-#, c-format
-msgid ""
-"  \\dFd [PATTERN] list text search dictionaries (add \"+\" for more detail)\n"
-msgstr ""
-"  \\dFd [MODELO]   lista dicion�rios de busca textual (adicione \"+\" para "
-"obter mais detalhe)\n"
+#, fuzzy, c-format
+msgid "  \\du     [PATTERN]      list roles (users)\n"
+msgstr "  \\du     [MODELO]       lista roles (usuários)\n"
 
 #: help.c:223
 #, c-format
-msgid "  \\dFt [PATTERN] list text search templates\n"
-msgstr "  \\dFt [MODELO]   lista modelos de busca textual\n"
+msgid "  \\dv[S+] [PATTERN]      list views\n"
+msgstr "  \\dv[S+] [MODELO]       lista visões\n"
 
 #: help.c:224
 #, c-format
-msgid ""
-"  \\dFp [PATTERN] list text search parsers (add \"+\" for more detail)\n"
-msgstr ""
-"  \\dFp [MODELO]   lista analisadores de busca textual (adicione \"+\" para "
-"obter mais detalhe)\n"
+msgid "  \\l[+]                  list all databases\n"
+msgstr "  \\l[+]                  lista todos os bancos de dados\n"
 
 #: help.c:225
 #, c-format
-msgid "  \\dg [PATTERN]  list groups\n"
-msgstr "  \\dg [MODELO]   lista grupos\n"
-
-#: help.c:226
-#, c-format
-msgid "  \\dn [PATTERN]  list schemas (add \"+\" for more detail)\n"
-msgstr ""
-"  \\dn [MODELO]   lista esquemas (adicione \"+\" para obter mais detalhe)\n"
-
-#: help.c:227
-#, c-format
-msgid "  \\do [NAME]     list operators\n"
-msgstr "  \\do [NOME]     lista operadores\n"
+msgid "  \\z      [PATTERN]      same as \\dp\n"
+msgstr "  \\z      [MODELO]       mesmo que \\dp\n"
 
 #: help.c:228
 #, c-format
-msgid "  \\dl            list large objects, same as \\lo_list\n"
-msgstr "  \\dl            lista objetos grandes, mesmo que \\lo_list\n"
+msgid "Formatting\n"
+msgstr "Formatação\n"
 
 #: help.c:229
 #, c-format
-msgid "  \\dp [PATTERN]  list table, view, and sequence access privileges\n"
+msgid ""
+"  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
-"  \\dp [MODELO]   lista privil�gios de acesso de tabelas, vis�es e "
-"sequ�ncias\n"
+"  \\a                     alterna entre modo de saída desalinhado e alinhado\n"
 
 #: help.c:230
 #, c-format
-msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
-msgstr ""
-"  \\dT [MODELO]   lista tipos de dado (adicione \"+\" para obter mais "
-"detalhe)\n"
+msgid "  \\C [STRING]            set table title, or unset if none\n"
+msgstr "  \\C [TEXTO]             define o título da tabela, ou apaga caso nada seja especificado\n"
 
 #: help.c:231
 #, c-format
-msgid "  \\du [PATTERN]  list users\n"
-msgstr "  \\du [MODELO]   lista usu�rios\n"
+msgid ""
+"  \\f [STRING]            show or set field separator for unaligned query "
+"output\n"
+msgstr ""
+"  \\f [TEXTO]             mostra ou define separador de campos para saída de consulta desalinhada\n"
 
 #: help.c:232
 #, c-format
-msgid "  \\l             list all databases (add \"+\" for more detail)\n"
-msgstr ""
-"  \\l             lista todos os bancos de dados (adicione \"+\" para obter "
-"mais detalhe)\n"
+msgid "  \\H                     toggle HTML output mode (currently %s)\n"
+msgstr "  \\H                     alterna para modo de saída em HTML (atual %s)\n"
 
-#: help.c:233
+#: help.c:234
 #, c-format
 msgid ""
-"  \\z [PATTERN]   list table, view, and sequence access privileges (same as "
-"\\dp)\n"
+"  \\pset NAME [VALUE]     set table output option\n"
+"                         (NAME := {format|border|expanded|fieldsep|footer|"
+"null|\n"
+"                         numericlocale|recordsep|tuples_only|title|tableattr|"
+"pager})\n"
 msgstr ""
-"  \\z [MODELO]    lista privil�gios de acesso de tabelas, vis�es e "
-"sequ�ncias (mesmo que \\dp)\n"
-
-#: help.c:236
-#, c-format
-msgid "Formatting\n"
-msgstr "Formata��o\n"
+"  \\pset NOME [VALOR]     define opção de saída da tabela\n"
+"                         (NOME := {format|border|expanded|fieldsep|footer|null|\n"
+"                         numericlocale|recordsep|tuples_only|title|tableattr|pager})\n"
 
 #: help.c:237
 #, c-format
-msgid "  \\a             toggle between unaligned and aligned output mode\n"
-msgstr "  \\a             alterna entre modo de sa�da desalinhado e alinhado\n"
-
-#: help.c:238
-#, c-format
-msgid "  \\C [STRING]    set table title, or unset if none\n"
-msgstr ""
-"  \\C [STRING]    define o t�tulo da tabela, ou apaga caso nada seja "
-"especificado\n"
+msgid "  \\t [on|off]            show only rows (currently %s)\n"
+msgstr "  \\t [on|off]            mostra somente registros (atual %s)\n"
 
 #: help.c:239
 #, c-format
 msgid ""
-"  \\f [STRING]    show or set field separator for unaligned query output\n"
+"  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
-"  \\f [STRING]    mostra ou define separador de campos para sa�da de "
-"consulta desalinhada\n"
+"  \\T [TEXTO]             define atributos do marcador HTML <table> ou apaga caso nada seja especificado\n"
 
 #: help.c:240
 #, c-format
-msgid "  \\H             toggle HTML output mode (currently %s)\n"
-msgstr "  \\H             alterna para modo de sa�da em HTML (atual %s)\n"
+msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
+msgstr "  \\x [on|off]            alterna para saída expandida (atual %s)\n"
 
-#: help.c:242
+#: help.c:244
 #, c-format
-msgid ""
-"  \\pset NAME [VALUE]\n"
-"                 set table output option\n"
-"                 (NAME := {format|border|expanded|fieldsep|footer|null|\n"
-"                 numericlocale|recordsep|tuples_only|title|tableattr|"
-"pager})\n"
-msgstr ""
-"  \\pset NOME [VALOR]\n"
-"                 define op��o de sa�da da tabela\n"
-"                 (NOME := {format|border|expanded|fieldsep|footer|null|\n"
-"                 numericlocale|recordsep|tuples_only|title|tableattr|"
-"pager})\n"
+msgid "Connection\n"
+msgstr "Conexão\n"
 
-#: help.c:246
+#: help.c:245
 #, c-format
-msgid "  \\t             show only rows (currently %s)\n"
-msgstr "  \\t             mostra somente registros (atual %s)\n"
+msgid ""
+"  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
+"                         connect to new database (currently \"%s\")\n"
+msgstr ""
+"  \\c[onnect] [NOMEBD|- USUÁRIO|- MÁQUINA|- PORTA|-]\n"
+"                         conecta a um outro banco de dados (atual \"%s\")\n"
 
 #: help.c:248
 #, c-format
-msgid "  \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
-msgstr ""
-"  \\T [STRING]    define atributos do marcador HTML <table> ou apaga caso "
-"nada seja especificado\n"
+msgid "  \\encoding [ENCODING]   show or set client encoding\n"
+msgstr "  \\encoding [CODIFICAÇÃO] mostra ou define codificação do cliente\n"
 
 #: help.c:249
 #, c-format
-msgid "  \\x             toggle expanded output (currently %s)\n"
-msgstr "  \\x             alterna para sa�da expandida (atual %s)\n"
+msgid "  \\password [USERNAME]   securely change the password for a user\n"
+msgstr "  \\password [USUÁRIO]    altera a senha de um usuário com segurança\n"
+
+#: help.c:252
+#, c-format
+msgid "Operating System\n"
+msgstr "Sistema Operacional\n"
 
 #: help.c:253
 #, c-format
-msgid "Copy, Large Object\n"
-msgstr "C�pia, Objetos Grandes\n"
+msgid "  \\cd [DIR]              change the current working directory\n"
+msgstr "  \\cd [DIRETÓRIO]        muda o diretório de trabalho atual\n"
 
 #: help.c:254
 #, c-format
+msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
+msgstr "  \\timing [on|off]       alterna para duração da execução de comandos (atualmente %s)\n"
+
+#: help.c:256
+#, c-format
 msgid ""
-"  \\copy ...      perform SQL COPY with data stream to the client host\n"
+"  \\! [COMMAND]           execute command in shell or start interactive "
+"shell\n"
 msgstr ""
-"  \\copy ...      realiza comando SQL COPY dos dados para m�quina cliente\n"
+"  \\! [COMANDO]           executa comando na shell ou inicia shell iterativa\n"
+
+#: help.c:259
+#, c-format
+msgid "Variables\n"
+msgstr "Variáveis\n"
+
+#: help.c:260
+#, c-format
+msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
+msgstr "  \\prompt [TEXTO] NOME   pergunta o usuário ao definir uma variável interna\n"
 
-#: help.c:255
+#: help.c:261
+#, c-format
+msgid ""
+"  \\set [NAME [VALUE]]    set internal variable, or list all if no "
+"parameters\n"
+msgstr ""
+"  \\set [NOME [VALOR]]    define variável interna ou lista todos caso não tenha parâmetros\n"
+
+#: help.c:262
+#, c-format
+msgid "  \\unset NAME            unset (delete) internal variable\n"
+msgstr "  \\unset NOME            apaga (exclui) variável interna\n"
+
+#: help.c:265
+#, c-format
+msgid "Large Objects\n"
+msgstr "Objetos Grandes\n"
+
+#: help.c:266
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
 "  \\lo_import FILE [COMMENT]\n"
 "  \\lo_list\n"
-"  \\lo_unlink LOBOID    large object operations\n"
+"  \\lo_unlink LOBOID      large object operations\n"
 msgstr ""
 "  \\lo_export OIDLOB ARQUIVO\n"
-"  \\lo_import ARQUIVO [COMENT�RIO]\n"
+"  \\lo_import ARQUIVO [COMENTÁRIO]\n"
 "  \\lo_list\n"
-"  \\lo_unlink OIDLOB    opera��es com objetos grandes\n"
+"  \\lo_unlink OIDLOB      operações com objetos grandes\n"
 
-#: help.c:307
+#: help.c:318
 msgid "Available help:\n"
-msgstr "Ajuda dispon�vel:\n"
+msgstr "Ajuda disponível:\n"
 
-#: help.c:396
+#: help.c:407
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1045,756 +1194,806 @@ msgid ""
 "\n"
 msgstr ""
 "Comando:     %s\n"
-"Descri��o:   %s\n"
+"Descrição:   %s\n"
 "Sintaxe:\n"
 "%s\n"
 "\n"
 
-#: help.c:412
+#: help.c:423
 #, c-format
 msgid ""
 "No help available for \"%-.*s\".\n"
 "Try \\h with no arguments to see available help.\n"
 msgstr ""
-"Nenhuma ajuda dispon�vel para \"%-.*s\".\n"
-"Tente \\h sem argumentos para ver a ajuda dispon�vel.\n"
+"Nenhuma ajuda disponível para \"%-.*s\".\n"
+"Tente \\h sem argumentos para ver a ajuda disponível.\n"
 
 #: input.c:187
 #, c-format
 msgid "could not read from input file: %s\n"
-msgstr "n�o p�de ler arquivo de entrada: %s\n"
+msgstr "não pôde ler arquivo de entrada: %s\n"
 
-#: input.c:340
+#: input.c:347
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
-msgstr "n�o p�de gravar hist�rico no arquivo \"%s\": %s\n"
+msgstr "não pôde gravar histórico no arquivo \"%s\": %s\n"
 
-#: input.c:345
+#: input.c:352
 msgid "history is not supported by this installation\n"
-msgstr "hist�rico n�o � suportado por esta instala��o\n"
+msgstr "histórico não é suportado por esta instalação\n"
 
 #: large_obj.c:66
 #, c-format
 msgid "%s: not connected to a database\n"
-msgstr "%s: n�o est� conectado ao banco de dados\n"
+msgstr "%s: não está conectado ao banco de dados\n"
 
 #: large_obj.c:85
 #, c-format
 msgid "%s: current transaction is aborted\n"
-msgstr "%s: transa��o atual foi interrompida\n"
+msgstr "%s: transação atual foi interrompida\n"
 
 #: large_obj.c:88
 #, c-format
 msgid "%s: unknown transaction status\n"
-msgstr "%s: status da transa��o � desconhecido\n"
+msgstr "%s: status da transação é desconhecido\n"
 
 #: large_obj.c:286
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:287 describe.c:92 describe.c:147 describe.c:239 describe.c:315
-#: describe.c:379 describe.c:431 describe.c:546 describe.c:850 describe.c:1640
-#: describe.c:1721 describe.c:1979 describe.c:2034 describe.c:2170
-#: describe.c:2209 describe.c:2269 describe.c:2321 describe.c:2330
-#: describe.c:2382
+#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:337 describe.c:490
+#: describe.c:565 describe.c:636 describe.c:759 describe.c:1237
+#: describe.c:2008 describe.c:2136 describe.c:2428 describe.c:2490
+#: describe.c:2626 describe.c:2665 describe.c:2732 describe.c:2791
+#: describe.c:2800 describe.c:2859
 msgid "Description"
-msgstr "Descri��o"
+msgstr "Descrição"
 
 #: large_obj.c:295
 msgid "Large objects"
 msgstr "Objetos grandes"
 
-#: mainloop.c:154
+#: mainloop.c:156
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "Use \"\\q\" para sair do %s.\n"
 
-#: print.c:773
+#: mainloop.c:182
+msgid "You are using psql, the command-line interface to PostgreSQL."
+msgstr "Você está utilizando o psql, um cliente de linha de comando do PostgreSQL."
+
+#: mainloop.c:183
+#, c-format
+msgid ""
+"Type:  \\copyright for distribution terms\n"
+"       \\h for help with SQL commands\n"
+"       \\? for help with psql commands\n"
+"       \\g or terminate with semicolon to execute query\n"
+"       \\q to quit\n"
+msgstr ""
+"Digite:  \\copyright para mostrar termos de distribuição\n"
+"         \\h para ajuda com comandos SQL\n"
+"         \\? para ajuda com comandos do psql\n"
+"         \\g ou terminar com ponto-e-vírgula para executar a consulta\n"
+"         \\q para sair\n"
+
+#: print.c:973
 #, c-format
 msgid "(No rows)\n"
 msgstr "(Nenhum registro)\n"
 
-#: print.c:1808
+#: print.c:1960
 #, c-format
 msgid "Interrupted\n"
 msgstr "Interrompido\n"
 
-#: print.c:1916
-#, c-format
-msgid "invalid output format (internal error): %d"
-msgstr "formato de sa�da inv�lido (erro interno): %d"
-
-#: print.c:1996
+#: print.c:2027
 #, c-format
-msgid "(1 row)"
-msgstr "(1 registro)"
+msgid "Cannot add header to table content: column count of %d exceeded.\n"
+msgstr ""
 
-#: print.c:1998
+#: print.c:2064
 #, c-format
-msgid "(%lu rows)"
-msgstr "(%lu registros)"
+msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
+msgstr ""
 
-#: startup.c:237
+#: print.c:2263
 #, c-format
-msgid "%s: could not open log file \"%s\": %s\n"
-msgstr "%s: n�o p�de abrir arquivo de log \"%s\": %s\n"
+msgid "invalid output format (internal error): %d"
+msgstr "formato de saída inválido (erro interno): %d"
 
-#: startup.c:318
+#: print.c:2351
 #, c-format
-msgid ""
-"Welcome to %s %s (server %s), the PostgreSQL interactive terminal.\n"
-"\n"
-msgstr ""
-"Bem vindo ao %s %s (servidor %s), o terminal iterativo do PostgreSQL.\n"
-"\n"
+msgid "(1 row)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(1 registro)"
+msgstr[1] "(%lu registros)"
 
-#: startup.c:322
+#: startup.c:217
 #, c-format
-msgid ""
-"Welcome to %s %s, the PostgreSQL interactive terminal.\n"
-"\n"
-msgstr ""
-"Bem vindo ao %s %s, o terminal iterativo do PostgreSQL.\n"
-"\n"
+msgid "%s: could not open log file \"%s\": %s\n"
+msgstr "%s: não pôde abrir arquivo de log \"%s\": %s\n"
 
-#: startup.c:325
+#: startup.c:279
 #, c-format
 msgid ""
-"Type:  \\copyright for distribution terms\n"
-"       \\h for help with SQL commands\n"
-"       \\? for help with psql commands\n"
-"       \\g or terminate with semicolon to execute query\n"
-"       \\q to quit\n"
+"Type \"help\" for help.\n"
 "\n"
 msgstr ""
-"Digite:  \\copyright para mostrar termos de distribui��o\n"
-"         \\h para ajuda com comandos SQL\n"
-"         \\? para ajuda com comandos do psql\n"
-"         \\g ou terminar com ponto-e-v�rgula para executar a consulta\n"
-"         \\q para sair\n"
-"\n"
-
-#: startup.c:332
-#, c-format
-msgid ""
-"WARNING:  You are connected to a server with major version %d.%d,\n"
-"but your %s client is major version %d.%d.  Some backslash commands,\n"
-"such as \\d, might not work properly.\n"
+"Digite \"help\" para ajuda.\n"
 "\n"
-msgstr ""
-"AVISO:  Voc� est� conectado ao servidor cuja vers�o � %d.%d,\n"
-"mas seu cliente %s possui a vers�o %d.%d.  Alguns comandos com barra "
-"invertida,\n"
-"tais como \\d, podem n�o funcionar corretamente.\n"
 
-#: startup.c:514
+#: startup.c:425
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
-msgstr "%s: n�o p�de definir par�metro de exibi��o \"%s\"\n"
+msgstr "%s: não pôde definir parâmetro de exibição \"%s\"\n"
 
-#: startup.c:553
+#: startup.c:464
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
-msgstr "%s: n�o p�de apagar vari�vel \"%s\"\n"
+msgstr "%s: não pôde apagar variável \"%s\"\n"
 
-#: startup.c:563
+#: startup.c:474
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
-msgstr "%s: n�o p�de definir vari�vel \"%s\"\n"
+msgstr "%s: não pôde definir variável \"%s\"\n"
 
-#: startup.c:597 startup.c:603
+#: startup.c:511 startup.c:517
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Tente \"%s --help\" para obter informa��es adicionais.\n"
+msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: startup.c:620
+#: startup.c:534
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: aviso: argumento extra de linha de comando \"%s\" ignorado\n"
 
-#: startup.c:685
+#: startup.c:599
 msgid "contains support for command-line editing"
-msgstr "cont�m suporte a edi��o em linha de comando"
-
-#: startup.c:708
-#, c-format
-msgid ""
-"SSL connection (cipher: %s, bits: %i)\n"
-"\n"
-msgstr ""
-"conex�o SSL (cifra: %s, bits: %i)\n"
-"\n"
-
-#: startup.c:730
-#, c-format
-msgid ""
-"Warning: Console code page (%u) differs from Windows code page (%u)\n"
-"         8-bit characters might not work correctly. See psql reference\n"
-"         page \"Notes for Windows users\" for details.\n"
-"\n"
-msgstr ""
-"Aviso: p�gina de c�digo do Console (%u) difere da p�gina de c�digo do "
-"Windows (%u)\n"
-"         caracteres de 8 bits podem n�o funcionar corretamente. Veja p�gina "
-"de\n"
-"         refer�ncia do psql \"Notes for Windows users\" para obter "
-"detalhes.\n"
+msgstr "contém suporte a edição em linha de comando"
 
-#: describe.c:88 describe.c:219 describe.c:300 describe.c:374 describe.c:481
-#: describe.c:543 describe.c:1707 describe.c:1820 describe.c:1871
-#: describe.c:2032 describe.c:2252 describe.c:2317 describe.c:2328
-#: describe.c:2380
+#: describe.c:68 describe.c:235 describe.c:462 describe.c:560 describe.c:681
+#: describe.c:756 describe.c:2114 describe.c:2234 describe.c:2289
+#: describe.c:2488 describe.c:2715 describe.c:2787 describe.c:2798
+#: describe.c:2857
 msgid "Schema"
 msgstr "Esquema"
 
-#: describe.c:89 describe.c:138 describe.c:220 describe.c:301 describe.c:375
-#: describe.c:421 describe.c:482 describe.c:544 describe.c:1708
-#: describe.c:1821 describe.c:1872 describe.c:1971 describe.c:2033
-#: describe.c:2253 describe.c:2318 describe.c:2329 describe.c:2381
+#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:561
+#: describe.c:611 describe.c:682 describe.c:757 describe.c:2115
+#: describe.c:2235 describe.c:2290 describe.c:2419 describe.c:2489
+#: describe.c:2716 describe.c:2788 describe.c:2799 describe.c:2858
+#: describe.c:3048 describe.c:3107
 msgid "Name"
 msgstr "Nome"
 
-#: describe.c:90 describe.c:221
+#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
 msgid "Result data type"
 msgstr "Tipo de dado do resultado"
 
-#: describe.c:91 describe.c:222
+#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
 msgid "Argument data types"
 msgstr "Tipos de dado do argumento"
 
-#: describe.c:106
+#: describe.c:113
 msgid "List of aggregate functions"
-msgstr "Lista das fun��es de agrega��o"
+msgstr "Lista das funções de agregação"
 
-#: describe.c:127
+#: describe.c:134
 #, c-format
-msgid "The server version (%d) does not support tablespaces.\n"
-msgstr "A vers�o do servidor (%d) n�o suporta tablespaces.\n"
+msgid "The server (version %d.%d) does not support tablespaces.\n"
+msgstr "O servidor (versão %d.%d) não suporta tablespaces.\n"
 
-#: describe.c:139 describe.c:236 describe.c:422 describe.c:1711
-#: describe.c:1972
+#: describe.c:146 describe.c:334 describe.c:612 describe.c:2122
+#: describe.c:2420 describe.c:3049 describe.c:3108
 msgid "Owner"
 msgstr "Dono"
 
-#: describe.c:140
+#: describe.c:147
 msgid "Location"
 msgstr "Local"
 
-#: describe.c:146 describe.c:485 describe.c:1978
-msgid "Access privileges"
-msgstr "Privil�gios de acesso"
-
-#: describe.c:164
+#: describe.c:175
 msgid "List of tablespaces"
 msgstr "Lista das tablespaces"
 
-#: describe.c:235
+#: describe.c:212
+#, c-format
+msgid "\\df only takes [antwS+] as options\n"
+msgstr "\\df só possui as opções [antwS+]\n"
+
+#: describe.c:218
+#, c-format
+msgid "\\df does not take a \"w\" option in %d.%d.\n"
+msgstr "\\df não possui a opção \"w\" na versão %d.%d.\n"
+
+#. translator: "agg" is short for "aggregate"
+#: describe.c:251 describe.c:297 describe.c:314
+msgid "agg"
+msgstr ""
+
+#: describe.c:252
+msgid "window"
+msgstr ""
+
+#: describe.c:253 describe.c:298 describe.c:315 describe.c:896
+msgid "trigger"
+msgstr "gatilho"
+
+#: describe.c:254 describe.c:299 describe.c:316
+msgid "normal"
+msgstr "normal"
+
+#: describe.c:255 describe.c:300 describe.c:317 describe.c:684 describe.c:1222
+#: describe.c:2121 describe.c:2236 describe.c:3120
+msgid "Type"
+msgstr "Tipo"
+
+#: describe.c:330
+#, fuzzy
+msgid "immutable"
+msgstr "imutável"
+
+#: describe.c:331
+msgid "stable"
+msgstr "estável"
+
+#: describe.c:332
+msgid "volatile"
+msgstr "volátil"
+
+#: describe.c:333
 msgid "Volatility"
 msgstr "Volatilidade"
 
-#: describe.c:237
+#: describe.c:335
 msgid "Language"
 msgstr "Linguagem"
 
-#: describe.c:238
+#: describe.c:336
 msgid "Source code"
-msgstr "C�digo fonte"
+msgstr "Código fonte"
 
-#: describe.c:273
+#: describe.c:434
 msgid "List of functions"
-msgstr "Lista de fun��es"
+msgstr "Lista de funções"
 
-#: describe.c:311
+#: describe.c:473
 msgid "Internal name"
 msgstr "Nome interno"
 
-#: describe.c:312
+#: describe.c:474 describe.c:628 describe.c:2132
 msgid "Size"
 msgstr "Tamanho"
 
-#: describe.c:343
+#: describe.c:486
+msgid "Elements"
+msgstr "Elementos"
+
+#: describe.c:529
 msgid "List of data types"
 msgstr "Lista de tipos de dado"
 
-#: describe.c:376
+#: describe.c:562
 msgid "Left arg type"
-msgstr "Tipo de argumento � esquerda"
+msgstr "Tipo de argumento à esquerda"
 
-#: describe.c:377
+#: describe.c:563
 msgid "Right arg type"
-msgstr "Tipo de argumento � direita"
+msgstr "Tipo de argumento à direita"
 
-#: describe.c:378
+#: describe.c:564
 msgid "Result type"
 msgstr "Tipo resultante"
 
-#: describe.c:393
+#: describe.c:583
 msgid "List of operators"
 msgstr "Lista de operadores"
 
-#: describe.c:423
+#: describe.c:613
 msgid "Encoding"
-msgstr "Codifica��o"
+msgstr "Codificação"
+
+#: describe.c:618
+#, fuzzy
+msgid "Collation"
+msgstr "Collation"
+
+#: describe.c:619
+#, fuzzy
+msgid "Ctype"
+msgstr "Ctype"
 
-#: describe.c:428
+#: describe.c:632
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:446
+#: describe.c:649
 msgid "List of databases"
 msgstr "Lista dos bancos de dados"
 
-#: describe.c:483 describe.c:622 describe.c:1709
+#: describe.c:683 describe.c:851 describe.c:2116
 msgid "table"
 msgstr "tabela"
 
-#: describe.c:483 describe.c:623 describe.c:1709
+#: describe.c:683 describe.c:852 describe.c:2117
 msgid "view"
-msgstr "vis�o"
+msgstr "visão"
 
-#: describe.c:483 describe.c:625 describe.c:1709
+#: describe.c:683 describe.c:854 describe.c:2119
 msgid "sequence"
-msgstr "sequ�ncia"
+msgstr "sequência"
 
-#: describe.c:484 describe.c:837 describe.c:1710 describe.c:1822
-msgid "Type"
-msgstr "Tipo"
+#: describe.c:695
+#, fuzzy
+msgid "Column access privileges"
+msgstr "Privilégios de acesso da coluna"
 
-#: describe.c:507
-#, c-format
-msgid "Access privileges for database \"%s\""
-msgstr "Privil�gios de acesso ao banco dados \"%s\""
+#: describe.c:721 describe.c:3215 describe.c:3219
+msgid "Access privileges"
+msgstr "Privilégios de acesso"
 
-#: describe.c:545
+#: describe.c:758
 msgid "Object"
 msgstr "Objeto"
 
-#: describe.c:557
+#: describe.c:770
 msgid "aggregate"
-msgstr "agrega��o"
+msgstr "agregação"
 
-#: describe.c:576
+#: describe.c:790
 msgid "function"
-msgstr "fun��o"
+msgstr "função"
 
-#: describe.c:590
+#: describe.c:809
 msgid "operator"
 msgstr "operador"
 
-#: describe.c:604
+#: describe.c:828
 msgid "data type"
 msgstr "tipo de dado"
 
-#: describe.c:624 describe.c:1709
+#: describe.c:853 describe.c:2118
 msgid "index"
-msgstr "�ndice"
+msgstr "índice"
 
-#: describe.c:641
+#: describe.c:875
 msgid "rule"
 msgstr "regra"
 
-#: describe.c:657
-msgid "trigger"
-msgstr "gatilho"
-
-#: describe.c:675
+#: describe.c:919
 msgid "Object descriptions"
-msgstr "Descri��es dos Objetos"
+msgstr "Descrições dos Objetos"
 
-#: describe.c:725
+#: describe.c:972
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
-msgstr "N�o encontrou nenhuma rela��o chamada \"%s\".\n"
+msgstr "Não encontrou nenhuma relação chamada \"%s\".\n"
 
-#: describe.c:820
+#: describe.c:1109
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
-msgstr "N�o encontrou nenhuma rela��o com OID %s.\n"
+msgstr "Não encontrou nenhuma relação com OID %s.\n"
 
-#: describe.c:836
-msgid "Column"
-msgstr "Coluna"
-
-#: describe.c:844
-msgid "Modifiers"
-msgstr "Modificadores"
-
-#: describe.c:952
+#: describe.c:1184
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabela \"%s.%s\""
 
-#: describe.c:956
+#: describe.c:1188
 #, c-format
 msgid "View \"%s.%s\""
-msgstr "Vis�o \"%s.%s\""
+msgstr "Visão \"%s.%s\""
 
-#: describe.c:960
+#: describe.c:1192
 #, c-format
 msgid "Sequence \"%s.%s\""
-msgstr "Sequ�ncia \"%s.%s\""
+msgstr "Sequência \"%s.%s\""
 
-#: describe.c:964
+#: describe.c:1196
 #, c-format
 msgid "Index \"%s.%s\""
-msgstr "�ndice \"%s.%s\""
+msgstr "Índice \"%s.%s\""
 
-#: describe.c:969
+#: describe.c:1201
 #, c-format
 msgid "Special relation \"%s.%s\""
-msgstr "Rela��o especial \"%s.%s\""
+msgstr "Relação especial \"%s.%s\""
 
-#: describe.c:973
+#: describe.c:1205
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "tabela TOAST \"%s.%s\""
 
-#: describe.c:977
+#: describe.c:1209
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo composto \"%s.%s\""
 
-#: describe.c:981
-#, c-format
-msgid "?%c? \"%s.%s\""
-msgstr "?%c? \"%s.%s\""
+#: describe.c:1221
+msgid "Column"
+msgstr "Coluna"
+
+#: describe.c:1227
+msgid "Modifiers"
+msgstr "Modificadores"
+
+#: describe.c:1232
+msgid "Value"
+msgstr "Valor"
+
+#: describe.c:1236
+msgid "Storage"
+msgstr "Armazenamento"
+
+#: describe.c:1278
+#, fuzzy
+msgid "not null"
+msgstr "não nulo"
+
+#. translator: default values of column definitions
+#: describe.c:1287
+#, fuzzy, c-format
+msgid "default %s"
+msgstr "valor padrão de %s"
 
-#: describe.c:1020
+#: describe.c:1353
 msgid "primary key, "
-msgstr "chave prim�ria, "
+msgstr "chave primária, "
 
-#: describe.c:1022
+#: describe.c:1355
 msgid "unique, "
 msgstr "unicidade, "
 
-#: describe.c:1028
+#: describe.c:1361
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "para tabela \"%s.%s\""
 
-#: describe.c:1032
+#: describe.c:1365
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicado (%s)"
 
-#: describe.c:1035
+#: describe.c:1368
 msgid ", clustered"
 msgstr ", agrupada"
 
-#: describe.c:1038
+#: describe.c:1371
 msgid ", invalid"
-msgstr ", inv�lido"
+msgstr ", inválido"
 
-#: describe.c:1075
-#, c-format
-msgid ""
-"View definition:\n"
-"%s"
-msgstr ""
-"Defini��o da vis�o:\n"
-"%s"
+#: describe.c:1385
+msgid "View definition:"
+msgstr "Definição da visão:"
 
-#: describe.c:1081 describe.c:1378
+#: describe.c:1402 describe.c:1655
 msgid "Rules:"
 msgstr "Regras:"
 
-#: describe.c:1253
+#: describe.c:1449
 msgid "Indexes:"
-msgstr "�ndices:"
-
-#: describe.c:1262
-#, c-format
-msgid "    \"%s\""
-msgstr "    \"%s\""
+msgstr "Índices:"
 
-#: describe.c:1309
+#: describe.c:1509
 msgid "Check constraints:"
-msgstr "Restri��es de verifica��o:"
-
-#: describe.c:1313 describe.c:1328
-#, c-format
-msgid "    \"%s\" %s"
-msgstr "    \"%s\" %s"
+msgstr "Restrições de verificação:"
 
-#: describe.c:1324
+#: describe.c:1540
 msgid "Foreign-key constraints:"
-msgstr "Restri��es de chave estrangeira:"
+msgstr "Restrições de chave estrangeira:"
+
+#: describe.c:1571
+#, fuzzy
+msgid "Referenced by:"
+msgstr "Referenciada por:"
 
-#: describe.c:1381
+#. translator: the first %s is a FK name, the following are
+#. * a table name and the FK definition
+#: describe.c:1576
+#, fuzzy, c-format
+msgid "  \"%s\" IN %s %s"
+msgstr "  \"%s\" em %s %s"
+
+#: describe.c:1658
 msgid "Disabled rules:"
 msgstr "Regras desabilitadas:"
 
-#: describe.c:1384
+#: describe.c:1661
 msgid "Rules firing always:"
 msgstr "Regras sempre disparadas:"
 
-#: describe.c:1387
+#: describe.c:1664
 msgid "Rules firing on replica only:"
-msgstr "Regras somente disparadas na r�plica:"
+msgstr "Regras somente disparadas na réplica:"
 
-#: describe.c:1455
+#: describe.c:1760
 msgid "Triggers:"
 msgstr "Gatilhos:"
 
-#: describe.c:1458
+#: describe.c:1763
 msgid "Disabled triggers:"
 msgstr "Gatilhos desabilitados:"
 
-#: describe.c:1461
+#: describe.c:1766
 msgid "Triggers firing always:"
 msgstr "Gatilhos sempre disparados:"
 
-#: describe.c:1464
+#: describe.c:1769
 msgid "Triggers firing on replica only:"
-msgstr "Gatilhos somente disparados na r�plica:"
+msgstr "Gatilhos somente disparados na réplica:"
 
-#: describe.c:1487
+#: describe.c:1802
 msgid "Inherits"
-msgstr "Heran�as"
+msgstr "Heranças"
 
-#: describe.c:1501
+#: describe.c:1817
 msgid "Has OIDs"
-msgstr "T�m OIDs"
+msgstr "Têm OIDs"
 
-#: describe.c:1504 describe.c:1628 describe.c:1630 describe.c:1632
-#: describe.c:1875 describe.c:1936
+#: describe.c:1820 describe.c:2293 describe.c:2366
 msgid "yes"
 msgstr "sim"
 
-#: describe.c:1504 describe.c:1628 describe.c:1630 describe.c:1632
-#: describe.c:1875 describe.c:1936
+#: describe.c:1820 describe.c:2293 describe.c:2366
 msgid "no"
-msgstr "n�o"
+msgstr "não"
+
+#: describe.c:1828 describe.c:3058 describe.c:3122 describe.c:3178
+msgid "Options"
+msgstr "Opções"
 
-#: describe.c:1589
+#: describe.c:1913
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: \"%s\""
 
-#: describe.c:1589
+#. translator: before this string there's an index
+#. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
+#: describe.c:1923
 #, c-format
-msgid "tablespace \"%s\""
-msgstr "tablespace \"%s\""
+msgid ", tablespace \"%s\""
+msgstr ", tablespace \"%s\""
+
+#: describe.c:2001
+msgid "List of roles"
+msgstr "Lista de roles"
 
-#: describe.c:1627
+#: describe.c:2003
 msgid "Role name"
 msgstr "Nome da role"
 
-#: describe.c:1629
+#: describe.c:2004
+msgid "Attributes"
+msgstr "Atributos"
+
+#: describe.c:2005
+msgid "Member of"
+msgstr "Membro de"
+
+#: describe.c:2016
 msgid "Superuser"
-msgstr "Super-usu�rio"
+msgstr "Super-usuário"
+
+#: describe.c:2019
+msgid "No inheritance"
+msgstr "Nenhuma herança"
 
-#: describe.c:1631
+#: describe.c:2022
 msgid "Create role"
 msgstr "Cria role"
 
-#: describe.c:1633
+#: describe.c:2025
 msgid "Create DB"
 msgstr "Cria BD"
 
-#: describe.c:1634
-msgid "no limit"
-msgstr "ilimitado"
+#: describe.c:2028
+msgid "Cannot login"
+msgstr "Não pode efetuar login"
 
-#: describe.c:1635
-msgid "Connections"
-msgstr "Conex�es"
-
-#: describe.c:1636
-msgid "Member of"
-msgstr "Membro de"
+#: describe.c:2037
+msgid "No connections"
+msgstr "Nenhuma conexão"
 
-#: describe.c:1655
-msgid "List of roles"
-msgstr "Lista de roles"
+#: describe.c:2039
+#, c-format
+msgid "1 connection"
+msgid_plural "%d connections"
+msgstr[0] "1 conexão"
+msgstr[1] "%d conexões"
 
-#: describe.c:1709
+#: describe.c:2120
 msgid "special"
 msgstr "especial"
 
-#: describe.c:1716
+#: describe.c:2127
 msgid "Table"
 msgstr "Tabela"
 
-#: describe.c:1773
+#: describe.c:2186
 #, c-format
 msgid "No matching relations found.\n"
-msgstr "Nenhuma rela��o correspondente foi encontrada.\n"
+msgstr "Nenhuma relação correspondente foi encontrada.\n"
 
-#: describe.c:1775
+#: describe.c:2188
 #, c-format
 msgid "No relations found.\n"
-msgstr "Nenhuma rela��o foi encontrada.\n"
+msgstr "Nenhuma relação foi encontrada.\n"
 
-#: describe.c:1780
+#: describe.c:2193
 msgid "List of relations"
-msgstr "Lista de rela��es"
+msgstr "Lista de relações"
 
-#: describe.c:1823
+#: describe.c:2237
 msgid "Modifier"
 msgstr "Modificador"
 
-#: describe.c:1824
+#: describe.c:2238
 msgid "Check"
-msgstr "Verifica��o"
+msgstr "Verificação"
 
-#: describe.c:1838
+#: describe.c:2256
 msgid "List of domains"
-msgstr "Lista de dom�nios"
+msgstr "Lista de domínios"
 
-#: describe.c:1873
+#: describe.c:2291
 msgid "Source"
 msgstr "Fonte"
 
-#: describe.c:1874
+#: describe.c:2292
 msgid "Destination"
 msgstr "Destino"
 
-#: describe.c:1876
+#: describe.c:2294
 msgid "Default?"
-msgstr "Padr�o?"
+msgstr "Padrão?"
 
-#: describe.c:1890
+#: describe.c:2312
 msgid "List of conversions"
-msgstr "Lista de convers�es"
+msgstr "Lista de conversões"
 
-#: describe.c:1933
+#: describe.c:2363
 msgid "Source type"
 msgstr "Tipo fonte"
 
-#: describe.c:1934
+#: describe.c:2364
 msgid "Target type"
 msgstr "Tipo alvo"
 
-#: describe.c:1935 describe.c:2169
+#: describe.c:2365 describe.c:2625
 msgid "Function"
-msgstr "Fun��o"
+msgstr "Função"
 
-#: describe.c:1936
+#: describe.c:2366
 msgid "in assignment"
-msgstr "em atribui��o"
+msgstr "em atribuição"
 
-#: describe.c:1937
+#: describe.c:2367
 msgid "Implicit?"
-msgstr "Impl�cito?"
+msgstr "Implícito?"
 
-#: describe.c:1945
+#: describe.c:2393
 msgid "List of casts"
-msgstr "Lista de convers�es de tipos"
+msgstr "Lista de conversões de tipos"
 
-#: describe.c:1999
+#: describe.c:2448
 msgid "List of schemas"
 msgstr "Lista de esquemas"
 
-#: describe.c:2049
+#: describe.c:2471 describe.c:2704 describe.c:2772 describe.c:2840
+#, c-format
+msgid "The server (version %d.%d) does not support full text search.\n"
+msgstr "O servidor (versão %d.%d) não suporta busca textual.\n"
+
+#: describe.c:2505
 msgid "List of text search parsers"
 msgstr "Lista de analisadores de busca textual"
 
-#: describe.c:2092
+#: describe.c:2548
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
-msgstr "N�o encontrou nenhum analisador de busca textual chamado \"%s\".\n"
+msgstr "Não encontrou nenhum analisador de busca textual chamado \"%s\".\n"
 
-#: describe.c:2167
+#: describe.c:2623
 msgid "Start parse"
-msgstr "Iniciar an�lise"
+msgstr "Iniciar análise"
 
-#: describe.c:2168
+#: describe.c:2624
 msgid "Method"
-msgstr "M�todo"
+msgstr "Método"
 
-#: describe.c:2172
+#: describe.c:2628
 msgid "Get next token"
-msgstr "Obter pr�ximo elemento"
+msgstr "Obter próximo elemento"
 
-#: describe.c:2174
+#: describe.c:2630
 msgid "End parse"
-msgstr "Terminar an�lise"
+msgstr "Terminar análise"
 
-#: describe.c:2176
+#: describe.c:2632
 msgid "Get headline"
 msgstr "Obter destaque"
 
-#: describe.c:2178
+#: describe.c:2634
 msgid "Get token types"
 msgstr "Obter tipos de elemento"
 
-#: describe.c:2188
+#: describe.c:2644
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analisador de busca textual \"%s.%s\""
 
-#: describe.c:2190
+#: describe.c:2646
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analisador de busca textual \"%s\""
 
-#: describe.c:2208
+#: describe.c:2664
 msgid "Token name"
 msgstr "Nome do elemento"
 
-#: describe.c:2219
+#: describe.c:2675
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipos de elemento para analisador \"%s.%s\""
 
-#: describe.c:2221
+#: describe.c:2677
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipos de elemento para analisador \"%s\""
 
-#: describe.c:2263
+#: describe.c:2726
 msgid "Template"
 msgstr "Modelo"
 
-#: describe.c:2264
+#: describe.c:2727
 msgid "Init options"
-msgstr "Op��es de inicializa��o"
+msgstr "Opções de inicialização"
 
-#: describe.c:2286
+#: describe.c:2749
 msgid "List of text search dictionaries"
-msgstr "Lista de dicion�rios de busca textual"
+msgstr "Lista de dicionários de busca textual"
 
-#: describe.c:2319
+#: describe.c:2789
 msgid "Init"
 msgstr "Inicializador"
 
-#: describe.c:2320
+#: describe.c:2790
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:2347
+#: describe.c:2817
 msgid "List of text search templates"
 msgstr "Lista de modelos de busca textual"
 
-#: describe.c:2397
+#: describe.c:2874
 msgid "List of text search configurations"
-msgstr "Lista de configura��es de busca textual"
+msgstr "Lista de configurações de busca textual"
 
-#: describe.c:2441
+#: describe.c:2918
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
-msgstr "N�o encontrou nenhuma configura��o de busca textual chamada \"%s\".\n"
+msgstr "Não encontrou nenhuma configuração de busca textual chamada \"%s\".\n"
 
-#: describe.c:2507
+#: describe.c:2984
 msgid "Token"
 msgstr "Elemento"
 
-#: describe.c:2508
+#: describe.c:2985
 msgid "Dictionaries"
-msgstr "Dicion�rios"
+msgstr "Dicionários"
 
-#: describe.c:2519
+#: describe.c:2996
 #, c-format
 msgid "Text search configuration \"%s.%s\""
-msgstr "Configura��o de busca textual \"%s.%s\""
+msgstr "Configuração de busca textual \"%s.%s\""
 
-#: describe.c:2522
+#: describe.c:2999
 #, c-format
 msgid "Text search configuration \"%s\""
-msgstr "Configura��o de busca textual \"%s\""
+msgstr "Configuração de busca textual \"%s\""
 
-#: describe.c:2526
+#: describe.c:3003
 #, c-format
 msgid ""
 "\n"
@@ -1803,7 +2002,7 @@ msgstr ""
 "\n"
 "Analisador: \"%s.%s\""
 
-#: describe.c:2529
+#: describe.c:3006
 #, c-format
 msgid ""
 "\n"
@@ -1812,9 +2011,59 @@ msgstr ""
 "\n"
 "Analisador: \"%s\""
 
-#: sql_help.h:25 sql_help.h:469
+#: describe.c:3038
+#, fuzzy, c-format
+msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
+msgstr "O servidor (versão %d.%d) não suporta tablespaces.\n"
+
+#: describe.c:3050
+msgid "Validator"
+msgstr ""
+
+#: describe.c:3074
+#, fuzzy
+msgid "List of foreign-data wrappers"
+msgstr "Lista de tipos de dado"
+
+#: describe.c:3097
+#, fuzzy, c-format
+msgid "The server (version %d.%d) does not support foreign servers.\n"
+msgstr "O servidor (versão %d.%d) não suporta servidores externos.\n"
+
+#: describe.c:3109
+msgid "Foreign-data wrapper"
+msgstr ""
+
+#: describe.c:3121
+msgid "Version"
+msgstr "Versão"
+
+#: describe.c:3140
+#, fuzzy
+msgid "List of foreign servers"
+msgstr "Lista de servidores externos"
+
+#: describe.c:3163
+#, fuzzy, c-format
+msgid "The server (version %d.%d) does not support user mappings.\n"
+msgstr "O servidor (versão %d.%d) não suporta mapeamentos de usuários.\n"
+
+#: describe.c:3172
+msgid "Server"
+msgstr "Servidor"
+
+#: describe.c:3173
+msgid "User name"
+msgstr "Nome de usuário"
+
+#: describe.c:3193
+#, fuzzy
+msgid "List of user mappings"
+msgstr "Lista de mapeamentos de usuários"
+
+#: sql_help.h:25 sql_help.h:505
 msgid "abort the current transaction"
-msgstr "transa��o atual foi interrompida"
+msgstr "transação atual foi interrompida"
 
 #: sql_help.h:26
 msgid "ABORT [ WORK | TRANSACTION ]"
@@ -1822,7 +2071,7 @@ msgstr "ABORT [ WORK | TRANSACTION ]"
 
 #: sql_help.h:29
 msgid "change the definition of an aggregate function"
-msgstr "muda a defini��o de uma fun��o de agrega��o"
+msgstr "muda a definição de uma função de agregação"
 
 #: sql_help.h:30
 msgid ""
@@ -1836,7 +2085,7 @@ msgstr ""
 
 #: sql_help.h:33
 msgid "change the definition of a conversion"
-msgstr "muda a defini��o de uma convers�o"
+msgstr "muda a definição de uma conversão"
 
 #: sql_help.h:34
 msgid ""
@@ -1862,29 +2111,34 @@ msgid ""
 "\n"
 "ALTER DATABASE name OWNER TO new_owner\n"
 "\n"
+"ALTER DATABASE name SET TABLESPACE new_tablespace\n"
+"\n"
 "ALTER DATABASE name SET configuration_parameter { TO | = } { value | "
 "DEFAULT }\n"
 "ALTER DATABASE name SET configuration_parameter FROM CURRENT\n"
 "ALTER DATABASE name RESET configuration_parameter\n"
 "ALTER DATABASE name RESET ALL"
 msgstr ""
-"ALTER DATABASE nome [ [ WITH ] op��o [ ... ] ]\n"
+"ALTER DATABASE nome [ [ WITH ] opção [ ... ] ]\n"
 "\n"
-"onde op��o pode ser:\n"
+"onde opção pode ser:\n"
 "\n"
 "    CONNECTION LIMIT limit_con\n"
 "\n"
 "ALTER DATABASE nome RENAME TO novo_nome\n"
 "\n"
 "ALTER DATABASE nome OWNER TO novo_dono\n"
-"ALTER DATABASE nome SET par�metro { TO | = } { valor | DEFAULT }\n"
-"ALTER DATABASE nome SET par�metro_configura��o FROM CURRENT\n"
-"ALTER DATABASE nome RESET par�metro_configura��o\n"
+"\n"
+"ALTER DATABASE name SET TABLESPACE nome_tablespace\n"
+"\n"
+"ALTER DATABASE nome SET parâmetro { TO | = } { valor | DEFAULT }\n"
+"ALTER DATABASE nome SET parâmetro_configuração FROM CURRENT\n"
+"ALTER DATABASE nome RESET parâmetro_configuração\n"
 "ALTER DATABASE nome RESET ALL"
 
 #: sql_help.h:41
 msgid "change the definition of a domain"
-msgstr "muda a defini��o de um dom�nio"
+msgstr "muda a definição de um domínio"
 
 #: sql_help.h:42
 msgid ""
@@ -1902,24 +2156,41 @@ msgid ""
 "    SET SCHEMA new_schema"
 msgstr ""
 "ALTER DOMAIN nome\n"
-"    { SET DEFAULT express�o | DROP DEFAULT }\n"
+"    { SET DEFAULT expressão | DROP DEFAULT }\n"
 "ALTER DOMAIN nome\n"
 "    { SET | DROP } NOT NULL\n"
 "ALTER DOMAIN nome\n"
-"    ADD restri��o_dom�nio\n"
+"    ADD restrição_domínio\n"
 "ALTER DOMAIN nome\n"
-"    DROP CONSTRAINT nome_restri��o [ RESTRICT | CASCADE ]\n"
+"    DROP CONSTRAINT nome_restrição [ RESTRICT | CASCADE ]\n"
 "ALTER DOMAIN nome\n"
 "    OWNER TO novo_dono\n"
 "ALTER DOMAIN nome\n"
 "    SET SCHEMA novo_esquema"
 
 #: sql_help.h:45
-msgid "change the definition of a function"
-msgstr "muda a defini��o de uma fun��o"
+#, fuzzy
+msgid "change the definition of a foreign-data wrapper"
+msgstr "muda a definição de um gatilho"
 
 #: sql_help.h:46
 msgid ""
+"ALTER FOREIGN DATA WRAPPER name\n"
+"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ]) ]\n"
+"ALTER FOREIGN DATA WRAPPER name OWNER TO new_owner"
+msgstr ""
+"ALTER FOREIGN DATA WRAPPER nome\n"
+"    [ VALIDATOR função_validação | NO VALIDATOR ]\n"
+"    [ OPTIONS ( [ ADD | SET | DROP ] opção ['valor'] [, ... ]) ]\n"
+"ALTER FOREIGN DATA WRAPPER nome OWNER TO novo_dono"
+
+#: sql_help.h:49
+msgid "change the definition of a function"
+msgstr "muda a definição de uma função"
+
+#: sql_help.h:50
+msgid ""
 "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
 "    action [ ... ] [ RESTRICT ]\n"
 "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
@@ -1942,7 +2213,7 @@ msgid ""
 "    RESET ALL"
 msgstr ""
 "ALTER FUNCTION nome ( [ [ modo ] [ nome ] tipo [, ...] ] )\n"
-"    a��o [ ... ] [ RESTRICT ]\n"
+"    ação [ ... ] [ RESTRICT ]\n"
 "ALTER FUNCTION nome ( [ [ modo ] [ nome ] tipo [, ...] ] )\n"
 "    RENAME TO novo_nome\n"
 "ALTER FUNCTION nome ( [ [ modo ] [ nome ] tipo [, ...] ] )\n"
@@ -1950,39 +2221,39 @@ msgstr ""
 "ALTER FUNCTION nome ( [ [ modo ] [ nome ] tipo [, ...] ] )\n"
 "    SET SCHEMA novo_esquema\n"
 "\n"
-"onde a��o � uma das:\n"
+"onde ação é uma das:\n"
 "\n"
 "    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
 "    IMMUTABLE | STABLE | VOLATILE\n"
 "    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    COST custo_execu��o\n"
+"    COST custo_execução\n"
 "    ROWS registros_retornados\n"
-"    SET par�metro_configura��o { TO | = } { valor | DEFAULT }\n"
-"    SET par�metro_configura��o FROM CURRENT\n"
-"    RESET par�metro_configura��o\n"
+"    SET parâmetro_configuração { TO | = } { valor | DEFAULT }\n"
+"    SET parâmetro_configuração FROM CURRENT\n"
+"    RESET parâmetro_configuração\n"
 "    RESET ALL"
 
-#: sql_help.h:49
+#: sql_help.h:53
 msgid "change role name or membership"
 msgstr "muda nome da role ou membro"
 
-#: sql_help.h:50
+#: sql_help.h:54
 msgid ""
 "ALTER GROUP groupname ADD USER username [, ... ]\n"
 "ALTER GROUP groupname DROP USER username [, ... ]\n"
 "\n"
 "ALTER GROUP groupname RENAME TO newname"
 msgstr ""
-"ALTER GROUP nome_grupo ADD USER usu�rio [, ... ]\n"
-"ALTER GROUP nome_grupo DROP USER usu�rio [, ... ]\n"
+"ALTER GROUP nome_grupo ADD USER usuário [, ... ]\n"
+"ALTER GROUP nome_grupo DROP USER usuário [, ... ]\n"
 "\n"
 "ALTER GROUP nome_grupo RENAME TO novo_nome"
 
-#: sql_help.h:53
+#: sql_help.h:57
 msgid "change the definition of an index"
-msgstr "muda a defini��o de um �ndice"
+msgstr "muda a definição de um índice"
 
-#: sql_help.h:54
+#: sql_help.h:58
 msgid ""
 "ALTER INDEX name RENAME TO new_name\n"
 "ALTER INDEX name SET TABLESPACE tablespace_name\n"
@@ -1991,14 +2262,14 @@ msgid ""
 msgstr ""
 "ALTER INDEX nome RENAME TO novo_nome\n"
 "ALTER INDEX nome SET TABLESPACE nome_tablespace\n"
-"ALTER INDEX nome SET ( par�metro = valor [, ... ] )\n"
-"ALTER INDEX nome RESET ( par�metro [, ... ] )"
+"ALTER INDEX nome SET ( parâmetro = valor [, ... ] )\n"
+"ALTER INDEX nome RESET ( parâmetro [, ... ] )"
 
-#: sql_help.h:57
+#: sql_help.h:61
 msgid "change the definition of a procedural language"
-msgstr "muda a defini��o de uma linguagem procedural"
+msgstr "muda a definição de uma linguagem procedural"
 
-#: sql_help.h:58
+#: sql_help.h:62
 msgid ""
 "ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
 "ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
@@ -2006,21 +2277,9 @@ msgstr ""
 "ALTER [ PROCEDURAL ] LANGUAGE nome RENAME TO novo_nome\n"
 "ALTER [ PROCEDURAL ] LANGUAGE nome OWNER TO novo_dono"
 
-#: sql_help.h:61
-msgid "change the definition of an operator class"
-msgstr "muda a defini��o de uma classe de operadores"
-
-#: sql_help.h:62
-msgid ""
-"ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
-"ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
-msgstr ""
-"ALTER OPERATOR CLASS nome USING m�todo_indexa��o RENAME TO novo_nome\n"
-"ALTER OPERATOR CLASS nome USING m�todo_indexa��o OWNER TO novo_dono"
-
 #: sql_help.h:65
 msgid "change the definition of an operator"
-msgstr "muda a defini��o de um operador"
+msgstr "muda a definição de um operador"
 
 #: sql_help.h:66
 msgid ""
@@ -2031,14 +2290,25 @@ msgstr ""
 "OWNER TO novo_dono"
 
 #: sql_help.h:69
-msgid "change the definition of an operator family"
-msgstr "muda a defini��o de uma fam�lia de operadores"
+msgid "change the definition of an operator class"
+msgstr "muda a definição de uma classe de operadores"
 
 #: sql_help.h:70
 msgid ""
+"ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
+"ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
+msgstr ""
+"ALTER OPERATOR CLASS nome USING método_indexação RENAME TO novo_nome\n"
+"ALTER OPERATOR CLASS nome USING método_indexação OWNER TO novo_dono"
+
+#: sql_help.h:73
+msgid "change the definition of an operator family"
+msgstr "muda a definição de uma família de operadores"
+
+#: sql_help.h:74
+msgid ""
 "ALTER OPERATOR FAMILY name USING index_method ADD\n"
-"  {  OPERATOR strategy_number operator_name ( op_type, op_type ) "
-"[ RECHECK ]\n"
+"  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
 "   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
 "( argument_type [, ...] )\n"
 "  } [, ... ]\n"
@@ -2049,24 +2319,23 @@ msgid ""
 "ALTER OPERATOR FAMILY name USING index_method RENAME TO newname\n"
 "ALTER OPERATOR FAMILY name USING index_method OWNER TO newowner"
 msgstr ""
-"ALTER OPERATOR FAMILY nome USING m�todo_�ndice ADD\n"
-"  {  OPERATOR n�mero_estrat�gia nome_operador ( tipo_operador, "
-"tipo_operador ) [ RECHECK ]\n"
-"   | FUNCTION n�mero_suporte [ ( tipo_operador [ , tipo_operador ] ) ] "
-"nome_fun��o ( tipo_argumento [, ...] )\n"
+"ALTER OPERATOR FAMILY nome USING método_índice ADD\n"
+"  {  OPERATOR número_estratégia nome_operador ( tipo_operador, tipo_operador )\n"
+"   | FUNCTION número_suporte [ ( tipo_operador [ , tipo_operador ] ) ] "
+"nome_função ( tipo_argumento [, ...] )\n"
 "  } [, ... ]\n"
-"ALTER OPERATOR FAMILY nome USING m�todo_�ndice DROP\n"
-"  {  OPERATOR n�mero_estrat�gia ( tipo_operador [ , tipo_operador ] )\n"
-"   | FUNCTION n�mero_suporte ( tipo_operador [ , tipo_operador ] )\n"
+"ALTER OPERATOR FAMILY nome USING método_índice DROP\n"
+"  {  OPERATOR número_estratégia ( tipo_operador [ , tipo_operador ] )\n"
+"   | FUNCTION número_suporte ( tipo_operador [ , tipo_operador ] )\n"
 "  } [, ... ]\n"
-"ALTER OPERATOR FAMILY nome USING m�todo_�ndice RENAME TO novo_nome\n"
-"ALTER OPERATOR FAMILY nome USING m�todo_�ndice OWNER TO novo_dono"
+"ALTER OPERATOR FAMILY nome USING método_índice RENAME TO novo_nome\n"
+"ALTER OPERATOR FAMILY nome USING método_índice OWNER TO novo_dono"
 
-#: sql_help.h:73 sql_help.h:117
+#: sql_help.h:77 sql_help.h:125
 msgid "change a database role"
 msgstr "muda uma role do banco de dados"
 
-#: sql_help.h:74
+#: sql_help.h:78
 msgid ""
 "ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -2089,9 +2358,9 @@ msgid ""
 "ALTER ROLE name RESET configuration_parameter\n"
 "ALTER ROLE name RESET ALL"
 msgstr ""
-"ALTER ROLE nome [ [ WITH ] op��o [ ... ] ]\n"
+"ALTER ROLE nome [ [ WITH ] opção [ ... ] ]\n"
 "\n"
-"onde op��o pode ser:\n"
+"onde opção pode ser:\n"
 "    \n"
 "      SUPERUSER | NOSUPERUSER\n"
 "    | CREATEDB | NOCREATEDB\n"
@@ -2105,16 +2374,16 @@ msgstr ""
 "\n"
 "ALTER ROLE nome RENAME TO novo_nome\n"
 "\n"
-"ALTER ROLE nome SET par�metro_configura��o { TO | = } { valor | DEFAULT }\n"
-"ALTER ROLE nome SET par�metro_configura��o FROM CURRENT\n"
-"ALTER ROLE nome RESET par�metro_configura��o\n"
+"ALTER ROLE nome SET parâmetro_configuração { TO | = } { valor | DEFAULT }\n"
+"ALTER ROLE nome SET parâmetro_configuração FROM CURRENT\n"
+"ALTER ROLE nome RESET parâmetro_configuração\n"
 "ALTER ROLE nome RESET ALL"
 
-#: sql_help.h:77
+#: sql_help.h:81
 msgid "change the definition of a schema"
-msgstr "muda a defini��o de um esquema"
+msgstr "muda a definição de um esquema"
 
-#: sql_help.h:78
+#: sql_help.h:82
 msgid ""
 "ALTER SCHEMA name RENAME TO newname\n"
 "ALTER SCHEMA name OWNER TO newowner"
@@ -2122,32 +2391,53 @@ msgstr ""
 "ALTER SCHEMA nome RENAME TO novo_nome\n"
 "ALTER SCHEMA nome OWNER TO novo_dono"
 
-#: sql_help.h:81
+#: sql_help.h:85
 msgid "change the definition of a sequence generator"
-msgstr "muda a defini��o de um gerador de sequ�ncia"
+msgstr "muda a definição de um gerador de sequência"
 
-#: sql_help.h:82
+#: sql_help.h:86
 msgid ""
 "ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ RESTART [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
+"    [ START [ WITH ] start ]\n"
+"    [ RESTART [ [ WITH ] restart ] ]\n"
+"    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
 "    [ OWNED BY { table.column | NONE } ]\n"
+"ALTER SEQUENCE name OWNER TO new_owner\n"
 "ALTER SEQUENCE name RENAME TO new_name\n"
 "ALTER SEQUENCE name SET SCHEMA new_schema"
 msgstr ""
 "ALTER SEQUENCE nome [ INCREMENT [ BY ] incremento ]\n"
-"    [ MINVALUE valor_m�nimo | NO MINVALUE ] [ MAXVALUE valor_m�ximo | NO "
+"    [ MINVALUE valor_mínimo | NO MINVALUE ] [ MAXVALUE valor_máximo | NO "
 "MAXVALUE ]\n"
-"    [ RESTART [ WITH ] in�cio ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
+"    [ START [ WITH ] início ]\n"
+"    [ RESTART [ WITH ] início ]\n"
+"    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
 "    [ OWNED BY { tabela.coluna | NONE } ]\n"
+"ALTER SEQUENCE nome OWNER TO novo_dono\n"
 "ALTER SEQUENCE nome RENAME TO novo_nome\n"
 "ALTER SEQUENCE nome SET SCHEMA novo_esquema"
 
-#: sql_help.h:85
+#: sql_help.h:89
+#, fuzzy
+msgid "change the definition of a foreign server"
+msgstr "muda a definição de um servidor externo"
+
+#: sql_help.h:90
+msgid ""
+"ALTER SERVER servername [ VERSION 'newversion' ]\n"
+"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ]\n"
+"ALTER SERVER servername OWNER TO new_owner"
+msgstr ""
+"ALTER SERVER nome_servidor [ VERSION 'nova_versão' ]\n"
+"    [ OPTIONS ( [ ADD | SET | DROP ] opção ['valor'] [, ... ] ) ]\n"
+"ALTER SERVER nome_servidor OWNER TO novo_dono"
+
+#: sql_help.h:93
 msgid "change the definition of a table"
-msgstr "muda a defini��o de uma tabela"
+msgstr "muda a definição de uma tabela"
 
-#: sql_help.h:86
+#: sql_help.h:94
 msgid ""
 "ALTER TABLE [ ONLY ] name [ * ]\n"
 "    action [, ... ]\n"
@@ -2162,7 +2452,7 @@ msgid ""
 "\n"
 "    ADD [ COLUMN ] column type [ column_constraint [ ... ] ]\n"
 "    DROP [ COLUMN ] column [ RESTRICT | CASCADE ]\n"
-"    ALTER [ COLUMN ] column TYPE type [ USING expression ]\n"
+"    ALTER [ COLUMN ] column [ SET DATA ] TYPE type [ USING expression ]\n"
 "    ALTER [ COLUMN ] column SET DEFAULT expression\n"
 "    ALTER [ COLUMN ] column DROP DEFAULT\n"
 "    ALTER [ COLUMN ] column { SET | DROP } NOT NULL\n"
@@ -2181,6 +2471,7 @@ msgid ""
 "    ENABLE ALWAYS RULE rewrite_rule_name\n"
 "    CLUSTER ON index_name\n"
 "    SET WITHOUT CLUSTER\n"
+"    SET WITH OIDS\n"
 "    SET WITHOUT OIDS\n"
 "    SET ( storage_parameter = value [, ... ] )\n"
 "    RESET ( storage_parameter [, ... ] )\n"
@@ -2190,7 +2481,7 @@ msgid ""
 "    SET TABLESPACE new_tablespace"
 msgstr ""
 "ALTER TABLE [ ONLY ] nome [ * ]\n"
-"    a��o [, ... ]\n"
+"    ação [, ... ]\n"
 "ALTER TABLE [ ONLY ] nome [ * ]\n"
 "    RENAME [ COLUMN ] coluna TO nova_coluna\n"
 "ALTER TABLE nome\n"
@@ -2198,19 +2489,19 @@ msgstr ""
 "ALTER TABLE nome\n"
 "    SET SCHEMA novo_esquema\n"
 "\n"
-"onde a��o � uma das:\n"
+"onde ação é uma das:\n"
 "\n"
-"    ADD [ COLUMN ] coluna tipo [ restri��o_coluna [ ... ] ]\n"
+"    ADD [ COLUMN ] coluna tipo [ restrição_coluna [ ... ] ]\n"
 "    DROP [ COLUMN ] coluna [ RESTRICT | CASCADE ]\n"
-"    ALTER [ COLUMN ] coluna TYPE tipo [ USING express�o ]\n"
-"    ALTER [ COLUMN ] coluna SET DEFAULT express�o\n"
+"    ALTER [ COLUMN ] coluna [ SET DATA ] TYPE tipo [ USING expressão ]\n"
+"    ALTER [ COLUMN ] coluna SET DEFAULT expressão\n"
 "    ALTER [ COLUMN ] coluna DROP DEFAULT\n"
 "    ALTER [ COLUMN ] coluna { SET | DROP } NOT NULL\n"
 "    ALTER [ COLUMN ] coluna SET STATISTICS inteiro\n"
 "    ALTER [ COLUMN ] coluna SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "
 "MAIN }\n"
-"    ADD restri��o_tabela\n"
-"    DROP CONSTRAINT nome_restri��o [ RESTRICT | CASCADE ]\n"
+"    ADD restrição_tabela\n"
+"    DROP CONSTRAINT nome_restrição [ RESTRICT | CASCADE ]\n"
 "    DISABLE TRIGGER [ nome_gatilho | ALL | USER ]\n"
 "    ENABLE TRIGGER [ nome_gatilho | ALL | USER ]\n"
 "    ENABLE REPLICA TRIGGER nome_gatilho\n"
@@ -2219,21 +2510,22 @@ msgstr ""
 "    ENABLE RULE nome_regra_reescrita\n"
 "    ENABLE REPLICA RULE nome_regra_reescrita\n"
 "    ENABLE ALWAYS RULE nome_regra_reescrita\n"
-"    CLUSTER ON nome_�ndice\n"
+"    CLUSTER ON nome_índice\n"
 "    SET WITHOUT CLUSTER\n"
+"    SET WITH OIDS\n"
 "    SET WITHOUT OIDS\n"
-"    SET ( par�metro_armazenamento = valor [, ... ] )\n"
-"    RESET ( par�metro_armazenamento [, ... ] )\n"
+"    SET ( parâmetro_armazenamento = valor [, ... ] )\n"
+"    RESET ( parâmetro_armazenamento [, ... ] )\n"
 "    INHERIT tabela_ancestral\n"
 "    NO INHERIT tabela_ancestral\n"
 "    OWNER TO novo_dono\n"
 "    SET TABLESPACE nome_tablespace"
 
-#: sql_help.h:89
+#: sql_help.h:97
 msgid "change the definition of a tablespace"
-msgstr "muda a defini��o de uma tablespace"
+msgstr "muda a definição de uma tablespace"
 
-#: sql_help.h:90
+#: sql_help.h:98
 msgid ""
 "ALTER TABLESPACE name RENAME TO newname\n"
 "ALTER TABLESPACE name OWNER TO newowner"
@@ -2241,19 +2533,11 @@ msgstr ""
 "ALTER TABLESPACE nome RENAME TO novo_nome\n"
 "ALTER TABLESPACE nome OWNER TO novo_dono"
 
-#: sql_help.h:93
-msgid "change the definition of a trigger"
-msgstr "muda a defini��o de um gatilho"
-
-#: sql_help.h:94
-msgid "ALTER TRIGGER name ON table RENAME TO newname"
-msgstr "ALTER TRIGGER nome ON tabela RENAME TO novo_nome"
-
-#: sql_help.h:97
+#: sql_help.h:101
 msgid "change the definition of a text search configuration"
-msgstr "muda a defini��o de uma configura��o de busca textual"
+msgstr "muda a definição de uma configuração de busca textual"
 
-#: sql_help.h:98
+#: sql_help.h:102
 msgid ""
 "ALTER TEXT SEARCH CONFIGURATION name\n"
 "    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
@@ -2270,24 +2554,24 @@ msgid ""
 "ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner"
 msgstr ""
 "ALTER TEXT SEARCH CONFIGURATION nome\n"
-"    ADD MAPPING FOR tipo_elemento [, ... ] WITH nome_dicion�rio [, ... ]\n"
+"    ADD MAPPING FOR tipo_elemento [, ... ] WITH nome_dicionário [, ... ]\n"
 "ALTER TEXT SEARCH CONFIGURATION nome\n"
-"    ALTER MAPPING FOR tipo_elemento [, ... ] WITH nome_dicion�rio [, ... ]\n"
+"    ALTER MAPPING FOR tipo_elemento [, ... ] WITH nome_dicionário [, ... ]\n"
 "ALTER TEXT SEARCH CONFIGURATION nome\n"
-"    ALTER MAPPING REPLACE dicion�rio_antigo WITH novo_dicion�rio\n"
+"    ALTER MAPPING REPLACE dicionário_antigo WITH novo_dicionário\n"
 "ALTER TEXT SEARCH CONFIGURATION nome\n"
-"    ALTER MAPPING FOR tipo_elemento [, ... ] REPLACE dicion�rio_antigo WITH "
-"novo_dicion�rio\n"
+"    ALTER MAPPING FOR tipo_elemento [, ... ] REPLACE dicionário_antigo WITH "
+"novo_dicionário\n"
 "ALTER TEXT SEARCH CONFIGURATION nome\n"
 "    DROP MAPPING [ IF EXISTS ] FOR tipo_elemento [, ... ]\n"
 "ALTER TEXT SEARCH CONFIGURATION nome RENAME TO novo_nome\n"
 "ALTER TEXT SEARCH CONFIGURATION nome OWNER TO novo_dono"
 
-#: sql_help.h:101
+#: sql_help.h:105
 msgid "change the definition of a text search dictionary"
-msgstr "muda a defini��o de um dicion�rio de busca textual"
+msgstr "muda a definição de um dicionário de busca textual"
 
-#: sql_help.h:102
+#: sql_help.h:106
 msgid ""
 "ALTER TEXT SEARCH DICTIONARY name (\n"
 "    option [ = value ] [, ... ]\n"
@@ -2296,40 +2580,50 @@ msgid ""
 "ALTER TEXT SEARCH DICTIONARY name OWNER TO newowner"
 msgstr ""
 "ALTER TEXT SEARCH DICTIONARY nome (\n"
-"    op��o [ = valor ] [, ... ]\n"
+"    opção [ = valor ] [, ... ]\n"
 ")\n"
 "ALTER TEXT SEARCH DICTIONARY nome RENAME TO novo_nome\n"
 "ALTER TEXT SEARCH DICTIONARY nome OWNER TO novo_dono"
 
-#: sql_help.h:105
+#: sql_help.h:109
 msgid "change the definition of a text search parser"
-msgstr "muda a defini��o de um analisador de busca textual"
+msgstr "muda a definição de um analisador de busca textual"
 
-#: sql_help.h:106
+#: sql_help.h:110
 msgid "ALTER TEXT SEARCH PARSER name RENAME TO newname"
 msgstr "ALTER TEXT SEARCH PARSER nome RENAME TO novo_nome"
 
-#: sql_help.h:109
+#: sql_help.h:113
 msgid "change the definition of a text search template"
-msgstr "muda a defini��o de um modelo de busca textual"
+msgstr "muda a definição de um modelo de busca textual"
 
-#: sql_help.h:110
+#: sql_help.h:114
 msgid "ALTER TEXT SEARCH TEMPLATE name RENAME TO newname"
 msgstr "ALTER TEXT SEARCH TEMPLATE nome RENAME TO novo_nome"
 
-#: sql_help.h:113
+#: sql_help.h:117
+msgid "change the definition of a trigger"
+msgstr "muda a definição de um gatilho"
+
+#: sql_help.h:118
+msgid "ALTER TRIGGER name ON table RENAME TO newname"
+msgstr "ALTER TRIGGER nome ON tabela RENAME TO novo_nome"
+
+#: sql_help.h:121
 msgid "change the definition of a type"
-msgstr "muda a defini��o de um tipo"
+msgstr "muda a definição de um tipo"
 
-#: sql_help.h:114
+#: sql_help.h:122
 msgid ""
+"ALTER TYPE name RENAME TO new_name\n"
 "ALTER TYPE name OWNER TO new_owner \n"
 "ALTER TYPE name SET SCHEMA new_schema"
 msgstr ""
-"ALTER TYPE nome OWNER TO novo_nome\n"
+"ALTER TYPE nome RENAME TO novo_nome\n"
+"ALTER TYPE nome OWNER TO novo_dono\n"
 "ALTER TYPE nome SET SCHEMA novo_esquema"
 
-#: sql_help.h:118
+#: sql_help.h:126
 msgid ""
 "ALTER USER name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -2352,9 +2646,9 @@ msgid ""
 "ALTER USER name RESET configuration_parameter\n"
 "ALTER USER name RESET ALL"
 msgstr ""
-"ALTER USER nome [ [ WITH ] op��o [ ... ] ]\n"
+"ALTER USER nome [ [ WITH ] opção [ ... ] ]\n"
 "\n"
-"onde op��o pode ser:\n"
+"onde opção pode ser:\n"
 "\n"
 "      SUPERUSER | NOSUPERUSER\n"
 "    | CREATEDB | NOCREATEDB\n"
@@ -2368,32 +2662,57 @@ msgstr ""
 "\n"
 "ALTER USER nome RENAME TO novo_nome\n"
 "\n"
-"ALTER USER nome SET par�metro_configura��o { TO | = } { valor | DEFAULT }\n"
-"ALTER USER nome SET par�metro_configura��o FROM CURRENT\n"
-"ALTER USER nome RESET par�metro_configura��o\n"
+"ALTER USER nome SET parâmetro_configuração { TO | = } { valor | DEFAULT }\n"
+"ALTER USER nome SET parâmetro_configuração FROM CURRENT\n"
+"ALTER USER nome RESET parâmetro_configuração\n"
 "ALTER USER nome RESET ALL"
 
-#: sql_help.h:121
+#: sql_help.h:129
+#, fuzzy
+msgid "change the definition of a user mapping"
+msgstr "muda a definição de um mapeamento de usuário"
+
+#: sql_help.h:130
+msgid ""
+"ALTER USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
+"    SERVER servername\n"
+"    OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] )"
+msgstr ""
+"ALTER USER MAPPING FOR { usuário | USER | CURRENT_USER | PUBLIC }\n"
+"    SERVER nome_servidor\n"
+"    OPTIONS ( [ ADD | SET | DROP ] opção ['valor'] [, ... ] )"
+
+#: sql_help.h:133
 msgid "change the definition of a view"
-msgstr "muda a defini��o de uma vis�o"
+msgstr "muda a definição de uma visão"
 
-#: sql_help.h:122
-msgid "ALTER VIEW name RENAME TO newname"
-msgstr "ALTER VIEW nome RENAME TO novo_nome"
+#: sql_help.h:134
+msgid ""
+"ALTER VIEW name ALTER [ COLUMN ] column SET DEFAULT expression\n"
+"ALTER VIEW name ALTER [ COLUMN ] column DROP DEFAULT\n"
+"ALTER VIEW name OWNER TO new_owner\n"
+"ALTER VIEW name RENAME TO new_name\n"
+"ALTER VIEW name SET SCHEMA new_schema"
+msgstr ""
+"ALTER VIEW nome ALTER [ COLUMN ] coluna SET DEFAULT expressão\n"
+"ALTER VIEW nome ALTER [ COLUMN ] coluna DROP DEFAULT\n"
+"ALTER VIEW nome OWNER TO novo_dono\n"
+"ALTER VIEW nome RENAME TO novo_nome\n"
+"ALTER VIEW nome SET SCHEMA novo_esquema"
 
-#: sql_help.h:125
+#: sql_help.h:137
 msgid "collect statistics about a database"
-msgstr "coleta estat�sticas sobre o banco de dados"
+msgstr "coleta estatísticas sobre o banco de dados"
 
-#: sql_help.h:126
+#: sql_help.h:138
 msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
 msgstr "ANALYZE [ VERBOSE ] [ tabela [ ( coluna [, ...] ) ] ]"
 
-#: sql_help.h:129 sql_help.h:517
+#: sql_help.h:141 sql_help.h:553
 msgid "start a transaction block"
-msgstr "inicia um bloco de transa��o"
+msgstr "inicia um bloco de transação"
 
-#: sql_help.h:130
+#: sql_help.h:142
 msgid ""
 "BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
 "\n"
@@ -2403,47 +2722,47 @@ msgid ""
 "UNCOMMITTED }\n"
 "    READ WRITE | READ ONLY"
 msgstr ""
-"BEGIN [ WORK | TRANSACTION ] [ modo_transa��o [, ...] ]\n"
+"BEGIN [ WORK | TRANSACTION ] [ modo_transação [, ...] ]\n"
 "\n"
-"onde modo_transa��o � um dos:\n"
+"onde modo_transação é um dos:\n"
 "\n"
 "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
 "UNCOMMITTED }\n"
 "    READ WRITE | READ ONLY"
 
-#: sql_help.h:133
+#: sql_help.h:145
 msgid "force a transaction log checkpoint"
-msgstr "for�a ponto de controle no log de transa��o"
+msgstr "força ponto de controle no log de transação"
 
-#: sql_help.h:134
+#: sql_help.h:146
 msgid "CHECKPOINT"
 msgstr "CHECKPOINT"
 
-#: sql_help.h:137
+#: sql_help.h:149
 msgid "close a cursor"
 msgstr "fecha um cursor"
 
-#: sql_help.h:138
+#: sql_help.h:150
 msgid "CLOSE { name | ALL }"
 msgstr "CLOSE { nome | ALL }"
 
-#: sql_help.h:141
+#: sql_help.h:153
 msgid "cluster a table according to an index"
-msgstr "agrupa uma tabela de acordo com um �ndice"
+msgstr "agrupa uma tabela de acordo com um índice"
 
-#: sql_help.h:142
+#: sql_help.h:154
 msgid ""
-"CLUSTER tablename [ USING indexname ]\n"
-"CLUSTER"
+"CLUSTER [VERBOSE] tablename [ USING indexname ]\n"
+"CLUSTER [VERBOSE]"
 msgstr ""
-"CLUSTER nome_tabela [ USING nome_�ndice ]\n"
-"CLUSTER"
+"CLUSTER [VERBOSE] nome_tabela [ USING nome_índice ]\n"
+"CLUSTER [VERBOSE]"
 
-#: sql_help.h:145
+#: sql_help.h:157
 msgid "define or change the comment of an object"
-msgstr "define ou muda um coment�rio de um objeto"
+msgstr "define ou muda um comentário de um objeto"
 
-#: sql_help.h:146
+#: sql_help.h:158
 msgid ""
 "COMMENT ON\n"
 "{\n"
@@ -2480,18 +2799,18 @@ msgstr ""
 "{\n"
 "  TABLE nome_objeto |\n"
 "  COLUMN nome_tabela.nome_coluna |\n"
-"  AGGREGATE nome_agrega��o (tipo_agrega��o [, ...] ) |\n"
+"  AGGREGATE nome_agregação (tipo_agregação [, ...] ) |\n"
 "  CAST (tipo_origem AS tipo_destino) |\n"
-"  CONSTRAINT nome_restri��o ON nome_tabela |\n"
+"  CONSTRAINT nome_restrição ON nome_tabela |\n"
 "  CONVERSION nome_objeto |\n"
 "  DATABASE nome_objeto |\n"
 "  DOMAIN nome_objeto |\n"
-"  FUNCTION nome_fun��o ( [ [ modo ] [ nome ] tipo [, ...] ) |\n"
+"  FUNCTION nome_função ( [ [ modo ] [ nome ] tipo [, ...] ) |\n"
 "  INDEX nome_objeto |\n"
 "  LARGE OBJECT oid_objeto_grande |\n"
 "  OPERATOR operador (tipo_operando_esq, tipo_operando_dir) |\n"
-"  OPERATOR CLASS nome_objeto USING m�todo_�ndice |\n"
-"  OPERATOR FAMILY nome_objeto USING m�todo_�ndice |\n"
+"  OPERATOR CLASS nome_objeto USING método_índice |\n"
+"  OPERATOR FAMILY nome_objeto USING método_índice |\n"
 "  [ PROCEDURAL ] LANGUAGE nome_objeto |\n"
 "  ROLE nome_objeto |\n"
 "  RULE nome_regra ON nome_tabela |\n"
@@ -2507,29 +2826,29 @@ msgstr ""
 "  VIEW nome_objeto\n"
 "} IS 'texto'"
 
-#: sql_help.h:149 sql_help.h:397
+#: sql_help.h:161 sql_help.h:433
 msgid "commit the current transaction"
-msgstr "efetiva a transa��o atual"
+msgstr "efetiva a transação atual"
 
-#: sql_help.h:150
+#: sql_help.h:162
 msgid "COMMIT [ WORK | TRANSACTION ]"
 msgstr "COMMIT [ WORK | TRANSACTION ]"
 
-#: sql_help.h:153
+#: sql_help.h:165
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr ""
-"efetiva uma transa��o que foi anteriormente preparada para efetiva��o em "
+"efetiva uma transação que foi anteriormente preparada para efetivação em "
 "duas fases"
 
-#: sql_help.h:154
+#: sql_help.h:166
 msgid "COMMIT PREPARED transaction_id"
-msgstr "COMMIT PREPARED id_transa��o"
+msgstr "COMMIT PREPARED id_transação"
 
-#: sql_help.h:157
+#: sql_help.h:169
 msgid "copy data between a file and a table"
 msgstr "copia dados de um arquivo para uma tabela"
 
-#: sql_help.h:158
+#: sql_help.h:170
 msgid ""
 "COPY tablename [ ( column [, ...] ) ]\n"
 "    FROM { 'filename' | STDIN }\n"
@@ -2547,7 +2866,6 @@ msgid ""
 "    TO { 'filename' | STDOUT }\n"
 "    [ [ WITH ] \n"
 "          [ BINARY ]\n"
-"          [ HEADER ]\n"
 "          [ OIDS ]\n"
 "          [ DELIMITER [ AS ] 'delimiter' ]\n"
 "          [ NULL [ AS ] 'null string' ]\n"
@@ -2559,7 +2877,7 @@ msgstr ""
 "COPY nome_tabela [ ( coluna [, ...] ) ]\n"
 "    FROM { 'arquivo' | STDIN }\n"
 "    [ [ WITH ] \n"
-"          [ BINARY ] \n"
+"          [ BINARY ]\n"
 "          [ OIDS ]\n"
 "          [ DELIMITER [ AS ] 'delimitador' ]\n"
 "          [ NULL [ AS ] 'cadeia nula' ] ]\n"
@@ -2572,7 +2890,6 @@ msgstr ""
 "    TO { 'arquivo' | STDOUT }\n"
 "    [ [ WITH ] \n"
 "          [ BINARY ]\n"
-"          [ HEADER ]\n"
 "          [ OIDS ]\n"
 "          [ DELIMITER [ AS ] 'delimitador' ]\n"
 "          [ NULL [ AS ] 'cadeia nula' ] ]\n"
@@ -2581,11 +2898,11 @@ msgstr ""
 "                [ ESCAPE [ AS ] 'escape' ]\n"
 "                [ FORCE QUOTE coluna [, ...] ]"
 
-#: sql_help.h:161
+#: sql_help.h:173
 msgid "define a new aggregate function"
-msgstr "define um nova fun��o de agrega��o"
+msgstr "define um nova função de agregação"
 
-#: sql_help.h:162
+#: sql_help.h:174
 msgid ""
 "CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
 "    SFUNC = sfunc,\n"
@@ -2607,29 +2924,29 @@ msgid ""
 ")"
 msgstr ""
 "CREATE AGGREGATE nome ( tipo_dado_entrada [ , ... ] ) (\n"
-"    SFUNC = fun��o_trans_estado,\n"
+"    SFUNC = função_trans_estado,\n"
 "    STYPE = tipo_dado_estado\n"
-"    [ , FINALFUNC = fun��o_final ]\n"
-"    [ , INITCOND = condi��o_inicial ]\n"
-"    [ , SORTOP = operador_ordena��o ]\n"
+"    [ , FINALFUNC = função_final ]\n"
+"    [ , INITCOND = condição_inicial ]\n"
+"    [ , SORTOP = operador_ordenação ]\n"
 ")\n"
 "\n"
 "ou a sintaxe antiga\n"
 "\n"
 "CREATE AGGREGATE nome (\n"
 "    BASETYPE = tipo_dado_entrada,\n"
-"    SFUNC = fun��o_trans_estado,\n"
+"    SFUNC = função_trans_estado,\n"
 "    STYPE = tipo_dado_estado\n"
-"    [ , FINALFUNC = fun��o_final ]\n"
-"    [ , INITCOND = condi��o_inicial ]\n"
-"    [ , SORTOP = operador_ordena��o ]\n"
+"    [ , FINALFUNC = função_final ]\n"
+"    [ , INITCOND = condição_inicial ]\n"
+"    [ , SORTOP = operador_ordenação ]\n"
 ")"
 
-#: sql_help.h:165
+#: sql_help.h:177
 msgid "define a new cast"
-msgstr "define uma nova convers�o de tipo"
+msgstr "define uma nova conversão de tipo"
 
-#: sql_help.h:166
+#: sql_help.h:178
 msgid ""
 "CREATE CAST (sourcetype AS targettype)\n"
 "    WITH FUNCTION funcname (argtypes)\n"
@@ -2637,21 +2954,29 @@ msgid ""
 "\n"
 "CREATE CAST (sourcetype AS targettype)\n"
 "    WITHOUT FUNCTION\n"
+"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
+"\n"
+"CREATE CAST (sourcetype AS targettype)\n"
+"    WITH INOUT\n"
 "    [ AS ASSIGNMENT | AS IMPLICIT ]"
 msgstr ""
 "CREATE CAST (tipo_origem AS tipo_destino)\n"
-"    WITH FUNCTION nome_fun��o (tipo_argumento)\n"
+"    WITH FUNCTION nome_função (tipos_argumento)\n"
 "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
 "\n"
 "CREATE CAST (tipo_origem AS tipo_destino)\n"
 "    WITHOUT FUNCTION\n"
+"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
+"\n"
+"CREATE CAST (tipo_origem AS tipo_destino)\n"
+"    WITH INOUT\n"
 "    [ AS ASSIGNMENT | AS IMPLICIT ]"
 
-#: sql_help.h:169
+#: sql_help.h:181
 msgid "define a new constraint trigger"
-msgstr "define um novo gatilho de restri��o"
+msgstr "define um novo gatilho de restrição"
 
-#: sql_help.h:170
+#: sql_help.h:182
 msgid ""
 "CREATE CONSTRAINT TRIGGER name\n"
 "    AFTER event [ OR ... ]\n"
@@ -2669,45 +2994,49 @@ msgstr ""
 "    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY "
 "DEFERRED } }\n"
 "    FOR EACH ROW\n"
-"    EXECUTE PROCEDURE nome_fun��o ( argumentos )"
+"    EXECUTE PROCEDURE nome_função ( argumentos )"
 
-#: sql_help.h:173
+#: sql_help.h:185
 msgid "define a new encoding conversion"
-msgstr "define uma nova convers�o de codifica��o"
+msgstr "define uma nova conversão de codificação"
 
-#: sql_help.h:174
+#: sql_help.h:186
 msgid ""
 "CREATE [ DEFAULT ] CONVERSION name\n"
 "    FOR source_encoding TO dest_encoding FROM funcname"
 msgstr ""
 "CREATE [ DEFAULT ] CONVERSION nome\n"
-"    FOR codifica��o_origem TO codifica��o_destino FROM nome_fun��o"
+"    FOR codificação_origem TO codificação_destino FROM nome_função"
 
-#: sql_help.h:177
+#: sql_help.h:189
 msgid "create a new database"
 msgstr "cria um novo banco de dados"
 
-#: sql_help.h:178
+#: sql_help.h:190
 msgid ""
 "CREATE DATABASE name\n"
 "    [ [ WITH ] [ OWNER [=] dbowner ]\n"
 "           [ TEMPLATE [=] template ]\n"
 "           [ ENCODING [=] encoding ]\n"
+"           [ LC_COLLATE [=] lc_collate ]\n"
+"           [ LC_CTYPE [=] lc_ctype ]\n"
 "           [ TABLESPACE [=] tablespace ]\n"
 "           [ CONNECTION LIMIT [=] connlimit ] ]"
 msgstr ""
 "CREATE DATABASE nome\n"
 "    [ [ WITH ] [ OWNER [=] dono_bd ]\n"
 "           [ TEMPLATE [=] modelo ]\n"
-"           [ ENCODING [=] codifica��o ]\n"
+"           [ ENCODING [=] codificação ]\n"
+"           [ LC_COLLATE [=] config_regional ]\n"
+"           [ LC_CTYPE [=] config_regional ]\n"
 "           [ TABLESPACE [=] tablespace ] ]\n"
 "           [ CONNECTION LIMIT [=] limite_con ] ]"
 
-#: sql_help.h:181
+#: sql_help.h:193
 msgid "define a new domain"
-msgstr "define um novo dom�nio"
+msgstr "define um novo domínio"
 
-#: sql_help.h:182
+#: sql_help.h:194
 msgid ""
 "CREATE DOMAIN name [ AS ] data_type\n"
 "    [ DEFAULT expression ]\n"
@@ -2719,24 +3048,42 @@ msgid ""
 "{ NOT NULL | NULL | CHECK (expression) }"
 msgstr ""
 "CREATE DOMAIN nome [ AS ] tipo_dado\n"
-"    [ DEFAULT express�o ]\n"
-"    [ restri��o [ ... ] ]\n"
+"    [ DEFAULT expressão ]\n"
+"    [ restrição [ ... ] ]\n"
 "\n"
-"onde restri��o �:\n"
+"onde restrição é:\n"
 "\n"
-"[ CONSTRAINT nome_restri��o ]\n"
-"{ NOT NULL | NULL | CHECK (express�o) }"
+"[ CONSTRAINT nome_restrição ]\n"
+"{ NOT NULL | NULL | CHECK (expressão) }"
 
-#: sql_help.h:185
+#: sql_help.h:197
+#, fuzzy
+msgid "define a new foreign-data wrapper"
+msgstr "define um novo tipo de dado"
+
+#: sql_help.h:198
+msgid ""
+"CREATE FOREIGN DATA WRAPPER name\n"
+"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+"    [ OPTIONS ( option 'value' [, ... ] ) ]"
+msgstr ""
+"CREATE FOREIGN DATA WRAPPER nome\n"
+"    [ VALIDATOR função_validação | NO VALIDATOR ]\n"
+"    [ OPTIONS ( opção 'valor' [, ... ] ) ]"
+
+#: sql_help.h:201
 msgid "define a new function"
-msgstr "define uma nova fun��o"
+msgstr "define uma nova função"
 
-#: sql_help.h:186
+#: sql_help.h:202
 msgid ""
 "CREATE [ OR REPLACE ] FUNCTION\n"
-"    name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    [ RETURNS rettype ]\n"
+"    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] "
+"[, ...] ] )\n"
+"    [ RETURNS rettype\n"
+"      | RETURNS TABLE ( colname coltype [, ...] ) ]\n"
 "  { LANGUAGE langname\n"
+"    | WINDOW\n"
 "    | IMMUTABLE | STABLE | VOLATILE\n"
 "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
 "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
@@ -2749,25 +3096,27 @@ msgid ""
 "    [ WITH ( attribute [, ...] ) ]"
 msgstr ""
 "CREATE [ OR REPLACE ] FUNCTION\n"
-"    nome ( [ [ modo ] [ nome ] tipo [, ...] ] )\n"
+"    nome ( [ [ modo ] [ nome ] tipo [ { DEFAULT | = } exp_padrão ] [, ...] ] )\n"
 "    [ RETURNS tipo_retorno ]\n"
+"      | RETURNS TABLE ( nome tipo [, ...] ) ]\n"
 "  { LANGUAGE nome_linguagem\n"
+"    | WINDOW\n"
 "    | IMMUTABLE | STABLE | VOLATILE\n"
 "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
 "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    | COST custo_execu��o\n"
+"    | COST custo_execução\n"
 "    | ROWS registros_retornados\n"
-"    | SET par�metro_configura��o { TO valor | = valor | FROM CURRENT }\n"
-"    | AS 'defini��o'\n"
-"    | AS 'arquivo_objeto', 'link_simb�lico'\n"
+"    | SET parâmetro_configuração { TO valor | = valor | FROM CURRENT }\n"
+"    | AS 'definição'\n"
+"    | AS 'arquivo_objeto', 'link_simbólico'\n"
 "  } ...\n"
 "    [ WITH ( atributo [, ...] ) ]"
 
-#: sql_help.h:189 sql_help.h:213 sql_help.h:265
+#: sql_help.h:205 sql_help.h:229 sql_help.h:285
 msgid "define a new database role"
 msgstr "define uma nova role do banco de dados"
 
-#: sql_help.h:190
+#: sql_help.h:206
 msgid ""
 "CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -2788,9 +3137,9 @@ msgid ""
 "    | USER rolename [, ...]\n"
 "    | SYSID uid"
 msgstr ""
-"CREATE GROUP nome [ [ WITH ] op��o [ ... ] ]\n"
+"CREATE GROUP nome [ [ WITH ] opção [ ... ] ]\n"
 "\n"
-"onde op��o pode ser:\n"
+"onde opção pode ser:\n"
 "    \n"
 "      SUPERUSER | NOSUPERUSER\n"
 "    | CREATEDB | NOCREATEDB\n"
@@ -2807,11 +3156,11 @@ msgstr ""
 "    | USER nome_role [, ...]\n"
 "    | SYSID uid"
 
-#: sql_help.h:193
+#: sql_help.h:209
 msgid "define a new index"
-msgstr "define um novo �ndice"
+msgstr "define um novo índice"
 
-#: sql_help.h:194
+#: sql_help.h:210
 msgid ""
 "CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
 "    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS { FIRST "
@@ -2820,18 +3169,18 @@ msgid ""
 "    [ TABLESPACE tablespace ]\n"
 "    [ WHERE predicate ]"
 msgstr ""
-"CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] nome ON tabela [ USING m�todo ]\n"
-"    ( { coluna | ( express�o ) } [ classe_operadores ] [ ASC | DESC ] "
+"CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] nome ON tabela [ USING método ]\n"
+"    ( { coluna | ( expressão ) } [ classe_operadores ] [ ASC | DESC ] "
 "[ NULLS { FIRST | LAST } ] [, ...] )\n"
-"    [ WITH ( par�metro_armazenamento = valor [, ... ] ) ]\n"
+"    [ WITH ( parâmetro_armazenamento = valor [, ... ] ) ]\n"
 "    [ TABLESPACE tablespace ]\n"
 "    [ WHERE predicado ]"
 
-#: sql_help.h:197
+#: sql_help.h:213
 msgid "define a new procedural language"
 msgstr "define uma nova linguagem procedural"
 
-#: sql_help.h:198
+#: sql_help.h:214
 msgid ""
 "CREATE [ PROCEDURAL ] LANGUAGE name\n"
 "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
@@ -2839,37 +3188,13 @@ msgid ""
 msgstr ""
 "CREATE [ PROCEDURAL ] LANGUAGE nome\n"
 "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE nome\n"
-"    HANDLER alimentador_chamada [ VALIDATOR fun��o_valida��o ]"
+"    HANDLER alimentador_chamada [ VALIDATOR função_validação ]"
 
-#: sql_help.h:201
-msgid "define a new operator class"
-msgstr "define uma nova classe de operadores"
-
-#: sql_help.h:202
-msgid ""
-"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
-"  USING index_method [ FAMILY family_name ] AS\n"
-"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ] "
-"[ RECHECK ]\n"
-"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
-"( argument_type [, ...] )\n"
-"   | STORAGE storage_type\n"
-"  } [, ... ]"
-msgstr ""
-"CREATE OPERATOR CLASS nome [ DEFAULT ] FOR TYPE tipo_dado\n"
-"  USING m�todo_�ndice [ FAMILY nome_fam�lia ] AS\n"
-"  {  OPERATOR n�mero_estrat�gia nome_operador [ ( tipo_operador, "
-"tipo_operador ) ] [ RECHECK ]\n"
-"   | FUNCTION n�mero_suporte [ ( tipo_operador [ , tipo_operador ] ) ] "
-"nome_fun��o ( tipo_argumento [, ...] )\n"
-"   | STORAGE tipo_armazenado\n"
-"  } [, ... ]"
-
-#: sql_help.h:205
+#: sql_help.h:217
 msgid "define a new operator"
 msgstr "define um novo operador"
 
-#: sql_help.h:206
+#: sql_help.h:218
 msgid ""
 "CREATE OPERATOR name (\n"
 "    PROCEDURE = funcname\n"
@@ -2880,22 +3205,44 @@ msgid ""
 ")"
 msgstr ""
 "CREATE OPERATOR nome (\n"
-"    PROCEDURE = nome_fun��o\n"
+"    PROCEDURE = nome_função\n"
 "    [, LEFTARG = tipo_esquerda ] [, RIGHTARG = tipo_direita ]\n"
-"    [, COMMUTATOR = operador_comuta��o ] [, NEGATOR = operador_nega��o ]\n"
-"    [, RESTRICT = proc_restri��o ] [, JOIN = proc_jun��o ]\n"
+"    [, COMMUTATOR = operador_comutação ] [, NEGATOR = operador_negação ]\n"
+"    [, RESTRICT = proc_restrição ] [, JOIN = proc_junção ]\n"
 "    [, HASHES ] [, MERGES ]\n"
 ")"
 
-#: sql_help.h:209
+#: sql_help.h:221
+msgid "define a new operator class"
+msgstr "define uma nova classe de operadores"
+
+#: sql_help.h:222
+msgid ""
+"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
+"  USING index_method [ FAMILY family_name ] AS\n"
+"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ]\n"
+"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
+"( argument_type [, ...] )\n"
+"   | STORAGE storage_type\n"
+"  } [, ... ]"
+msgstr ""
+"CREATE OPERATOR CLASS nome [ DEFAULT ] FOR TYPE tipo_dado\n"
+"  USING método_índice [ FAMILY nome_família ] AS\n"
+"  {  OPERATOR número_estratégia nome_operador [ ( tipo_operador, tipo_operador ) ]\n"
+"   | FUNCTION número_suporte [ ( tipo_operador [ , tipo_operador ] ) ] "
+"nome_função ( tipo_argumento [, ...] )\n"
+"   | STORAGE tipo_armazenado\n"
+"  } [, ... ]"
+
+#: sql_help.h:225
 msgid "define a new operator family"
-msgstr "define uma nova fam�lia de operadores"
+msgstr "define uma nova família de operadores"
 
-#: sql_help.h:210
+#: sql_help.h:226
 msgid "CREATE OPERATOR FAMILY name USING index_method"
-msgstr "CREATE OPERATOR FAMILY nome USING m�todo_�ndice"
+msgstr "CREATE OPERATOR FAMILY nome USING método_índice"
 
-#: sql_help.h:214
+#: sql_help.h:230
 msgid ""
 "CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -2917,9 +3264,9 @@ msgid ""
 "    | USER rolename [, ...]\n"
 "    | SYSID uid"
 msgstr ""
-"CREATE ROLE nome [ [ WITH ] op��o [ ... ] ]\n"
+"CREATE ROLE nome [ [ WITH ] opção [ ... ] ]\n"
 "\n"
-"onde op��o pode ser:\n"
+"onde opção pode ser:\n"
 "    \n"
 "      SUPERUSER | NOSUPERUSER\n"
 "    | CREATEDB | NOCREATEDB\n"
@@ -2937,39 +3284,39 @@ msgstr ""
 "    | USER nome_role [, ...]\n"
 "    | SYSID uid"
 
-#: sql_help.h:217
+#: sql_help.h:233
 msgid "define a new rewrite rule"
 msgstr "define uma nova regra de reescrita"
 
-#: sql_help.h:218
+#: sql_help.h:234
 msgid ""
 "CREATE [ OR REPLACE ] RULE name AS ON event\n"
 "    TO table [ WHERE condition ]\n"
 "    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }"
 msgstr ""
 "CREATE [ OR REPLACE ] RULE nome AS ON evento\n"
-"    TO tabela [ WHERE condi��o ]\n"
+"    TO tabela [ WHERE condição ]\n"
 "    DO [ ALSO | INSTEAD ] { NOTHING | comando | ( comando ; comando ... ) }"
 
-#: sql_help.h:221
+#: sql_help.h:237
 msgid "define a new schema"
 msgstr "define um novo esquema"
 
-#: sql_help.h:222
+#: sql_help.h:238
 msgid ""
 "CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element "
 "[ ... ] ]\n"
 "CREATE SCHEMA AUTHORIZATION username [ schema_element [ ... ] ]"
 msgstr ""
-"CREATE SCHEMA nome_esquema [ AUTHORIZATION usu�rio ] [ elemento_esquema "
+"CREATE SCHEMA nome_esquema [ AUTHORIZATION usuário ] [ elemento_esquema "
 "[ ... ] ]\n"
-"CREATE SCHEMA AUTHORIZATION usu�rio [ elemento_esquema [ ... ] ]"
+"CREATE SCHEMA AUTHORIZATION usuário [ elemento_esquema [ ... ] ]"
 
-#: sql_help.h:225
+#: sql_help.h:241
 msgid "define a new sequence generator"
-msgstr "define um novo gerador de sequ�ncia"
+msgstr "define um novo gerador de sequência"
 
-#: sql_help.h:226
+#: sql_help.h:242
 msgid ""
 "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
@@ -2977,16 +3324,28 @@ msgid ""
 "    [ OWNED BY { table.column | NONE } ]"
 msgstr ""
 "CREATE [ TEMPORARY | TEMP ] SEQUENCE nome [ INCREMENT [ BY ] incremento ]\n"
-"    [ MINVALUE valor_m�nimo | NO MINVALUE ] [ MAXVALUE valor_m�ximo | NO "
+"    [ MINVALUE valor_mínimo | NO MINVALUE ] [ MAXVALUE valor_máximo | NO "
 "MAXVALUE ]\n"
-"    [ START [ WITH ] in�cio ] [ CACHE cache ] [ [ NO ] CYCLE ]    [ OWNED BY "
+"    [ START [ WITH ] início ] [ CACHE cache ] [ [ NO ] CYCLE ]    [ OWNED BY "
 "{ tabela.coluna | NONE } ]"
 
-#: sql_help.h:229
+#: sql_help.h:245
+#, fuzzy
+msgid "define a new foreign server"
+msgstr "define um novo servidor externo"
+
+#: sql_help.h:246
+msgid ""
+"CREATE SERVER servername [ TYPE 'servertype' ] [ VERSION 'serverversion' ]\n"
+"    FOREIGN DATA WRAPPER fdwname\n"
+"    [ OPTIONS ( option 'value' [, ... ] ) ]"
+msgstr ""
+
+#: sql_help.h:249
 msgid "define a new table"
 msgstr "define uma nova tabela"
 
-#: sql_help.h:230
+#: sql_help.h:250
 msgid ""
 "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [\n"
 "  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "
@@ -3035,56 +3394,56 @@ msgid ""
 "[ USING INDEX TABLESPACE tablespace ]"
 msgstr ""
 "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE nome_tabela ( [\n"
-"  { nome_coluna tipo_dado [ DEFAULT express�o_padr�o ] [ restri��o_coluna "
+"  { nome_coluna tipo_dado [ DEFAULT expressão_padrão ] [ restrição_coluna "
 "[ ... ] ]\n"
-"    | restri��o_tabela\n"
+"    | restrição_tabela\n"
 "    | LIKE tabela_pai [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | "
 "INDEXES } ] ... }\n"
 "    [, ... ]\n"
 "] )\n"
 "[ INHERITS ( tabela_pai [, ... ] ) ]\n"
-"[ WITH ( par�metro_armazenamento [= valor] [, ... ] ) | WITH OIDS | WITHOUT "
+"[ WITH ( parâmetro_armazenamento [= valor] [, ... ] ) | WITH OIDS | WITHOUT "
 "OIDS ]\n"
 "[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 "[ TABLESPACE tablespace ]\n"
 "\n"
-"onde restri��o_coluna �:\n"
+"onde restrição_coluna é:\n"
 "\n"
-"[ CONSTRAINT nome_restri��o ]\n"
+"[ CONSTRAINT nome_restrição ]\n"
 "{ NOT NULL | \n"
 "  NULL | \n"
-"  UNIQUE par�metros_�ndice |\n"
-"  PRIMARY KEY par�metros_�ndice |\n"
-"  CHECK ( express�o ) |\n"
+"  UNIQUE parâmetros_índice |\n"
+"  PRIMARY KEY parâmetros_índice |\n"
+"  CHECK ( expressão ) |\n"
 "  REFERENCES tabela_ref [ ( coluna_ref ) ] [ MATCH FULL | MATCH PARTIAL | "
 "MATCH SIMPLE ]\n"
-"    [ ON DELETE a��o ] [ ON UPDATE a��o ] }\n"
+"    [ ON DELETE ação ] [ ON UPDATE ação ] }\n"
 "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
 "IMMEDIATE ]\n"
 "\n"
-"e restri��o_tabela �:\n"
+"e restrição_tabela é:\n"
 "\n"
-"[ CONSTRAINT nome_restri��o ]\n"
-"{ UNIQUE ( nome_coluna [, ... ] ) par�metros_�ndice |\n"
-"  PRIMARY KEY ( nome_coluna [, ... ] ) par�metros_�ndice |\n"
-"  CHECK ( express�o ) |\n"
+"[ CONSTRAINT nome_restrição ]\n"
+"{ UNIQUE ( nome_coluna [, ... ] ) parâmetros_índice |\n"
+"  PRIMARY KEY ( nome_coluna [, ... ] ) parâmetros_índice |\n"
+"  CHECK ( expressão ) |\n"
 "  FOREIGN KEY ( nome_coluna [, ... ] ) REFERENCES tabela_ref [ ( coluna_ref "
 "[, ... ] ) ]\n"
-"    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE a��o ] [ ON "
-"UPDATE a��o ] }\n"
+"    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE ação ] [ ON "
+"UPDATE ação ] }\n"
 "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
 "IMMEDIATE ]\n"
 "\n"
-"par�metros_�ndice em restri��es UNIQUE e PRIMARY KEY s�o:\n"
+"parâmetros_índice em restrições UNIQUE e PRIMARY KEY são:\n"
 "\n"
-"[ WITH ( par�metro_armazenamento [= valor] [, ... ] ) ]\n"
+"[ WITH ( parâmetro_armazenamento [= valor] [, ... ] ) ]\n"
 "[ USING INDEX TABLESPACE tablespace ]"
 
-#: sql_help.h:233 sql_help.h:489
+#: sql_help.h:253 sql_help.h:525
 msgid "define a new table from the results of a query"
 msgstr "cria uma nova tabela a partir dos resultados de uma consulta"
 
-#: sql_help.h:234
+#: sql_help.h:254
 msgid ""
 "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name\n"
 "    [ (column_name [, ...] ) ]\n"
@@ -3092,44 +3451,32 @@ msgid ""
 "OIDS ]\n"
 "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 "    [ TABLESPACE tablespace ]\n"
-"    AS query"
+"    AS query\n"
+"    [ WITH [ NO ] DATA ]"
 msgstr ""
 "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE nome_tabela\n"
 "    [ (nome_coluna [, ...] ) ]\n"
-"    [ WITH (par�metro [= valor] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
+"    [ WITH (parâmetro [= valor] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
 "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 "    [ TABLESPACE tablespace ]\n"
-"    AS consulta"
+"    AS consulta\n"
+"    [ WITH [ NO ] DATA ]"
 
-#: sql_help.h:237
+#: sql_help.h:257
 msgid "define a new tablespace"
 msgstr "define uma nova tablespace"
 
-#: sql_help.h:238
+#: sql_help.h:258
 msgid ""
 "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
 msgstr ""
-"CREATE TABLESPACE nome_tablespace [ OWNER usu�rio ] LOCATION 'diret�rio'"
+"CREATE TABLESPACE nome_tablespace [ OWNER usuário ] LOCATION 'diretório'"
 
-#: sql_help.h:241
-msgid "define a new trigger"
-msgstr "define um novo gatilho"
-
-#: sql_help.h:242
-msgid ""
-"CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
-"    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
-"    EXECUTE PROCEDURE funcname ( arguments )"
-msgstr ""
-"CREATE TRIGGER nome { BEFORE | AFTER } { evento [ OR ... ] }\n"
-"    ON tabela [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
-"    EXECUTE PROCEDURE nome_fun��o ( argumentos )"
-
-#: sql_help.h:245
+#: sql_help.h:261
 msgid "define a new text search configuration"
-msgstr "define uma nova configura��o de busca textual"
+msgstr "define uma nova configuração de busca textual"
 
-#: sql_help.h:246
+#: sql_help.h:262
 msgid ""
 "CREATE TEXT SEARCH CONFIGURATION name (\n"
 "    PARSER = parser_name |\n"
@@ -3138,14 +3485,14 @@ msgid ""
 msgstr ""
 "CREATE TEXT SEARCH CONFIGURATION nome (\n"
 "    PARSER = nome_analisador |\n"
-"    COPY = configura��o_origem\n"
+"    COPY = configuração_origem\n"
 ")"
 
-#: sql_help.h:249
+#: sql_help.h:265
 msgid "define a new text search dictionary"
-msgstr "define um novo dicion�rio de busca textual"
+msgstr "define um novo dicionário de busca textual"
 
-#: sql_help.h:250
+#: sql_help.h:266
 msgid ""
 "CREATE TEXT SEARCH DICTIONARY name (\n"
 "    TEMPLATE = template\n"
@@ -3154,14 +3501,14 @@ msgid ""
 msgstr ""
 "CREATE TEXT SEARCH DICTIONARY nome (\n"
 "    TEMPLATE = modelo\n"
-"    [, op��o = valor [, ... ]]\n"
+"    [, opção = valor [, ... ]]\n"
 ")"
 
-#: sql_help.h:253
+#: sql_help.h:269
 msgid "define a new text search parser"
 msgstr "define um novo analisador de busca textual"
 
-#: sql_help.h:254
+#: sql_help.h:270
 msgid ""
 "CREATE TEXT SEARCH PARSER name (\n"
 "    START = start_function ,\n"
@@ -3172,18 +3519,18 @@ msgid ""
 ")"
 msgstr ""
 "CREATE TEXT SEARCH PARSER nome (\n"
-"    START = fun��o_in�cio ,\n"
-"    GETTOKEN = fun��o_gettoken ,\n"
-"    END = fun��o_fim ,\n"
-"    LEXTYPES = fun��o_lextypes\n"
-"    [, HEADLINE = fun��o_headline ]\n"
+"    START = função_início ,\n"
+"    GETTOKEN = função_gettoken ,\n"
+"    END = função_fim ,\n"
+"    LEXTYPES = função_lextypes\n"
+"    [, HEADLINE = função_headline ]\n"
 ")"
 
-#: sql_help.h:257
+#: sql_help.h:273
 msgid "define a new text search template"
 msgstr "define um novo modelo de busca textual"
 
-#: sql_help.h:258
+#: sql_help.h:274
 msgid ""
 "CREATE TEXT SEARCH TEMPLATE name (\n"
 "    [ INIT = init_function , ]\n"
@@ -3191,15 +3538,29 @@ msgid ""
 ")"
 msgstr ""
 "CREATE TEXT SEARCH TEMPLATE nome (\n"
-"    [ INIT = fun��o_init , ]\n"
-"    LEXIZE = fun��o_lexize\n"
+"    [ INIT = função_init , ]\n"
+"    LEXIZE = função_lexize\n"
 ")"
 
-#: sql_help.h:261
+#: sql_help.h:277
+msgid "define a new trigger"
+msgstr "define um novo gatilho"
+
+#: sql_help.h:278
+msgid ""
+"CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
+"    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
+"    EXECUTE PROCEDURE funcname ( arguments )"
+msgstr ""
+"CREATE TRIGGER nome { BEFORE | AFTER } { evento [ OR ... ] }\n"
+"    ON tabela [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
+"    EXECUTE PROCEDURE nome_função ( argumentos )"
+
+#: sql_help.h:281
 msgid "define a new data type"
 msgstr "define um novo tipo de dado"
 
-#: sql_help.h:262
+#: sql_help.h:282
 msgid ""
 "CREATE TYPE name AS\n"
 "    ( attribute_name data_type [, ... ] )\n"
@@ -3219,6 +3580,9 @@ msgid ""
 "    [ , PASSEDBYVALUE ]\n"
 "    [ , ALIGNMENT = alignment ]\n"
 "    [ , STORAGE = storage ]\n"
+"    [ , LIKE = like_type ]\n"
+"    [ , CATEGORY = category ]\n"
+"    [ , PREFERRED = preferred ]\n"
 "    [ , DEFAULT = default ]\n"
 "    [ , ELEMENT = element ]\n"
 "    [ , DELIMITER = delimiter ]\n"
@@ -3230,28 +3594,31 @@ msgstr ""
 "    ( nome_atributo tipo_dado [, ... ] )\n"
 "\n"
 "CREATE TYPE nome AS ENUM\n"
-"    ( 'r�tulo' [, ... ] )\n"
+"    ( 'rótulo' [, ... ] )\n"
 "\n"
 "CREATE TYPE nome (\n"
-"    INPUT = fun��o_entrada,\n"
-"    OUTPUT = fun��o_sa�da\n"
-"    [ , RECEIVE = fun��o_recep��o ]\n"
-"    [ , SEND = fun��o_envio ]\n"
-"    [ , TYPMOD_IN = fun��o_entrada_modificador_tipo ]\n"
-"    [ , TYPMOD_OUT = fun��o_sa�da_modificador_tipo ]\n"
-"    [ , ANALYZE = fun��o_an�lise ]\n"
+"    INPUT = função_entrada,\n"
+"    OUTPUT = função_saída\n"
+"    [ , RECEIVE = função_recepção ]\n"
+"    [ , SEND = função_envio ]\n"
+"    [ , TYPMOD_IN = função_entrada_modificador_tipo ]\n"
+"    [ , TYPMOD_OUT = função_saída_modificador_tipo ]\n"
+"    [ , ANALYZE = função_análise ]\n"
 "    [ , INTERNALLENGTH = { tamanho_interno | VARIABLE } ]\n"
 "    [ , PASSEDBYVALUE ]\n"
 "    [ , ALIGNMENT = alinhamento ]\n"
 "    [ , STORAGE = armazenamento ]\n"
-"    [ , DEFAULT = padr�o ]\n"
+"    [ , LIKE = tipo ]\n"
+"    [ , CATEGORY = categoria ]\n"
+"    [ , PREFERRED = tipo_preferido ]\n"
+"    [ , DEFAULT = padrão ]\n"
 "    [ , ELEMENT = elemento ]\n"
 "    [ , DELIMITER = delimitador ]\n"
 ")\n"
 "\n"
 "CREATE TYPE nome"
 
-#: sql_help.h:266
+#: sql_help.h:286
 msgid ""
 "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -3273,9 +3640,9 @@ msgid ""
 "    | USER rolename [, ...]\n"
 "    | SYSID uid"
 msgstr ""
-"CREATE USER nome [ [ WITH ] op��o [ ... ] ]\n"
+"CREATE USER nome [ [ WITH ] opção [ ... ] ]\n"
 "\n"
-"onde op��o pode ser:\n"
+"onde opção pode ser:\n"
 "    \n"
 "      SUPERUSER | NOSUPERUSER\n"
 "    | CREATEDB | NOCREATEDB\n"
@@ -3293,11 +3660,25 @@ msgstr ""
 "    | USER nome_role [, ...]\n"
 "    | SYSID uid"
 
-#: sql_help.h:269
+#: sql_help.h:289
+msgid "define a new mapping of a user to a foreign server"
+msgstr ""
+
+#: sql_help.h:290
+msgid ""
+"CREATE USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
+"    SERVER servername\n"
+"    [ OPTIONS ( option 'value' [ , ... ] ) ]"
+msgstr ""
+"CREATE USER MAPPING FOR { usuário | USER | CURRENT_USER | PUBLIC }\n"
+"    SERVER nome_servidor\n"
+"    [ OPTIONS ( opção 'valor' [ , ... ] ) ]"
+
+#: sql_help.h:293
 msgid "define a new view"
-msgstr "define uma nova vis�o"
+msgstr "define uma nova visão"
 
-#: sql_help.h:270
+#: sql_help.h:294
 msgid ""
 "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name "
 "[, ...] ) ]\n"
@@ -3307,19 +3688,19 @@ msgstr ""
 "[, ...] ) ]\n"
 "    AS consulta"
 
-#: sql_help.h:273
+#: sql_help.h:297
 msgid "deallocate a prepared statement"
 msgstr "remove um comando preparado"
 
-#: sql_help.h:274
+#: sql_help.h:298
 msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
 msgstr "DEALLOCATE [ PREPARE ] { nome | ALL }"
 
-#: sql_help.h:277
+#: sql_help.h:301
 msgid "define a cursor"
 msgstr "define um cursor"
 
-#: sql_help.h:278
+#: sql_help.h:302
 msgid ""
 "DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
 "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
@@ -3327,79 +3708,88 @@ msgstr ""
 "DECLARE nome [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
 "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR consulta"
 
-#: sql_help.h:281
+#: sql_help.h:305
 msgid "delete rows of a table"
 msgstr "apaga registros de uma tabela"
 
-#: sql_help.h:282
+#: sql_help.h:306
 msgid ""
 "DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
 "    [ USING usinglist ]\n"
 "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ AS output_name ] [, ...] ]"
+"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 msgstr ""
-"DELETE FROM [ ONLY ] tabela [ [ AS ] ali�s ]\n"
+"DELETE FROM [ ONLY ] tabela [ [ AS ] aliás ]\n"
 "    [ USING lista_util ]\n"
-"    [ WHERE condi��o | WHERE CURRENT OF nome_cursor ]\n"
-"    [ RETURNING * | express�o_sa�da [ AS nome_sa�da ] [, ...] ]"
+"    [ WHERE condição | WHERE CURRENT OF nome_cursor ]\n"
+"    [ RETURNING * | expressão_saída [ [ AS ] nome_saída ] [, ...] ]"
 
-#: sql_help.h:285
+#: sql_help.h:309
 msgid "discard session state"
-msgstr "descarta estado da sess�o"
+msgstr "descarta estado da sessão"
 
-#: sql_help.h:286
+#: sql_help.h:310
 msgid "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
 msgstr "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
 
-#: sql_help.h:289
+#: sql_help.h:313
 msgid "remove an aggregate function"
-msgstr "remove uma fun��o de agrega��o"
+msgstr "remove uma função de agregação"
 
-#: sql_help.h:290
+#: sql_help.h:314
 msgid ""
 "DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | RESTRICT ]"
 msgstr ""
 "DROP AGGREGATE [ IF EXISTS ] nome ( tipo [ , ... ] ) [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:293
+#: sql_help.h:317
 msgid "remove a cast"
-msgstr "remove uma convers�o de tipo"
+msgstr "remove uma conversão de tipo"
 
-#: sql_help.h:294
+#: sql_help.h:318
 msgid ""
 "DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
 msgstr ""
 "DROP [ IF EXISTS ] CAST (tipo_origem AS tipo_destino) [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:297
+#: sql_help.h:321
 msgid "remove a conversion"
-msgstr "remove uma convers�o"
+msgstr "remove uma conversão"
 
-#: sql_help.h:298
+#: sql_help.h:322
 msgid "DROP CONVERSION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr "DROP CONVERSION [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:301
+#: sql_help.h:325
 msgid "remove a database"
 msgstr "remove um banco de dados"
 
-#: sql_help.h:302
+#: sql_help.h:326
 msgid "DROP DATABASE [ IF EXISTS ] name"
 msgstr "DROP DATABASE [ IF EXISTS ] nome"
 
-#: sql_help.h:305
+#: sql_help.h:329
 msgid "remove a domain"
-msgstr "remove um dom�nio"
+msgstr "remove um domínio"
 
-#: sql_help.h:306
+#: sql_help.h:330
 msgid "DROP DOMAIN [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP DOMAIN [ IF EXISTS ] nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:309
+#: sql_help.h:333
+#, fuzzy
+msgid "remove a foreign-data wrapper"
+msgstr "remove um tipo de dado"
+
+#: sql_help.h:334
+msgid "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+msgstr "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
+
+#: sql_help.h:337
 msgid "remove a function"
-msgstr "remove uma fun��o"
+msgstr "remove uma função"
 
-#: sql_help.h:310
+#: sql_help.h:338
 msgid ""
 "DROP FUNCTION [ IF EXISTS ] name ( [ [ argmode ] [ argname ] argtype "
 "[, ...] ] )\n"
@@ -3408,47 +3798,35 @@ msgstr ""
 "DROP FUNCTION [ IF EXISTS ] nome ( [ [ modo ] [ nome ] tipo [, ...] ] )\n"
 "    [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:313 sql_help.h:341 sql_help.h:389
+#: sql_help.h:341 sql_help.h:369 sql_help.h:421
 msgid "remove a database role"
 msgstr "remove uma role do banco de dados"
 
-#: sql_help.h:314
+#: sql_help.h:342
 msgid "DROP GROUP [ IF EXISTS ] name [, ...]"
 msgstr "DROP GROUP [ IF EXISTS ] nome [, ...]"
 
-#: sql_help.h:317
+#: sql_help.h:345
 msgid "remove an index"
-msgstr "remove um �ndice"
+msgstr "remove um índice"
 
-#: sql_help.h:318
+#: sql_help.h:346
 msgid "DROP INDEX [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP INDEX [ IF EXISTS ] nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:321
+#: sql_help.h:349
 msgid "remove a procedural language"
 msgstr "remove uma linguagem procedural"
 
-#: sql_help.h:322
+#: sql_help.h:350
 msgid "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:325
-msgid "remove an operator class"
-msgstr "remove uma classe de operadores"
-
-#: sql_help.h:326
-msgid ""
-"DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | "
-"RESTRICT ]"
-msgstr ""
-"DROP OPERATOR CLASS [ IF EXISTS ] nome USING m�todo_�ndice [ CASCADE | "
-"RESTRICT ]"
-
-#: sql_help.h:329
+#: sql_help.h:353
 msgid "remove an operator"
 msgstr "remove um operador"
 
-#: sql_help.h:330
+#: sql_help.h:354
 msgid ""
 "DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | "
 "NONE } ) [ CASCADE | RESTRICT ]"
@@ -3456,158 +3834,191 @@ msgstr ""
 "DROP OPERATOR [ IF EXISTS ] nome ( { tipo_esquerda | NONE } , { tipo_direita "
 "| NONE } ) [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:333
+#: sql_help.h:357
+msgid "remove an operator class"
+msgstr "remove uma classe de operadores"
+
+#: sql_help.h:358
+msgid ""
+"DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | "
+"RESTRICT ]"
+msgstr ""
+"DROP OPERATOR CLASS [ IF EXISTS ] nome USING método_índice [ CASCADE | "
+"RESTRICT ]"
+
+#: sql_help.h:361
 msgid "remove an operator family"
-msgstr "remove uma fam�lia de operadores"
+msgstr "remove uma família de operadores"
 
-#: sql_help.h:334
+#: sql_help.h:362
 msgid ""
 "DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | "
 "RESTRICT ]"
 msgstr ""
-"DROP OPERATOR FAMILY [ IF EXISTS ] nome USING m�todo_�ndice [ CASCADE | "
+"DROP OPERATOR FAMILY [ IF EXISTS ] nome USING método_índice [ CASCADE | "
 "RESTRICT ]"
 
-#: sql_help.h:337
+#: sql_help.h:365
 msgid "remove database objects owned by a database role"
 msgstr ""
-"remove objetos do banco de dados cujo dono � uma role do banco de dados"
+"remove objetos do banco de dados cujo dono é uma role do banco de dados"
 
-#: sql_help.h:338
+#: sql_help.h:366
 msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP OWNED BY nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:342
+#: sql_help.h:370
 msgid "DROP ROLE [ IF EXISTS ] name [, ...]"
 msgstr "DROP ROLE [ IF EXISTS ] nome [, ...]"
 
-#: sql_help.h:345
+#: sql_help.h:373
 msgid "remove a rewrite rule"
 msgstr "remove uma regra de reescrita"
 
-#: sql_help.h:346
+#: sql_help.h:374
 msgid "DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ]"
-msgstr "DROP RULE [ IF EXISTS ] nome ON rela��o [ CASCADE | RESTRICT ]"
+msgstr "DROP RULE [ IF EXISTS ] nome ON relação [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:349
+#: sql_help.h:377
 msgid "remove a schema"
 msgstr "remove um esquema"
 
-#: sql_help.h:350
+#: sql_help.h:378
 msgid "DROP SCHEMA [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP SCHEMA [ IF EXISTS ] nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:353
+#: sql_help.h:381
 msgid "remove a sequence"
-msgstr "remove uma sequ�ncia"
+msgstr "remove uma sequência"
 
-#: sql_help.h:354
+#: sql_help.h:382
 msgid "DROP SEQUENCE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP SEQUENCE [ IF EXISTS ] nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:357
+#: sql_help.h:385
+#, fuzzy
+msgid "remove a foreign server descriptor"
+msgstr "remove uma descrição de servidor externo"
+
+#: sql_help.h:386
+msgid "DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ]"
+msgstr "DROP SERVER [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
+
+#: sql_help.h:389
 msgid "remove a table"
 msgstr "remove uma tabela"
 
-#: sql_help.h:358
+#: sql_help.h:390
 msgid "DROP TABLE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP TABLE [ IF EXISTS ] nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:361
+#: sql_help.h:393
 msgid "remove a tablespace"
 msgstr "remove uma tablespace"
 
-#: sql_help.h:362
+#: sql_help.h:394
 msgid "DROP TABLESPACE [ IF EXISTS ] tablespacename"
 msgstr "DROP TABLESPACE [ IF EXISTS ] nome_tablespace"
 
-#: sql_help.h:365
-msgid "remove a trigger"
-msgstr "remove um gatilho"
-
-#: sql_help.h:366
-msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
-msgstr "DROP TRIGGER [ IF EXISTS ] nome ON tabela [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:369
+#: sql_help.h:397
 msgid "remove a text search configuration"
-msgstr "remove uma configura��o de busca textual"
+msgstr "remove uma configuração de busca textual"
 
-#: sql_help.h:370
+#: sql_help.h:398
 msgid ""
 "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr ""
 "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:373
+#: sql_help.h:401
 msgid "remove a text search dictionary"
-msgstr "remove um dicion�rio de busca textual"
+msgstr "remove um dicionário de busca textual"
 
-#: sql_help.h:374
+#: sql_help.h:402
 msgid "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:377
+#: sql_help.h:405
 msgid "remove a text search parser"
 msgstr "remove um analisador de busca textual"
 
-#: sql_help.h:378
+#: sql_help.h:406
 msgid "DROP TEXT SEARCH PARSER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr "DROP TEXT SEARCH PARSER [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:381
+#: sql_help.h:409
 msgid "remove a text search template"
 msgstr "remove um modelo de busca textual"
 
-#: sql_help.h:382
+#: sql_help.h:410
 msgid "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 msgstr "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] nome [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:385
+#: sql_help.h:413
+msgid "remove a trigger"
+msgstr "remove um gatilho"
+
+#: sql_help.h:414
+msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
+msgstr "DROP TRIGGER [ IF EXISTS ] nome ON tabela [ CASCADE | RESTRICT ]"
+
+#: sql_help.h:417
 msgid "remove a data type"
 msgstr "remove um tipo de dado"
 
-#: sql_help.h:386
+#: sql_help.h:418
 msgid "DROP TYPE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP TYPE [ IF EXISTS ] nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:390
+#: sql_help.h:422
 msgid "DROP USER [ IF EXISTS ] name [, ...]"
 msgstr "DROP USER [ IF EXISTS ] nome [, ...]"
 
-#: sql_help.h:393
+#: sql_help.h:425
+msgid "remove a user mapping for a foreign server"
+msgstr ""
+
+#: sql_help.h:426
+msgid ""
+"DROP USER MAPPING [ IF EXISTS ] FOR { username | USER | CURRENT_USER | "
+"PUBLIC } SERVER servername"
+msgstr ""
+"DROP USER MAPPING [ IF EXISTS ] FOR { usuário | USER | CURRENT_USER | "
+"PUBLIC } SERVER nome_servidor"
+
+#: sql_help.h:429
 msgid "remove a view"
-msgstr "remove uma vis�o"
+msgstr "remove uma visão"
 
-#: sql_help.h:394
+#: sql_help.h:430
 msgid "DROP VIEW [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP VIEW [ IF EXISTS ] nome [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:398
+#: sql_help.h:434
 msgid "END [ WORK | TRANSACTION ]"
 msgstr "END [ WORK | TRANSACTION ]"
 
-#: sql_help.h:401
+#: sql_help.h:437
 msgid "execute a prepared statement"
 msgstr "executa um comando preparado"
 
-#: sql_help.h:402
+#: sql_help.h:438
 msgid "EXECUTE name [ ( parameter [, ...] ) ]"
-msgstr "EXECUTE nome [ ( par�metro [, ...] ) ]"
+msgstr "EXECUTE nome [ ( parâmetro [, ...] ) ]"
 
-#: sql_help.h:405
+#: sql_help.h:441
 msgid "show the execution plan of a statement"
-msgstr "mostra o plano de execu��o de um comando"
+msgstr "mostra o plano de execução de um comando"
 
-#: sql_help.h:406
+#: sql_help.h:442
 msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
 msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] comando"
 
-#: sql_help.h:409
+#: sql_help.h:445
 msgid "retrieve rows from a query using a cursor"
 msgstr "recupera registros de uma consulta utilizando um cursor"
 
-#: sql_help.h:410
+#: sql_help.h:446
 msgid ""
 "FETCH [ direction { FROM | IN } ] cursorname\n"
 "\n"
@@ -3628,9 +4039,9 @@ msgid ""
 "    BACKWARD count\n"
 "    BACKWARD ALL"
 msgstr ""
-"FETCH [ dire��o { FROM | IN } ] nome_cursor\n"
+"FETCH [ direção { FROM | IN } ] nome_cursor\n"
 "\n"
-"onde dire��o pode ser vazio ou um dos:\n"
+"onde direção pode ser vazio ou um dos:\n"
 "\n"
 "    NEXT\n"
 "    PRIOR\n"
@@ -3647,17 +4058,24 @@ msgstr ""
 "    BACKWARD contador\n"
 "    BACKWARD ALL"
 
-#: sql_help.h:413
+#: sql_help.h:449
 msgid "define access privileges"
-msgstr "define privil�gios de acesso"
+msgstr "define privilégios de acesso"
 
-#: sql_help.h:414
+#: sql_help.h:450
+#, fuzzy
 msgid ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
+"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+"TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] tablename [, ...]\n"
 "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
+"GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
+"    ON [ TABLE ] tablename [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
 "GRANT { { USAGE | SELECT | UPDATE }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON SEQUENCE sequencename [, ...]\n"
@@ -3668,6 +4086,14 @@ msgid ""
 "    ON DATABASE dbname [, ...]\n"
 "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER servername [, ...]\n"
+"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
 "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
 "    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
 "[, ...]\n"
@@ -3687,14 +4113,19 @@ msgid ""
 "\n"
 "GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
 msgstr ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
+"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] nome_tabela [, ...]\n"
 "    TO { [ GROUP ] nome_role | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
+"GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( coluna [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( coluna [, ...] ) }\n"
+"    ON [ TABLE ] nome_tabela [, ...]\n"
+"    TO { [ GROUP ] nome_role | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
 "GRANT { { USAGE | SELECT | UPDATE }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE nome_sequ�ncia [, ...]\n"
+"    ON SEQUENCE nome_sequência [, ...]\n"
 "    TO { [ GROUP ] nome_role | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
 "GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
@@ -3702,8 +4133,16 @@ msgstr ""
 "    ON DATABASE nome_banco_dados [, ...]\n"
 "    TO { [ GROUP ] nome_role | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    TO { [ GROUP ] nome_role | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER nome_servidor [, ...]\n"
+"    TO { [ GROUP ] nome_role | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+"\n"
 "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION nome_fun��o ( [ [ modo ] [ nome ] tipo [, ...] ] ) [, ...]\n"
+"    ON FUNCTION nome_função ( [ [ modo ] [ nome ] tipo [, ...] ] ) [, ...]\n"
 "    TO { [ GROUP ] nome_role | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 "\n"
 "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
@@ -3720,142 +4159,151 @@ msgstr ""
 "\n"
 "GRANT role [, ...] TO nome_role [, ...] [ WITH ADMIN OPTION ]"
 
-#: sql_help.h:417
+#: sql_help.h:453
 msgid "create new rows in a table"
 msgstr "cria novos registros em uma tabela"
 
-#: sql_help.h:418
+#: sql_help.h:454
 msgid ""
 "INSERT INTO table [ ( column [, ...] ) ]\n"
 "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | "
 "query }\n"
-"    [ RETURNING * | output_expression [ AS output_name ] [, ...] ]"
+"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 msgstr ""
 "INSERT INTO tabela [ ( coluna [, ...] ) ]\n"
-"    { DEFAULT VALUES | VALUES ( { express�o | DEFAULT } [, ...] ) [, ...] | "
+"    { DEFAULT VALUES | VALUES ( { expressão | DEFAULT } [, ...] ) [, ...] | "
 "consulta }\n"
-"    [ RETURNING * | express�o_sa�da [ AS nome_sa�da ] [, ...] ]"
+"    [ RETURNING * | expressão_saída [ [ AS ] nome_saída ] [, ...] ]"
 
-#: sql_help.h:421
+#: sql_help.h:457
 msgid "listen for a notification"
-msgstr "espera por uma notifica��o"
+msgstr "espera por uma notificação"
 
-#: sql_help.h:422
+#: sql_help.h:458
 msgid "LISTEN name"
 msgstr "LISTEN nome"
 
-#: sql_help.h:425
+#: sql_help.h:461
 msgid "load or reload a shared library file"
 msgstr "carrega ou recarrega um arquivo de biblioteca compartilhada"
 
-#: sql_help.h:426
+#: sql_help.h:462
 msgid "LOAD 'filename'"
 msgstr "LOAD 'arquivo'"
 
-#: sql_help.h:429
+#: sql_help.h:465
 msgid "lock a table"
 msgstr "bloqueia uma tabela"
 
-#: sql_help.h:430
+#: sql_help.h:466
 msgid ""
-"LOCK [ TABLE ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
+"LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
 "\n"
 "where lockmode is one of:\n"
 "\n"
 "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
 "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
 msgstr ""
-"LOCK [ TABLE ] nome [, ...] [ IN modo_bloqueio MODE ] [ NOWAIT ]\n"
+"LOCK [ TABLE ] [ ONLY ] nome [, ...] [ IN modo_bloqueio MODE ] [ NOWAIT ]\n"
 "\n"
-"onde modo_bloqueio � um dos:\n"
+"onde modo_bloqueio é um dos:\n"
 "\n"
 "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
 "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
 
-#: sql_help.h:433
+#: sql_help.h:469
 msgid "position a cursor"
 msgstr "posiciona um cursor"
 
-#: sql_help.h:434
+#: sql_help.h:470
 msgid "MOVE [ direction { FROM | IN } ] cursorname"
-msgstr "MOVE [ dire��o { FROM | IN } ] nome_cursor"
+msgstr "MOVE [ direção { FROM | IN } ] nome_cursor"
 
-#: sql_help.h:437
+#: sql_help.h:473
 msgid "generate a notification"
-msgstr "gera uma notifica��o"
+msgstr "gera uma notificação"
 
-#: sql_help.h:438
+#: sql_help.h:474
 msgid "NOTIFY name"
 msgstr "NOTIFY nome"
 
-#: sql_help.h:441
+#: sql_help.h:477
 msgid "prepare a statement for execution"
-msgstr "prepara um comando para execu��o"
+msgstr "prepara um comando para execução"
 
-#: sql_help.h:442
+#: sql_help.h:478
 msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
 msgstr "PREPARE nome [ ( tipo_dado [, ...] ) ] AS comando"
 
-#: sql_help.h:445
+#: sql_help.h:481
 msgid "prepare the current transaction for two-phase commit"
-msgstr "prepara a transa��o atual para efetiva��o em duas fases"
+msgstr "prepara a transação atual para efetivação em duas fases"
 
-#: sql_help.h:446
+#: sql_help.h:482
 msgid "PREPARE TRANSACTION transaction_id"
-msgstr "PREPARE TRANSACTION id_transa��o"
+msgstr "PREPARE TRANSACTION id_transação"
 
-#: sql_help.h:449
+#: sql_help.h:485
 msgid "change the ownership of database objects owned by a database role"
 msgstr ""
-"muda o dono dos objetos do banco de dados cujo dono � uma role do banco de "
+"muda o dono dos objetos do banco de dados cujo dono é uma role do banco de "
 "dados"
 
-#: sql_help.h:450
+#: sql_help.h:486
 msgid "REASSIGN OWNED BY old_role [, ...] TO new_role"
 msgstr "REASSIGN OWNED BY role_antiga [, ...] TO nova_role"
 
-#: sql_help.h:453
+#: sql_help.h:489
 msgid "rebuild indexes"
-msgstr "reconstr�i �ndices"
+msgstr "reconstrói índices"
 
-#: sql_help.h:454
+#: sql_help.h:490
 msgid "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ]"
 msgstr "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } nome [ FORCE ]"
 
-#: sql_help.h:457
+#: sql_help.h:493
 msgid "destroy a previously defined savepoint"
-msgstr "destr�i um ponto de salvamento definido anteriormente"
+msgstr "destrói um ponto de salvamento definido anteriormente"
 
-#: sql_help.h:458
+#: sql_help.h:494
 msgid "RELEASE [ SAVEPOINT ] savepoint_name"
 msgstr "RELEASE [ SAVEPOINT ] nome_savepoint"
 
-#: sql_help.h:461
+#: sql_help.h:497
 msgid "restore the value of a run-time parameter to the default value"
-msgstr "restaura o valor do par�metro em tempo de execu��o para o valor padr�o"
+msgstr "restaura o valor do parâmetro em tempo de execução para o valor padrão"
 
-#: sql_help.h:462
+#: sql_help.h:498
 msgid ""
 "RESET configuration_parameter\n"
 "RESET ALL"
 msgstr ""
-"RESET par�metro\n"
+"RESET parâmetro\n"
 "RESET ALL"
 
-#: sql_help.h:465
+#: sql_help.h:501
 msgid "remove access privileges"
-msgstr "remove privil�gios de acesso"
+msgstr "remove privilégios de acesso"
 
-#: sql_help.h:466
+#: sql_help.h:502
+#, fuzzy
 msgid ""
 "REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
+"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+"TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] tablename [, ...]\n"
 "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
+"    { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
+"    ON [ TABLE ] tablename [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
 "    { { USAGE | SELECT | UPDATE }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON SEQUENCE sequencename [, ...]\n"
@@ -3869,6 +4317,18 @@ msgid ""
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER servername [, ...]\n"
+"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
 "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
 "    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
 "[, ...]\n"
@@ -3898,16 +4358,23 @@ msgid ""
 "    [ CASCADE | RESTRICT ]"
 msgstr ""
 "REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
+"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
 "    ON [ TABLE ] nome_tabela [, ...]\n"
 "    FROM { [ GROUP ] nome_role | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
+"    { { SELECT | INSERT | UPDATE | REFERENCES } ( coluna [, ...] )\n"
+"    [,...] | ALL [ PRIVILEGES ] ( coluna [, ...] ) }\n"
+"    ON [ TABLE ] nome_tabela [, ...]\n"
+"    FROM { [ GROUP ] nome_role | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
 "    { { USAGE | SELECT | UPDATE }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE nome_sequ�ncia [, ...]\n"
+"    ON SEQUENCE nome_sequência [, ...]\n"
 "    FROM { [ GROUP ] nome_role | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
@@ -3918,8 +4385,20 @@ msgstr ""
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
 "REVOKE [ GRANT OPTION FOR ]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+"    FROM { [ GROUP ] nome_role | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
+"    { USAGE | ALL [ PRIVILEGES ] }\n"
+"    ON FOREIGN SERVER nome_servidor [, ...]\n"
+"    FROM { [ GROUP ] nome_role | PUBLIC } [, ...]\n"
+"    [ CASCADE | RESTRICT ]\n"
+"\n"
+"REVOKE [ GRANT OPTION FOR ]\n"
 "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION nome_fun��o ( [ [ modo ] [ nome ] tipo [, ...] ] ) [, ...]\n"
+"    ON FUNCTION nome_função ( [ [ modo ] [ nome ] tipo [, ...] ] ) [, ...]\n"
 "    FROM { [ GROUP ] nome_role | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]\n"
 "\n"
@@ -3945,76 +4424,90 @@ msgstr ""
 "    role [, ...] FROM nome_role [, ...]\n"
 "    [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:470
+#: sql_help.h:506
 msgid "ROLLBACK [ WORK | TRANSACTION ]"
 msgstr "ROLLBACK [ WORK | TRANSACTION ]"
 
-#: sql_help.h:473
+#: sql_help.h:509
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr ""
-"cancela uma transa��o que foi anteriormente preparada para efetiva��o em "
+"cancela uma transação que foi anteriormente preparada para efetivação em "
 "duas fases"
 
-#: sql_help.h:474
+#: sql_help.h:510
 msgid "ROLLBACK PREPARED transaction_id"
-msgstr "ROLLBACK PREPARED id_transa��o"
+msgstr "ROLLBACK PREPARED id_transação"
 
-#: sql_help.h:477
+#: sql_help.h:513
 msgid "roll back to a savepoint"
-msgstr "desfaz modifica��es de um ponto de salvamento"
+msgstr "desfaz modificações de um ponto de salvamento"
 
-#: sql_help.h:478
+#: sql_help.h:514
 msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
 msgstr "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] nome_savepoint"
 
-#: sql_help.h:481
+#: sql_help.h:517
 msgid "define a new savepoint within the current transaction"
-msgstr "define um novo ponto de salvamento na transa��o atual"
+msgstr "define um novo ponto de salvamento na transação atual"
 
-#: sql_help.h:482
+#: sql_help.h:518
 msgid "SAVEPOINT savepoint_name"
 msgstr "SAVEPOINT nome_savepoint"
 
-#: sql_help.h:485
+#: sql_help.h:521 sql_help.h:557 sql_help.h:581
 msgid "retrieve rows from a table or view"
-msgstr "recupera registros de uma tabela ou vis�o"
+msgstr "recupera registros de uma tabela ou visão"
 
-#: sql_help.h:486
+#: sql_help.h:522 sql_help.h:558 sql_help.h:582
+#, fuzzy
 msgid ""
+"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ AS output_name ] [, ...]\n"
+"    * | expression [ [ AS ] output_name ] [, ...]\n"
 "    [ FROM from_item [, ...] ]\n"
 "    [ WHERE condition ]\n"
 "    [ GROUP BY expression [, ...] ]\n"
 "    [ HAVING condition [, ...] ]\n"
+"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
 "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
 "LAST } ] [, ...] ]\n"
 "    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start ]\n"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]\n"
 "\n"
 "where from_item can be one of:\n"
 "\n"
 "    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
 "    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
+"    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
 "    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "
 "[, ...] | column_definition [, ...] ) ]\n"
 "    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"
 "    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
-"( join_column [, ...] ) ]"
+"( join_column [, ...] ) ]\n"
+"\n"
+"and with_query is:\n"
+"\n"
+"    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
+"\n"
+"TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
 msgstr ""
-"SELECT [ ALL | DISTINCT [ ON ( express�o [, ...] ) ] ]\n"
-"    * | express�o [ AS nome_sa�da ] [, ...]\n"
+"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
+"SELECT [ ALL | DISTINCT [ ON ( expressão [, ...] ) ] ]\n"
+"    * | expressão [ AS nome_saída ] [, ...]\n"
 "    [ FROM item_de [, ...] ]\n"
-"    [ WHERE condi��o ]\n"
-"    [ GROUP BY express�o [, ...] ]\n"
-"    [ HAVING condi��o [, ...] ]\n"
+"    [ WHERE condição ]\n"
+"    [ GROUP BY expressão [, ...] ]\n"
+"    [ HAVING condição [, ...] ]\n"
+"    [ WINDOW nome_window AS ( definição_window ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY express�o [ ASC | DESC | USING operador ] [ NULLS { FIRST | "
+"    [ ORDER BY expressão [ ASC | DESC | USING operador ] [ NULLS { FIRST | "
 "LAST } ] [, ...] ]\n"
 "    [ LIMIT { contador | ALL } ]\n"
-"    [ OFFSET in�cio ]\n"
+"    [ OFFSET início ]\n"
+"    [ FETCH { FIRST | NEXT } [ contador ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF nome_tabela [, ...] ] [ NOWAIT ] [...] ]\n"
 "\n"
 "onde item_de pode ser um dos:\n"
@@ -4022,68 +4515,82 @@ msgstr ""
 "    [ ONLY ] nome_tabela [ * ] [ [ AS ] alias [ ( alias_coluna "
 "[, ...] ) ] ]\n"
 "    ( select ) [ AS ] alias [ ( alias_coluna [, ...] ) ]\n"
-"    nome_fun��o ( [ argumento [, ...] ] ) [ AS ] alias [ ( alias_coluna "
-"[, ...] | defini��o_coluna [, ...] ) ]\n"
-"    nome_fun��o ( [ argumento [, ...] ] ) AS ( defini��o_coluna [, ...] )\n"
-"    item_de [ NATURAL ] tipo_jun��o item_de [ ON condi��o_jun��o | USING "
-"( coluna_jun��o [, ...] ) ]"
+"    nome_função ( [ argumento [, ...] ] ) [ AS ] alias [ ( alias_coluna "
+"[, ...] | definição_coluna [, ...] ) ]\n"
+"    with_query_name [ [ AS ] alias [ ( alias_coluna [, ...] ) ] ]\n"
+"    nome_função ( [ argumento [, ...] ] ) AS ( definição_coluna [, ...] )\n"
+"    item_de [ NATURAL ] tipo_junção item_de [ ON condição_junção | USING "
+"( coluna_junção [, ...] ) ]\n"
+"\n"
+"and with_query é:\n"
+"\n"
+"    with_query_name [ ( nome_coluna [, ...] ) ] AS ( select )\n"
+"\n"
+"TABLE { [ ONLY ] nome_tabela [ * ] | with_query_name }"
 
-#: sql_help.h:490
+#: sql_help.h:526
+#, fuzzy
 msgid ""
+"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ AS output_name ] [, ...]\n"
+"    * | expression [ [ AS ] output_name ] [, ...]\n"
 "    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
 "    [ FROM from_item [, ...] ]\n"
 "    [ WHERE condition ]\n"
 "    [ GROUP BY expression [, ...] ]\n"
 "    [ HAVING condition [, ...] ]\n"
+"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
 "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
 "LAST } ] [, ...] ]\n"
 "    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start ]\n"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
 msgstr ""
-"SELECT [ ALL | DISTINCT [ ON ( express�o [, ...] ) ] ]\n"
-"    * | express�o [ AS nome_sa�da ] [, ...]\n"
+"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
+"SELECT [ ALL | DISTINCT [ ON ( expressão [, ...] ) ] ]\n"
+"    * | expressão [ AS nome_saída ] [, ...]\n"
 "    INTO [ TEMPORARY | TEMP ] [ TABLE ] nova_tabela\n"
 "    [ FROM item_de [, ...] ]\n"
-"    [ WHERE condi��o ]\n"
-"    [ GROUP BY express�o [, ...] ]\n"
-"    [ HAVING condi��o [, ...] ]\n"
+"    [ WHERE condição ]\n"
+"    [ GROUP BY expressão [, ...] ]\n"
+"    [ HAVING condição [, ...] ]\n"
+"    [ WINDOW nome_window AS ( definição_window ) [, ...] ]\n"
 "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY express�o [ ASC | DESC | USING operador ] [ NULLS { FIRST | "
+"    [ ORDER BY expressão [ ASC | DESC | USING operador ] [ NULLS { FIRST | "
 "LAST } ] [, ...] ]\n"
 "    [ LIMIT { contador | ALL } ]\n"
-"    [ OFFSET in�cio ]\n"
+"    [ OFFSET início ] [ ROW | ROWS ]\n"
+"    [ FETCH { FIRST | NEXT } [ contador ] { ROW | ROWS } ONLY ]\n"
 "    [ FOR { UPDATE | SHARE } [ OF nome_tabela [, ...] ] [ NOWAIT ] [...] ]"
 
-#: sql_help.h:493
+#: sql_help.h:529
 msgid "change a run-time parameter"
-msgstr "muda um par�metro em tempo de execu��o"
+msgstr "muda um parâmetro em tempo de execução"
 
-#: sql_help.h:494
+#: sql_help.h:530
 msgid ""
 "SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | 'value' "
 "| DEFAULT }\n"
 "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
 msgstr ""
-"SET [ SESSION | LOCAL ] par�metro { TO | = } { valor | 'valor' | DEFAULT }\n"
-"SET [ SESSION | LOCAL ] TIME ZONE { zona_hor�ria | LOCAL | DEFAULT }"
+"SET [ SESSION | LOCAL ] parâmetro { TO | = } { valor | 'valor' | DEFAULT }\n"
+"SET [ SESSION | LOCAL ] TIME ZONE { zona_horária | LOCAL | DEFAULT }"
 
-#: sql_help.h:497
+#: sql_help.h:533
 msgid "set constraint checking modes for the current transaction"
-msgstr "define os modos de verifica��o das restri��es na transa��o atual"
+msgstr "define os modos de verificação das restrições na transação atual"
 
-#: sql_help.h:498
+#: sql_help.h:534
 msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
 msgstr "SET CONSTRAINTS { ALL | nome [, ...] } { DEFERRED | IMMEDIATE }"
 
-#: sql_help.h:501
+#: sql_help.h:537
 msgid "set the current user identifier of the current session"
-msgstr "define o identificador do usu�rio atual nesta sess�o"
+msgstr "define o identificador do usuário atual nesta sessão"
 
-#: sql_help.h:502
+#: sql_help.h:538
 msgid ""
 "SET [ SESSION | LOCAL ] ROLE rolename\n"
 "SET [ SESSION | LOCAL ] ROLE NONE\n"
@@ -4093,29 +4600,29 @@ msgstr ""
 "SET [ SESSION | LOCAL ] ROLE NONE\n"
 "RESET ROLE"
 
-#: sql_help.h:505
+#: sql_help.h:541
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
 msgstr ""
-"define o identificador da sess�o do usu�rio e o identificador do usu�rio na "
-"sess�o atual"
+"define o identificador da sessão do usuário e o identificador do usuário na "
+"sessão atual"
 
-#: sql_help.h:506
+#: sql_help.h:542
 msgid ""
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
 "RESET SESSION AUTHORIZATION"
 msgstr ""
-"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION usu�rio\n"
+"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION usuário\n"
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
 "RESET SESSION AUTHORIZATION"
 
-#: sql_help.h:509
+#: sql_help.h:545
 msgid "set the characteristics of the current transaction"
-msgstr "define as caracter�sticas da transa��o atual"
+msgstr "define as características da transação atual"
 
-#: sql_help.h:510
+#: sql_help.h:546
 msgid ""
 "SET TRANSACTION transaction_mode [, ...]\n"
 "SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
@@ -4126,20 +4633,20 @@ msgid ""
 "UNCOMMITTED }\n"
 "    READ WRITE | READ ONLY"
 msgstr ""
-"SET TRANSACTION modo_transa��o [, ...]\n"
-"SET SESSION CHARACTERISTICS AS TRANSACTION modo_transa��o [, ...]\n"
+"SET TRANSACTION modo_transação [, ...]\n"
+"SET SESSION CHARACTERISTICS AS TRANSACTION modo_transação [, ...]\n"
 "\n"
-"onde modo_transa��o � um dos:\n"
+"onde modo_transação é um dos:\n"
 "\n"
 "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
 "UNCOMMITTED }\n"
 "    READ WRITE | READ ONLY"
 
-#: sql_help.h:513
+#: sql_help.h:549
 msgid "show the value of a run-time parameter"
-msgstr "mostra o valor de um par�metro em tempo de execu��o"
+msgstr "mostra o valor de um parâmetro em tempo de execução"
 
-#: sql_help.h:514
+#: sql_help.h:550
 msgid ""
 "SHOW name\n"
 "SHOW ALL"
@@ -4147,7 +4654,7 @@ msgstr ""
 "SHOW nome\n"
 "SHOW ALL"
 
-#: sql_help.h:518
+#: sql_help.h:554
 msgid ""
 "START TRANSACTION [ transaction_mode [, ...] ]\n"
 "\n"
@@ -4157,35 +4664,39 @@ msgid ""
 "UNCOMMITTED }\n"
 "    READ WRITE | READ ONLY"
 msgstr ""
-"START TRANSACTION [ modo_transa��o [, ...] ]\n"
+"START TRANSACTION [ modo_transação [, ...] ]\n"
 "\n"
-"onde modo_transa��o � um dos:\n"
+"onde modo_transação é um dos:\n"
 "\n"
 "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
 "UNCOMMITTED }\n"
 "    READ WRITE | READ ONLY"
 
-#: sql_help.h:521
+#: sql_help.h:561
 msgid "empty a table or set of tables"
 msgstr "esvazia uma tabela ou um conjunto de tabelas"
 
-#: sql_help.h:522
-msgid "TRUNCATE [ TABLE ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "TRUNCATE [ TABLE ] nome [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:562
+msgid ""
+"TRUNCATE [ TABLE ] [ ONLY ] name [, ... ]\n"
+"    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
+msgstr ""
+"TRUNCATE [ TABLE ] [ ONLY ] nome [, ...]\n"
+"    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:525
+#: sql_help.h:565
 msgid "stop listening for a notification"
-msgstr "para de esperar por notifica��o"
+msgstr "para de esperar por notificação"
 
-#: sql_help.h:526
+#: sql_help.h:566
 msgid "UNLISTEN { name | * }"
 msgstr "UNLISTEN { nome | * }"
 
-#: sql_help.h:529
+#: sql_help.h:569
 msgid "update rows of a table"
 msgstr "atualiza registros de uma tabela"
 
-#: sql_help.h:530
+#: sql_help.h:570
 msgid ""
 "UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
 "    SET { column = { expression | DEFAULT } |\n"
@@ -4193,21 +4704,21 @@ msgid ""
 "[, ...]\n"
 "    [ FROM fromlist ]\n"
 "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ AS output_name ] [, ...] ]"
+"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 msgstr ""
-"UPDATE [ ONLY ] tabela [ [ AS ] ali�s ]\n"
-"    SET { coluna = { express�o | DEFAULT } |\n"
-"          ( coluna [, ...] ) = ( { express�o | DEFAULT } [, ...] ) } "
+"UPDATE [ ONLY ] tabela [ [ AS ] aliás ]\n"
+"    SET { coluna = { expressão | DEFAULT } |\n"
+"          ( coluna [, ...] ) = ( { expressão | DEFAULT } [, ...] ) } "
 "[, ...]\n"
 "    [ FROM lista_de ]\n"
-"    [ WHERE condi��o | WHERE CURRENT OF nome_cursor ]\n"
-"    [ RETURNING * | express�o_sa�da [ AS nome_sa�da ] [, ...] ]"
+"    [ WHERE condição | WHERE CURRENT OF nome_cursor ]\n"
+"    [ RETURNING * | expressão_saída [ [ AS ] nome_saída ] [, ...] ]"
 
-#: sql_help.h:533
+#: sql_help.h:573
 msgid "garbage-collect and optionally analyze a database"
 msgstr "coleta lixo e opcionalmente analisa um banco de dados"
 
-#: sql_help.h:534
+#: sql_help.h:574
 msgid ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
@@ -4217,74 +4728,76 @@ msgstr ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ tabela [ (coluna "
 "[, ...] ) ] ]"
 
-#: sql_help.h:537
+#: sql_help.h:577
 msgid "compute a set of rows"
 msgstr "computa um conjunto de registros"
 
-#: sql_help.h:538
+#: sql_help.h:578
 msgid ""
 "VALUES ( expression [, ...] ) [, ...]\n"
 "    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
 "    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start ]"
+"    [ OFFSET start [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
 msgstr ""
-"VALUES ( express�o [, ...] ) [, ...]\n"
-"    [ ORDER BY express�o_de_ordena��o [ ASC | DESC | USING operador ] "
+"VALUES ( expressão [, ...] ) [, ...]\n"
+"    [ ORDER BY expressão_de_ordenação [ ASC | DESC | USING operador ] "
 "[, ...] ]\n"
 "    [ LIMIT { contador | ALL } ]\n"
-"    [ OFFSET in�cio ]"
+"    [ OFFSET início [ ROW | ROWS ] ]\n"
+"    [ FETCH { FIRST | NEXT } [ contador ] { ROW | ROWS } ONLY ]"
 
-#: ../../port/exec.c:192 ../../port/exec.c:306 ../../port/exec.c:349
+#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
 #, c-format
 msgid "could not identify current directory: %s"
-msgstr "n�o p�de identificar diret�rio atual: %s"
+msgstr "não pôde identificar diretório atual: %s"
 
-#: ../../port/exec.c:211
+#: ../../port/exec.c:214
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "bin�rio \"%s\" � inv�lido"
+msgstr "binário \"%s\" é inválido"
 
-#: ../../port/exec.c:260
+#: ../../port/exec.c:263
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "n�o p�de ler o bin�rio \"%s\""
+msgstr "não pôde ler o binário \"%s\""
 
-#: ../../port/exec.c:267
+#: ../../port/exec.c:270
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "n�o p�de encontrar o \"%s\" para execut�-lo"
+msgstr "não pôde encontrar o \"%s\" para executá-lo"
 
-#: ../../port/exec.c:322 ../../port/exec.c:358
+#: ../../port/exec.c:325 ../../port/exec.c:361
 #, c-format
 msgid "could not change directory to \"%s\""
-msgstr "n�o p�de mudar diret�rio para \"%s\""
+msgstr "não pôde mudar diretório para \"%s\""
 
-#: ../../port/exec.c:337
+#: ../../port/exec.c:340
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "n�o p�de ler link simb�lico \"%s\""
+msgstr "não pôde ler link simbólico \"%s\""
 
-#: ../../port/exec.c:583
+#: ../../port/exec.c:586
 #, c-format
 msgid "child process exited with exit code %d"
-msgstr "processo filho terminou com c�digo de sa�da %d"
+msgstr "processo filho terminou com código de saída %d"
 
-#: ../../port/exec.c:587
+#: ../../port/exec.c:590
 #, c-format
 msgid "child process was terminated by exception 0x%X"
-msgstr "processo filho foi terminado pela exce��o 0x%X"
+msgstr "processo filho foi terminado pela exceção 0x%X"
 
-#: ../../port/exec.c:596
+#: ../../port/exec.c:599
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "processo filho foi terminado pelo sinal %s"
 
-#: ../../port/exec.c:599
+#: ../../port/exec.c:602
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "processo filho foi terminado pelo sinal %d"
 
-#: ../../port/exec.c:603
+#: ../../port/exec.c:606
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "processo filho terminou com status desconhecido %d"
diff --git a/src/bin/psql/po/tr.po b/src/bin/psql/po/tr.po
index 54932cbc8a..afc6d2797f 100644
--- a/src/bin/psql/po/tr.po
+++ b/src/bin/psql/po/tr.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psql-tr\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-05-05 03:09+0000\n"
-"PO-Revision-Date: 2009-05-05 09:31+0200\n"
-"Last-Translator: Devrim GÜNDÜZ <devrim@commandprompt.com>\n"
+"POT-Creation-Date: 2009-05-29 15:08+0000\n"
+"PO-Revision-Date: 2009-05-31 21:33+0200\n"
+"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -785,7 +785,7 @@ msgstr "  \\h [NAME]              SQL komutları için sözdizimi yardımı, tü
 #: help.c:173
 #, c-format
 msgid "  \\q                     quit psql\n"
-msgstr "  \\q                    psql'den çık\n"
+msgstr "  \\q                     psql'den çık\n"
 
 #: help.c:176
 #, c-format
@@ -925,7 +925,7 @@ msgstr "  \\df[antw][S+] [PATRN]  [sadece agg/normal/trigger/window] fonksiyonla
 #: help.c:209
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [PATTERN]      öetin ama yapılandırmalarını listele\n"
+msgstr "  \\dF[+]  [PATTERN]      metin arama yapılandırmalarını listele\n"
 
 #: help.c:210
 #, c-format
@@ -950,7 +950,7 @@ msgstr "  \\dg     [PATTERN]      rolleri (grupları) listele\n"
 #: help.c:214
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\dD[S+]  [PATTERN]  indexleri göster\n"
+msgstr "  \\di[S+] [PATTERN]      indexleri göster\n"
 
 #: help.c:215
 #, c-format
@@ -985,7 +985,7 @@ msgstr "  \\dt[S+] [PATTERN]      tabloları listele\n"
 #: help.c:221
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [PATTERN]      lveri tiplerini listele\n"
+msgstr "  \\dT[S+] [PATTERN]      veri tiplerini listele\n"
 
 #: help.c:222
 #, c-format
@@ -1020,12 +1020,12 @@ msgstr "  \\a                    düzenli ve düzensiz çıktı modu arasında g
 #: help.c:230
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
-msgstr "  \\C [STRING]            tablo başlığını ayarla, ya daboş bırakılırsa kaldır\n"
+msgstr "  \\C [DİZİ]            tablo başlığını ayarla, ya da boş bırakılırsa kaldır\n"
 
 #: help.c:231
 #, c-format
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
-msgstr "  \\f [STRING]            düzensiz sorgu çıktısı için alan ayracını göster ya da tanımla\n"
+msgstr "  \\f [DİZİ]            düzensiz sorgu çıktısı için alan ayracını göster ya da tanımla\n"
 
 #: help.c:232
 #, c-format
@@ -1039,8 +1039,8 @@ msgid ""
 "                         (NAME := {format|border|expanded|fieldsep|footer|null|\n"
 "                         numericlocale|recordsep|tuples_only|title|tableattr|pager})\n"
 msgstr ""
-"  \\pset NAME [VALUE]    tablo çıktısı biçimini ayarla\n"
-"                         (NAME := {format|border|expanded|fieldsep|footer|null|\n"
+"  \\pset AD [VALUE]    tablo çıktısı biçimini ayarla\n"
+"                         (AD := {format|border|expanded|fieldsep|footer|null|\n"
 "                         numericlocale|recordsep|tuples_only|title|tableattr|pager})\n"
 
 #: help.c:237
@@ -1100,7 +1100,7 @@ msgstr "  \\timing [on|off]       komutların çalışma zamanlamasının göste
 #: help.c:256
 #, c-format
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
-msgstr "  \\! [KOMUT]           konutu kabukta çalıştır ya da etkileşimli kabuğu başlat\n"
+msgstr "  \\! [KOMUT]           komutu kabukta çalıştır ya da etkileşimli kabuğu başlat\n"
 
 #: help.c:259
 #, c-format
@@ -1247,7 +1247,7 @@ msgid ""
 msgstr ""
 "Komutlar:  \\copyright dağıtım koşulları için\n"
 "       \\h SQL komutları hakkında yardım için\n"
-"       \\? psql dahili komutların yardımı için\n"
+"       \\? psql dahili komutlarının yardımı için\n"
 "       \\g ya da noktalı virgül:  sorguyu çalıştırmak için\n"
 "       \\q çıkmak için\n"
 
@@ -1278,10 +1278,10 @@ msgstr "geçersiz çıktı biçimi (iç hata): %d"
 
 #: print.c:2351
 #, c-format
-msgid "(1 row)"
+msgid "(%lu row)"
 msgid_plural "(%lu rows)"
 msgstr[0] "(%lu satır)"
-msgstr[1] "(1 satır)"
+msgstr[1] "(%lu satır)"
 
 #: startup.c:217
 #, c-format
@@ -1834,7 +1834,7 @@ msgstr "Bağlantı yok"
 
 #: describe.c:2039
 #, c-format
-msgid "1 connection"
+msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d bağlantı"
 msgstr[1] "1 bağlantı"
@@ -2516,7 +2516,7 @@ msgstr ""
 "ALTER TABLE ad\n"
 "    SET SCHEMA yeni şema\n"
 "\n"
-"where action is one of:\n"
+"action aşağıdakilerden birisi olabilir:\n"
 "\n"
 "    ADD [ COLUMN ] kolon kolon_tipi [ kolon kısıtlaması [ ... ] ]\n"
 "    DROP [ COLUMN ] kolon [ RESTRICT | CASCADE ]\n"
@@ -2524,7 +2524,7 @@ msgstr ""
 "    ALTER [ COLUMN ] kolon SET DEFAULT ifade\n"
 "    ALTER [ COLUMN ] kolon DROP DEFAULT\n"
 "    ALTER [ COLUMN ] kolon { SET | DROP } NOT NULL\n"
-"    ALTER [ COLUMN ] kolon SET STATISTICS tamyısa\n"
+"    ALTER [ COLUMN ] kolon SET STATISTICS tamsayı\n"
 "    ALTER [ COLUMN ] kolon SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }\n"
 "    ADD tablo kısıtlaması\n"
 "    DROP CONSTRAINT kısıtlama adı [ RESTRICT | CASCADE ]\n"
@@ -4740,6 +4740,10 @@ msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
 msgid "child process exited with unrecognized status %d"
 msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
 
+#~ msgid "(1 row)"
+#~ msgid_plural "(%lu rows)"
+#~ msgstr[0] "(%lu satır)"
+#~ msgstr[1] "(1 satır)"
 #~ msgid "Usage:"
 #~ msgstr "Kullanımı:"
 #~ msgid "General options:"
@@ -4807,8 +4811,6 @@ msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
 #~ "ile aynı)\n"
 #~ msgid "Copy, Large Object\n"
 #~ msgstr "Copy, Large Object\n"
-#~ msgid "(%lu rows)"
-#~ msgstr "(%lu satır)"
 #~ msgid ""
 #~ "Welcome to %s %s (server %s), the PostgreSQL interactive terminal.\n"
 #~ "\n"