Translation updates

6 files changed, 1717 insertions, 290 deletions

diff --git a/src/bin/pg_controldata/po/ru.po b/src/bin/pg_controldata/po/ru.po
index 2ae92051b5..8e30bdb5fb 100644
--- a/src/bin/pg_controldata/po/ru.po
+++ b/src/bin/pg_controldata/po/ru.po
@@ -1,18 +1,18 @@
 # ru.po
 # PG_CONTROLDATA Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/Attic/ru.po,v 1.4 2003/08/04 14:01:32 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/Attic/ru.po,v 1.5 2003/08/24 21:18:51 petere Exp $
 #
 # ChangeLog:
-#   - July 24-26, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24 - August 23, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post 7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
-"POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-08-01 14:10-0500\n"
+"POT-Creation-Date: 2003-08-23 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 13:28-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid ""
 "%s displays control information of a PostgreSQL database cluster.\n"
 "\n"
 msgstr ""
-"%s отображает информацию по управлению кластерами базы PostgreSQL.\n"
+"%s отображает информацию по управлению кластером баз PostgreSQL.\n"
 "\n"
 
 #: pg_controldata.c:32
@@ -45,7 +45,7 @@ msgstr ""
 "Опции:\n"
 "  ДИРДАННЫХ      показать информацию по управлению кластера для ДИРДАННЫХ\n"
 "  --help         показать эту подсказку и выйти\n"
-"  --version      показать версию pg_controldata и выйтиt\n"
+"  --version      показать версию pg_controldata и выйти\n"
 "\n"
 
 #: pg_controldata.c:41
@@ -116,7 +116,7 @@ msgid ""
 "\n"
 msgstr ""
 "ВНИМАНИЕ: Сосчитанная контрольная сумма CRC не совпадает со значением в файле.\n"
-"Файл либо повреждён либо его формат отличатется от ожидаемого этой программой.\n"
+"Файл либо повреждён, либо его формат отличается от ожидаемого этой программой.\n"
 "Не стоит доверять результатам представленным ниже.\n"
 "\n"
 
@@ -208,7 +208,7 @@ msgstr "Максимальная длина идентификаторов:   %u\n"
 #: pg_controldata.c:171
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
-msgstr "Максмальное число аргументов функции: %u\n"
+msgstr "Максимальное число аргументов функции: %u\n"
 
 #: pg_controldata.c:172
 #, c-format
diff --git a/src/bin/pg_resetxlog/po/ru.po b/src/bin/pg_resetxlog/po/ru.po
index bb6a8a5c91..a24532f711 100644
--- a/src/bin/pg_resetxlog/po/ru.po
+++ b/src/bin/pg_resetxlog/po/ru.po
@@ -1,10 +1,10 @@
 # ru.po
 # PG_RESETXLOG Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.4 2003/08/04 14:01:37 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.5 2003/08/24 21:18:51 petere Exp $
 #
 # ChangeLog:
-#   - July 24-26, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24 - August 23, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
-"POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-08-01 14:15-0500\n"
+"POT-Creation-Date: 2003-08-23 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 13:34-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@ msgid ""
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
-"Если вы уверены что путь к директории данных правельный, наберите\n"
+"Если вы уверены что путь к директории данных правильный, наберите\n"
 "  touch %s\n"
 "и попробуйте снова.\n"
 
@@ -122,7 +122,7 @@ msgstr "%s: pg_control существует, но его контрольная сумма CRC неверна; продолж
 #: pg_resetxlog.c:356
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control существует но повреждён или неизвестной версии; игнорируется...\n"
+msgstr "%s: pg_control существует, но повреждён или неизвестной версии; игнорируется...\n"
 
 #: pg_resetxlog.c:407
 #, c-format
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index 2b4f6f7463..8bef386199 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -1,6 +1,6 @@
-# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.8 2003/06/28 22:31:01 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.9 2003/08/24 21:18:52 petere Exp $
 CATALOG_NAME	:= psql
-AVAIL_LANGUAGES	:= cs de fr hu ru sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr hu ru sv zh_CN zh_TW
 GETTEXT_FILES	:= command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c startup.c describe.c
 GETTEXT_TRIGGERS:= _ psql_error simple_prompt
diff --git a/src/bin/psql/po/es.po b/src/bin/psql/po/es.po
new file mode 100644
index 0000000000..c41a2f0c92
--- /dev/null
+++ b/src/bin/psql/po/es.po
@@ -0,0 +1,1390 @@
+# translation of psql.
+# This file is put in the public domain.
+# <alvherre@dcc.uchile.cl>, 2003.
+#  <alvherre@dcc.uchile.cl>, 2003.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.4\n"
+"POT-Creation-Date: 2003-08-23 23:45-0400\n"
+"PO-Revision-Date: 2003-08-24 14:22-0400\n"
+"Last-Translator: аlvaro Herrera <alvherre@dcc.uchile.cl>\n"
+"Language-Team: Hackers <pgsql-hackers@postgresql.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: command.c:154
+msgid "Warning: This syntax is deprecated.\n"
+msgstr "AtenciСn: esta sintaxis estА obsoleta.\n"
+
+#: command.c:161
+#, c-format
+msgid "Invalid command \\%s. Try \\? for help.\n"
+msgstr "Comando \\%s no vАlido. Use \\? para obtener ayuda.\n"
+
+#: command.c:163
+#, c-format
+msgid "invalid command \\%s\n"
+msgstr "comando \\%s no vАlido\n"
+
+#: command.c:290
+#, c-format
+msgid "could not get home directory: %s\n"
+msgstr "No se ha podido obtener directorio home: %s\n"
+
+#: command.c:306
+#, c-format
+msgid "\\%s: could not change directory to \"%s\": %s\n"
+msgstr "\\%s: no se pudo cambiar directorio a \"%s\": %s\n"
+
+#: command.c:411 command.c:780
+msgid "no query buffer\n"
+msgstr "no hay bЗfer de consulta\n"
+
+#: command.c:476
+#, 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:538 command.c:569 command.c:580 command.c:594 command.c:636
+#: command.c:760 command.c:789
+#, c-format
+msgid "\\%s: missing required argument\n"
+msgstr "\\%s: falta argumento requerido\n"
+
+#: command.c:624
+msgid "Query buffer is empty."
+msgstr "El bЗfer de consulta estА vacМo."
+
+#: command.c:657
+msgid "Query buffer reset (cleared)."
+msgstr "El bЗfer de consulta ha sido reiniciado (limpiado)."
+
+#: command.c:668
+#, c-format
+msgid "Wrote history to file \"%s\".\n"
+msgstr "Se escribiС historial a archivo \"%s\".\n"
+
+#: command.c:700 command.c:1160 command.c:1257 command.c:1975 common.c:81
+#: copy.c:88 copy.c:116 mainloop.c:78 mainloop.c:340 describe.c:51
+msgid "out of memory\n"
+msgstr "memoria agotada\n"
+
+#: command.c:715 command.c:765
+#, c-format
+msgid "\\%s: error\n"
+msgstr "\\%s: error\n"
+
+#: command.c:804 command.c:824 command.c:1022 command.c:1035 command.c:1046
+#: command.c:1617 command.c:1630 command.c:1642 command.c:1655 command.c:1669
+#: command.c:1691 command.c:1721 common.c:130 copy.c:379
+#, c-format
+msgid "%s: %s\n"
+msgstr "%s: %s\n"
+
+#: command.c:890
+#, c-format
+msgid "\\%s: extra argument \"%s\" ignored\n"
+msgstr "\\%s: argumento extra \"%s\" ignorado\n"
+
+#: command.c:983 command.c:1011 command.c:1133
+msgid "parse error at the end of line\n"
+msgstr "error de procesamiento en el fin de lМnea\n"
+
+#: command.c:1362 command.c:1386 startup.c:176 startup.c:194
+msgid "Password: "
+msgstr "ContraseЯa: "
+
+#: command.c:1400 common.c:176 common.c:346 common.c:396 common.c:612
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: command.c:1404
+msgid "Previous connection kept\n"
+msgstr "Se ha mantenido la conexiСn anterior\n"
+
+#: command.c:1416
+#, c-format
+msgid "\\connect: %s"
+msgstr "\\connect: %s"
+
+#: command.c:1428
+#, c-format
+msgid "You are now connected to database \"%s\".\n"
+msgstr "Ahora estА conectado a la base de datos \"%s\".\n"
+
+#: command.c:1430
+#, c-format
+msgid "You are now connected as new user \"%s\".\n"
+msgstr "Ahora estА conectado como el usuario \"%s\".\n"
+
+#: command.c:1433
+#, c-format
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr ""
+"Ahora estА conectado a la base de datos \"%s\"\n"
+"con el usuario \"%s\".\n"
+
+#: command.c:1555
+#, c-format
+msgid "could not start editor \"%s\"\n"
+msgstr "no se ha podido iniciar el editor \"%s\"\n"
+
+#: command.c:1557
+msgid "could not start /bin/sh\n"
+msgstr "no se ha podido iniciar /bin/sh\n"
+
+#: command.c:1602
+#, c-format
+msgid "could not open temporary file \"%s\": %s\n"
+msgstr "no se ha podido abrir archivo temporal \"%s\": %s\n"
+
+#: command.c:1794
+msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
+msgstr "\\pset: formatos permitidos son unaligned, aligned, html, latex\n"
+
+#: command.c:1799
+#, c-format
+msgid "Output format is %s.\n"
+msgstr "El formato de salida es %s.\n"
+
+#: command.c:1809
+#, c-format
+msgid "Border style is %d.\n"
+msgstr "El estilo de borde es %d.\n"
+
+#: command.c:1818
+msgid "Expanded display is on.\n"
+msgstr "Se ha activado el despliegue expandido.\n"
+
+#: command.c:1819
+msgid "Expanded display is off.\n"
+msgstr "Se ha desactivado el despliegue expandido.\n"
+
+#: command.c:1831
+#, c-format
+msgid "Null display is \"%s\".\n"
+msgstr "Despliegue de nulos es \"%s\".\n"
+
+#: command.c:1843
+#, c-format
+msgid "Field separator is \"%s\".\n"
+msgstr "El separador de campos es \"%s\".\n"
+
+#: command.c:1857
+msgid "Record separator is <newline>."
+msgstr "El separador de registros es <salto de lМnea>."
+
+#: command.c:1859
+#, c-format
+msgid "Record separator is \"%s\".\n"
+msgstr "El separador de registros es \"%s\".\n"
+
+#: command.c:1870
+msgid "Showing only tuples."
+msgstr "Mostrando sСlo registros."
+
+#: command.c:1872
+msgid "Tuples only is off."
+msgstr "Mostrar sСlo registros estА desactivado."
+
+#: command.c:1888
+#, c-format
+msgid "Title is \"%s\".\n"
+msgstr "El tМtulo es \"%s\".\n"
+
+#: command.c:1890
+msgid "Title is unset.\n"
+msgstr "El tМtulo ha sido indefinido.\n"
+
+#: command.c:1906
+#, c-format
+msgid "Table attribute is \"%s\".\n"
+msgstr "Los atributos de tabla son \"%s\".\n"
+
+#: command.c:1908
+msgid "Table attributes unset.\n"
+msgstr "Los atributos de tabla han sido indefinidos.\n"
+
+#: command.c:1924
+msgid "Pager is used for long output."
+msgstr "El paginador se usarА para salida larga."
+
+#: command.c:1926
+msgid "Pager is always used."
+msgstr "El paginador se usarА siempre."
+
+#: command.c:1928
+msgid "Pager usage is off."
+msgstr "El paginador no se usarА."
+
+#: command.c:1939
+msgid "Default footer is on."
+msgstr "El pie por omisiСn estА activo."
+
+#: command.c:1941
+msgid "Default footer is off."
+msgstr "El pie de pАgina por omisiСn estА desactivado."
+
+#: command.c:1947
+#, c-format
+msgid "\\pset: unknown option: %s\n"
+msgstr "\\pset: opciСn desconocida: %s\n"
+
+#: command.c:1994
+msgid "\\!: failed\n"
+msgstr "\\!: fallС\n"
+
+#: common.c:74
+#, c-format
+msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
+msgstr "%s: xstrdup: no se puede duplicar puntero nulo (error interno)\n"
+
+#: common.c:258
+msgid "connection to server was lost\n"
+msgstr "se ha perdido la conexiСn al servidor\n"
+
+#: common.c:262
+msgid "The connection to the server was lost. Attempting reset: "
+msgstr "La conexiСn al servidor se ha perdido. Intentando reiniciar: "
+
+#: common.c:267
+msgid "Failed.\n"
+msgstr "fallС.\n"
+
+#: common.c:274
+msgid "Succeeded.\n"
+msgstr "con Иxito.\n"
+
+#: common.c:372 common.c:580
+msgid "You are currently not connected to a database.\n"
+msgstr "No estА conectado a una base de datos.\n"
+
+#: common.c:428
+#, c-format
+msgid ""
+"Asynchronous notification \"%s\" received from server process with PID %d.\n"
+msgstr ""
+"NotificaciСn asМncrona \"%s\" recibida del proceso de servidor con PID %d.\n"
+
+#: common.c:535
+msgid ""
+"Enter data to be copied followed by a newline.\n"
+"End with a backslash and a period on a line by itself."
+msgstr ""
+"Ingrese los datos a ser copiados seguidos de un fin de lМnea.\n"
+"Termine con un backslash y un punto."
+
+#: common.c:552
+#, c-format
+msgid "Time: %.2f ms\n"
+msgstr "DuraciСn: %.2f ms\n"
+
+#: common.c:588
+#, c-format
+msgid ""
+"***(Single step mode: verify "
+"command)*******************************************\n"
+"%s\n"
+"***(press return to proceed or enter x and return to "
+"cancel)********************\n"
+msgstr ""
+"***(Modo paso a paso: verifique "
+"comando)****************************************\n"
+"%s\n"
+"***(presione enter para continuar, o x y enter para "
+"cancelar)*******************\n"
+
+#: copy.c:110
+msgid "\\copy: arguments required\n"
+msgstr "\\copy: argumentos requeridos\n"
+
+#: copy.c:290
+#, c-format
+msgid "\\copy: parse error at \"%s\"\n"
+msgstr "\\copy: error de procesamiento en \"%s\"\n"
+
+#: copy.c:292
+msgid "\\copy: parse error at end of line\n"
+msgstr "\\copy: error de procesamiento al final de la lМnea\n"
+
+#: copy.c:390
+#, c-format
+msgid "%s: cannot copy from/to a directory\n"
+msgstr "%s: no se puede copiar desde/hacia un directorio\n"
+
+#: copy.c:411
+#, c-format
+msgid "\\copy: %s"
+msgstr "\\copy: %s"
+
+#: copy.c:415
+#, c-format
+msgid "\\copy: unexpected response (%d)\n"
+msgstr "\\copy: respuesta inesperada (%d)\n"
+
+#: help.c:48
+msgid "on"
+msgstr "activado"
+
+#: help.c:48
+msgid "off"
+msgstr "desactivado"
+
+#: help.c:70
+#, c-format
+msgid "could not get current user name: %s\n"
+msgstr "no se ha podido obtener el nombre de usuario actual: %s\n"
+
+#: help.c:83
+#, c-format
+msgid ""
+"This is psql %s, the PostgreSQL interactive terminal.\n"
+"\n"
+msgstr "Este es psql %s, el terminal interactivo de PostgreSQL.\n"
+
+#: help.c:85
+msgid "Usage:"
+msgstr "Modo de empleo:"
+
+#: help.c:86
+msgid "  psql [OPTIONS]... [DBNAME [USERNAME]]\n"
+msgstr "  psql [OPCIONES]...[BASE-DE-DATOS [USUARIO]]\n"
+
+#: help.c:88
+msgid "General options:"
+msgstr "Opciones generales:"
+
+#: help.c:93
+#, c-format
+msgid ""
+"  -d DBNAME       specify database name to connect to (default: \"%s\")\n"
+msgstr ""
+"  -d BASE-DE-DATOS nombre de base de datos a conectarse (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:94
+msgid "  -c COMMAND      run only single command (SQL or internal) and exit"
+msgstr ""
+"-c COMANDO         ejecutar sСlo un comando (SQL o interno) y salir"
+
+#: help.c:95
+msgid "  -f FILENAME     execute commands from file, then exit"
+msgstr ""
+"-f ARCHIVO         ejecutar comandos desde archivo, luego salir"
+
+#: help.c:96
+msgid "  -l              list available databases, then exit"
+msgstr ""
+"-l                 listar bases de datos, luego salir"
+
+#: help.c:97
+msgid "  -v NAME=VALUE   set psql variable NAME to VALUE"
+msgstr ""
+"  -v NOMBRE=VALOR  definir variable NOMBRE de psql a VALOR"
+
+#: help.c:98
+msgid "  -X              do not read startup file (~/.psqlrc)"
+msgstr ""
+"-X                 no leer archivo de configuraciСn (~/.psqlrc)"
+
+#: help.c:99
+msgid "  --help          show this help, then exit"
+msgstr ""
+"--help             mostrar esta ayuda, luego salir"
+
+#: help.c:100
+msgid "  --version       output version information, then exit"
+msgstr ""
+"--version          mostrar informaciСn de versiСn, luego salir"
+
+#: help.c:102
+msgid ""
+"\n"
+"Input and output options:"
+msgstr ""
+"\n"
+"Opciones de entrada y salida:"
+
+#: help.c:103
+msgid "  -a              echo all input from script"
+msgstr ""
+"-a                 mostrar los comandos del script"
+
+#: help.c:104
+msgid "  -e              echo commands sent to server"
+msgstr ""
+"-e                 mostrar comandos enviados al servidor"
+
+#: help.c:105
+msgid "  -E              display queries that internal commands generate"
+msgstr ""
+"  -E               mostrar consultas generadas por comandos internos"
+
+#: help.c:106
+msgid "  -q              run quietly (no messages, only query output)"
+msgstr ""
+"  -q               modo silencioso (sin mensajes, sСlo resultado de consultas)"
+
+#: help.c:107
+msgid "  -o FILENAME     send query results to file (or |pipe)"
+msgstr ""
+"  -o ARCHIVO       enviar resultados de consultas a archivo (o |comando)"
+
+#: help.c:108
+msgid "  -n              disable enhanced command line editing (readline)"
+msgstr ""
+"  -n               deshabilitar ediciСn de lМnea de comando (readline)"
+
+#: help.c:109
+msgid "  -s              single-step mode (confirm each query)"
+msgstr ""
+"  -s               modo paso a paso (confirmar cada consulta)"
+
+#: help.c:110
+msgid ""
+"  -S              single-line mode (end of line terminates SQL command)"
+msgstr ""
+"  -S               modo de lМneas (fin de lМnea termina el comando SQL)"
+
+#: help.c:112
+msgid ""
+"\n"
+"Output format options:"
+msgstr ""
+"\n"
+"Opciones de formato de salida:"
+
+#: help.c:113
+msgid "  -A              unaligned table output mode (-P format=unaligned)"
+msgstr ""
+"  -A               modo de tablas no alineadas"
+
+#: help.c:114
+msgid "  -H              HTML table output mode (-P format=html)"
+msgstr ""
+"  -H               modo de salida en tablas HTML (-P format=html)"
+
+#: help.c:115
+msgid "  -t              print rows only (-P tuples_only)"
+msgstr ""
+"  -t               mostrar sСlo registros (-P tuples_only)"
+
+#: help.c:116
+msgid ""
+"  -T TEXT         set HTML table tag attributes (width, border) (-P "
+"tableattr=)"
+msgstr ""
+"  -T TEXTO         definir atributos de marcas de tabla HTML (ancho, "
+"borde) (-P tableattr=)"
+
+#: help.c:117
+msgid "  -x              turn on expanded table output (-P expanded)"
+msgstr ""
+"  -x               activar modo expandido de salida de tablas (-P expanded)"
+
+#: help.c:118
+msgid "  -P VAR[=ARG]    set printing option VAR to ARG (see \\pset command)"
+msgstr ""
+"  -P VAR[=ARG]     definir opciСn de impresiСn VAR en ARG (ver comando \\pset)"
+
+#: help.c:119
+#, c-format
+msgid ""
+"  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"
+msgstr ""
+"  -F CADENA        definir separados de campos (por omisiСn: \"%s\") (-P "
+"fieldsep=)\n"
+
+#: help.c:121
+msgid ""
+"  -R STRING       set record separator (default: newline) (-P recordsep=)"
+msgstr ""
+"  -R CADENA        definir separador de registros (por omisiСn: salto de "
+"lМnea) (-P recordsep=)"
+
+#: help.c:123
+msgid ""
+"\n"
+"Connection options:"
+msgstr ""
+"\n"
+"Opciones de conexiСn:"
+
+#: help.c:126
+#, c-format
+msgid ""
+"  -h HOSTNAME     database server host or socket directory (default: \"%s\")\n"
+msgstr ""
+"  -h ANFITRIсN     nombre del anfitriСn o directorio de socket (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:127
+msgid "local socket"
+msgstr "socket local"
+
+#: help.c:130
+#, c-format
+msgid "  -p PORT         database server port (default: \"%s\")\n"
+msgstr ""
+"  -p PORT          puerto del servidor de bases de datos (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:136
+#, c-format
+msgid "  -U NAME         database user name (default: \"%s\")\n"
+msgstr ""
+"  -U NOMBRE        nombre de usuario de la base de datos (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:137
+msgid "  -W              prompt for password (should happen automatically)"
+msgstr ""
+"  -W               preguntar contraseЯa (deberМa suceder automАticamente)"
+
+#: help.c:140
+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"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>."
+msgstr ""
+"\n"
+"Para obtener mАs ayuda, digite \"\\?\" (para comandos internos) o \"\\help\"\n"
+"(para comandos SQL) dentro de psql, o consulte la secciСn de psql\n"
+"en la documentaciСn de PostgreSQL.\n"
+"\n"
+"Reporte errores a <pgsql-bugs@postgresql.org>."
+
+#: help.c:174
+msgid "General\n"
+msgstr "General\n"
+
+#: help.c:175
+#, c-format
+msgid ""
+"  \\c[onnect] [DBNAME|- [USER]]\n"
+"                 connect to new database (currently \"%s\")\n"
+msgstr ""
+"  \\c[onnect] [BASE-DE-DATOS|- [USUARIO]]\n"
+"                  conectar a una nueva base de datos (actual: \"%s\")\n"
+
+#: help.c:178
+msgid "  \\cd [DIR]      change the current working directory\n"
+msgstr ""
+"  \\cd [DIR]       cambiar el directorio de trabajo\n"
+
+#: help.c:179
+msgid "  \\copyright     show PostgreSQL usage and distribution terms\n"
+msgstr ""
+"  \\copyright      mostrar tИrminos de uso y distribuciСn de PostgreSQL\n"
+
+#: help.c:180
+msgid ""
+"  \\encoding [ENCODING]\n"
+"                 show or set client encoding\n"
+msgstr ""
+"  \\encoding [CODIFICACIсN]\n"
+"                  mostrar o definir codificaciСn del cliente\n"
+
+#: help.c:182
+msgid "  \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
+msgstr ""
+"  \\h [NOMBRE]     mostrar ayuda de sintaxis de comandos SQL,\n"
+"                   * para todos los comandos\n"
+
+#: help.c:183
+msgid "  \\q             quit psql\n"
+msgstr ""
+"  \\q              salir de psql\n"
+
+#: help.c:184
+msgid ""
+"  \\set [NAME [VALUE]]\n"
+"                 set internal variable, or list all if no parameters\n"
+msgstr ""
+"  \\set [NOMBRE [VALOR]]\n"
+"                  definir variables internas,\n"
+"                  listar todas si no se dan parАmetros\n"
+
+#: help.c:186
+#, c-format
+msgid "  \\timing        toggle timing of commands (currently %s)\n"
+msgstr ""
+"  \\timing         mostrar tiempo de ejecuciСn de comandos\n"
+"                  (actualmente %s)\n"
+
+#: help.c:188
+msgid "  \\unset NAME    unset (delete) internal variable\n"
+msgstr ""
+"  \\unset NOMBRE   indefinir (eliminar) variable interna\n"
+
+#: help.c:189
+msgid "  \\! [COMMAND]   execute command in shell or start interactive shell\n"
+msgstr ""
+"  \\! [COMANDO]    ejecutar comando en intИrprete de comandos,\n"
+"                  o iniciar intИrprete interactivo\n"
+
+#: help.c:192
+msgid "Query Buffer\n"
+msgstr "BЗfer de consulta\n"
+
+#: help.c:193
+msgid ""
+"  \\e [FILE]      edit the query buffer (or file) with external editor\n"
+msgstr ""
+"  \\e [ARCHIVO]    editar el bЗfer de consulta (o archivo) con editor "
+"externo\n"
+
+#: help.c:194
+msgid ""
+"  \\g [FILE]      send query buffer to server (and results to file or |pipe)\n"
+msgstr ""
+"  \\g [ARCHIVO]    enviar bЗfer de consulta al servidor\n"
+"                  (y resultados a archivo o |comando)\n"
+
+#: help.c:195
+msgid "  \\p             show the contents of the query buffer\n"
+msgstr ""
+"  \\p              mostrar el contenido del bЗfer de consulta\n"
+
+#: help.c:196
+msgid "  \\r             reset (clear) the query buffer\n"
+msgstr ""
+"  \\r              reiniciar (limpiar) el bЗfer de consulta\n"
+
+#: help.c:197
+msgid "  \\s [FILE]      display history or save it to file\n"
+msgstr ""
+"  \\s [ARCHIVO]    mostrar historial de comandos o guardarlo en archivo\n"
+
+#: help.c:198
+msgid "  \\w [FILE]      write query buffer to file\n"
+msgstr ""
+"  \\w [ARCHIVO]    escribir bЗfer de consulta a archivo\n"
+
+#: help.c:201
+msgid "Input/Output\n"
+msgstr "Entrada/Salida\n"
+
+#: help.c:202
+msgid "  \\echo [STRING] write string to standard output\n"
+msgstr ""
+"  \\echo [CADENA]  escribir cadena a salida estАndar\n"
+
+#: help.c:203
+msgid "  \\i FILE        execute commands from file\n"
+msgstr ""
+"  \\i ARCHIVO      ejecutar comandos desde archivo\n"
+
+#: help.c:204
+msgid "  \\o [FILE]      send all query results to file or |pipe\n"
+msgstr ""
+"  \\o [ARCHIVO]    envМar resultados de consultas a archivo o |comando\n"
+
+#: help.c:205
+msgid ""
+"  \\qecho [STRING]\n"
+"                 write string to query output stream (see \\o)\n"
+msgstr ""
+"  \\qecho [CADENA] escribir cadena a salida de consultas (ver \\o)\n"
+
+#: help.c:209
+msgid "Informational\n"
+msgstr "Informacional\n"
+
+#: help.c:210
+msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
+msgstr ""
+"  \\d [NOMBRE]     describir tabla, Мndice, secuencia o vista\n"
+
+#: help.c:211
+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} [PATRсN] (agregue \"+\" para obtener mАs detalles)\n"
+"                  listar tablas/Мndices/secuencias/vistas/tablas de sistema\n"
+
+#: help.c:213
+msgid "  \\da [PATTERN]  list aggregate functions\n"
+msgstr ""
+"  \\da [PATRсN]    listar funciones de agregaciСn\n"
+
+#: help.c:214
+msgid "  \\dc [PATTERN]  list conversions\n"
+msgstr ""
+"  \\dc [PATRсN]    listar conversiones\n"
+
+#: help.c:215
+msgid "  \\dC            list casts\n"
+msgstr ""
+"  \\dC             listar conversiones de tipo (casts)\n"
+
+#: help.c:216
+msgid "  \\dd [PATTERN]  show comment for object\n"
+msgstr ""
+"  \\dd [PATRсN]    listar comentarios de objetos\n"
+
+#: help.c:217
+msgid "  \\dD [PATTERN]  list domains\n"
+msgstr ""
+"  \\dD [PATRсN]    listar dominios\n"
+
+#: help.c:218
+msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
+msgstr ""
+"  \\df [PATRсN]    listar funciones (\"+\" para mАs detalles)\n"
+
+#: help.c:219
+msgid "  \\dn [PATTERN]  list schemas\n"
+msgstr ""
+"  \\dn [PATRсN]    listar esquemas\n"
+
+#: help.c:220
+msgid "  \\do [NAME]     list operators\n"
+msgstr ""
+"  \\do [NOMBRE]    listar operadores\n"
+
+#: help.c:221
+msgid "  \\dl            list large objects, same as \\lo_list\n"
+msgstr ""
+"  \\dl             listar objetos grandes, lo mismo que \\lo_list\n"
+
+#: help.c:222
+msgid "  \\dp [PATTERN]  list table access privileges\n"
+msgstr ""
+"  \\dp [PATRсN]    listar privilegios de acceso a tablas\n"
+
+#: help.c:223
+msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
+msgstr ""
+"  \\dT [PATRсN]    listar tipos de dato (\"+\" para mАs detalles)\n"
+
+#: help.c:224
+msgid "  \\du [PATTERN]  list users\n"
+msgstr ""
+"  \\du [PATRсN]    listar usuarios\n"
+
+#: help.c:225
+msgid "  \\l             list all databases (add \"+\" for more detail)\n"
+msgstr ""
+"  \\l              listar todas las bases de datos (\"+\" para mАs detalles)\n"
+
+#: help.c:226
+msgid "  \\z [PATTERN]   list table access privileges (same as \\dp)\n"
+msgstr ""
+"  \\z [PATRсN]     listar privilegios de acceso a tablas (lo mismo que \\dp)\n"
+
+#: help.c:229
+msgid "Formatting\n"
+msgstr "Formato\n"
+
+#: help.c:230
+msgid "  \\a             toggle between unaligned and aligned output mode\n"
+msgstr ""
+"  \\a              cambiar entre modo de salida alineado y sin alinear\n"
+
+#: help.c:231
+msgid "  \\C [STRING]    set table title, or unset if none\n"
+msgstr ""
+"  \\C [CADENA]     definir tМtulo de tabla, o indefinir si es vacМo\n"
+
+#: help.c:232
+msgid ""
+"  \\f [STRING]    show or set field separator for unaligned query output\n"
+msgstr ""
+"  \\f [CADENA]     mostrar o definir separador de campos para\n"
+"                  modo de salida sin alinear\n"
+
+#: help.c:233
+#, c-format
+msgid "  \\H             toggle HTML output mode (currently %s)\n"
+msgstr ""
+"  \\H              cambiar modo de salida HTML (actualmente %s)\n"
+
+#: help.c:235
+msgid ""
+"  \\pset NAME [VALUE]\n"
+"                 set table output option\n"
+"                 (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
+"                 tuples_only|title|tableattr|pager})\n"
+msgstr ""
+"  \\pset OPCIсN [VALOR]\n"
+"                  definir opciСn de salida de tablas\n"
+"                  (OPCIсN := {format|border|expanded|fieldsep|null|\n"
+"                  recordsep|tuples_only|title|tableattr|pager})\n"
+
+#: help.c:239
+#, c-format
+msgid "  \\t             show only rows (currently %s)\n"
+msgstr ""
+"  \\t              mostrar sСlo registros (actualmente %s)\n"
+
+#: help.c:241
+msgid "  \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
+msgstr ""
+"  \\T [CADENA]     definir atributos HTML de <table>, o indefinir si es "
+"vacМo\n"
+
+#: help.c:242
+#, c-format
+msgid "  \\x             toggle expanded output (currently %s)\n"
+msgstr ""
+"  \\x              cambiar modo expandido (actualmente %s)\n"
+
+#: help.c:246
+msgid "Copy, Large Object\n"
+msgstr "Copy, Objetos Grandes\n"
+
+#: help.c:247
+msgid ""
+"  \\copy ...      perform SQL COPY with data stream to the client host\n"
+msgstr ""
+"  \\copy ...       ejecutar comando SQL COPY con flujo de datos al cliente\n"
+
+#: help.c:248
+msgid ""
+"  \\lo_export\n"
+"  \\lo_import\n"
+"  \\lo_list\n"
+"  \\lo_unlink     large object operations\n"
+msgstr ""
+"  \\lo_export\n"
+"  \\lo_import\n"
+"  \\lo_list\n"
+"  \\lo_unlink      operaciones con objetos grandes\n"
+
+#: help.c:281
+msgid "Available help:\n"
+msgstr "Ayuda disponible:\n"
+
+#: help.c:319
+#, c-format
+msgid ""
+"Command:     %s\n"
+"Description: %s\n"
+"Syntax:\n"
+"%s\n"
+"\n"
+msgstr ""
+"Comando:     %s\n"
+"DescripciСn: %s\n"
+"Sintaxis:\n"
+"%s\n"
+
+#: help.c:330
+#, c-format
+msgid ""
+"No help available for \"%-.*s\".\n"
+"Try \\h with no arguments to see available help.\n"
+msgstr ""
+"No hay ayuda disponible para \"%-.*s\".\n"
+"Pruebe \\h sin argumentos para mostrar los elementos de ayuda disponibles.\n"
+
+#: input.c:221
+#, c-format
+msgid "could not save history to file \"%s\": %s\n"
+msgstr "no se pudo guardar historial a archivo \"%s\": %s\n"
+
+#: large_obj.c:39
+#, c-format
+msgid "%s: not connected to a database\n"
+msgstr "%s: no estА conectado a una base de datos\n"
+
+#: large_obj.c:58
+#, c-format
+msgid "%s: current transaction is aborted\n"
+msgstr "%s: transacciСn en curso estА abortada\n"
+
+#: large_obj.c:61
+#, c-format
+msgid "%s: unknown transaction status\n"
+msgstr "%s: estado de transacciСn desconocido\n"
+
+#: large_obj.c:278 describe.c:106 describe.c:157 describe.c:230 describe.c:292
+#: describe.c:339 describe.c:438 describe.c:718 describe.c:1338
+msgid "Description"
+msgstr "DescripciСn"
+
+#: large_obj.c:286
+msgid "Large objects"
+msgstr "Objetos grandes"
+
+#: mainloop.c:205
+#, c-format
+msgid "Use \"\\q\" to leave %s.\n"
+msgstr "Use \"\\q\" para salir de %s.\n"
+
+#: print.c:417
+msgid "(No rows)\n"
+msgstr "(Sin registros)\n"
+
+#: print.c:1180
+msgid "(1 row)"
+msgstr "(1 registro)"
+
+#: print.c:1182
+#, c-format
+msgid "(%d rows)"
+msgstr "(%d registros)"
+
+#: startup.c:131 startup.c:570
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memoria agotada.\n"
+
+#: startup.c:170
+msgid "User name: "
+msgstr "Nombre de usuario: "
+
+#: startup.c:266
+#, 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 on internal slash commands\n"
+"       \\g or terminate with semicolon to execute query\n"
+"       \\q to quit\n"
+"\n"
+msgstr ""
+"Bienvenido a %s %s, el terminal interactivo de PostgreSQL.\n"
+"\n"
+"Digite:  \\copyright para ver los tИrminos de distribuciСn\n"
+"         \\h para obtener ayuda sobre comandos SQL\n"
+"         \\? para obtener ayuda sobre comandos internos\n"
+"         \\g o termine con punto y coma (;) para ejecutar consulta\n"
+"         \\q para salir\n"
+
+#: startup.c:424
+#, c-format
+msgid "%s: couldn't set printing parameter \"%s\"\n"
+msgstr "%s: no se ha podido definir parАmetro de despliegue \"%s\"\n"
+
+#: startup.c:470
+#, c-format
+msgid "%s: could not delete variable \"%s\"\n"
+msgstr "%s: no se ha podido eliminar variable \"%s\"\n"
+
+#: startup.c:480
+#, c-format
+msgid "%s: could not set variable \"%s\"\n"
+msgstr "%s: no se ha podido definir variable \"%s\"\n"
+
+#: startup.c:511 startup.c:517
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Use \"%s --help\" para obtener mАs informaciСn.\n"
+
+#: startup.c:535
+#, c-format
+msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
+msgstr "%s: atenciСn: se ignorС argumento extra \"%s\" en lМnea de comandos\n"
+
+#: startup.c:542
+#, c-format
+msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
+msgstr "%s: AtenciСn: La opciСn -u estА obsoleta. Use -U.\n"
+
+#: startup.c:599
+msgid "contains support for command-line editing"
+msgstr "incluye soporte para ediciСn de lМnea de comandos"
+
+#: startup.c:622
+#, c-format
+msgid ""
+"SSL connection (cipher: %s, bits: %i)\n"
+"\n"
+msgstr "conexiСn SSL (cifrado: %s, bits: %i)\n"
+
+#: describe.c:105 describe.c:147 describe.c:217 describe.c:290 describe.c:384
+#: describe.c:438 describe.c:1331 describe.c:1437 describe.c:1485
+msgid "Schema"
+msgstr "Schema"
+
+#: describe.c:105 describe.c:147 describe.c:217 describe.c:290 describe.c:332
+#: describe.c:438 describe.c:1331 describe.c:1438 describe.c:1486
+#: describe.c:1581
+msgid "Name"
+msgstr "Nombre"
+
+#: describe.c:105
+msgid "(all types)"
+msgstr "(todos los tipos)"
+
+#: describe.c:106
+msgid "Data type"
+msgstr "Tipo de dato"
+
+#: describe.c:120
+msgid "List of aggregate functions"
+msgstr "Listado de funciones de agregaciСn"
+
+#: describe.c:147
+msgid "Result data type"
+msgstr "Tipo de dato de salida"
+
+#: describe.c:148
+msgid "Argument data types"
+msgstr "Tipos de datos de argumentos"
+
+#: describe.c:156 describe.c:332 describe.c:1333 describe.c:1582
+msgid "Owner"
+msgstr "DueЯo"
+
+#: describe.c:156
+msgid "Language"
+msgstr "Lenguaje"
+
+#: describe.c:157
+msgid "Source code"
+msgstr "CСdigo fuente"
+
+#: describe.c:191
+msgid "List of functions"
+msgstr "Listado de funciones"
+
+#: describe.c:227
+msgid "Internal name"
+msgstr "Nombre interno"
+
+#: describe.c:227
+msgid "Size"
+msgstr "TamaЯo"
+
+#: describe.c:259
+msgid "List of data types"
+msgstr "Listado de tipos de dato"
+
+#: describe.c:291
+msgid "Left arg type"
+msgstr "Tipo de 1er arg"
+
+#: describe.c:291
+msgid "Right arg type"
+msgstr "Tipo de 2o arg"
+
+#: describe.c:292
+msgid "Result type"
+msgstr "Tipo resultado"
+
+#: describe.c:306
+msgid "List of operators"
+msgstr "Listado de operadores"
+
+#: describe.c:335
+msgid "Encoding"
+msgstr "CodificaciСn"
+
+#: describe.c:351
+msgid "List of databases"
+msgstr "Listado de base de datos"
+
+#: describe.c:384 describe.c:1348
+msgid "Table"
+msgstr "Tabla"
+
+#: describe.c:384
+msgid "Access privileges"
+msgstr "Privilegios"
+
+#: describe.c:406
+#, c-format
+msgid "Access privileges for database \"%s\""
+msgstr "Privilegios para base de datos \"%s\""
+
+#: describe.c:438
+msgid "Object"
+msgstr "Objeto"
+
+#: describe.c:449
+msgid "aggregate"
+msgstr "funciСn de agregaciСn"
+
+#: describe.c:467
+msgid "function"
+msgstr "funciСn"
+
+#: describe.c:481
+msgid "operator"
+msgstr "operador"
+
+#: describe.c:495
+msgid "data type"
+msgstr "tipo de dato"
+
+#: describe.c:512 describe.c:1332
+msgid "table"
+msgstr "tabla"
+
+#: describe.c:512 describe.c:1332
+msgid "view"
+msgstr "vista"
+
+#: describe.c:512 describe.c:1332
+msgid "index"
+msgstr "Мndice"
+
+#: describe.c:512 describe.c:1332
+msgid "sequence"
+msgstr "secuencia"
+
+#: describe.c:528
+msgid "rule"
+msgstr "regla"
+
+#: describe.c:544
+msgid "trigger"
+msgstr ""
+
+#: describe.c:562
+msgid "Object descriptions"
+msgstr "Descripciones de objetos"
+
+#: describe.c:608
+#, c-format
+msgid "Did not find any relation named \"%s\".\n"
+msgstr "No se encontrС relaciСn llamada \"%s\".\n"
+
+#: describe.c:691
+#, c-format
+msgid "Did not find any relation with OID %s.\n"
+msgstr "No se encontrС relaciСn con OID %s.\n"
+
+#: describe.c:704
+msgid "Column"
+msgstr "Columna"
+
+#: describe.c:705 describe.c:1333 describe.c:1439
+msgid "Type"
+msgstr "Tipo"
+
+#: describe.c:712
+msgid "Modifiers"
+msgstr "Modificadores"
+
+#: describe.c:819
+#, c-format
+msgid "Table \"%s.%s\""
+msgstr "Tabla \"%s.%s\""
+
+#: describe.c:823
+#, c-format
+msgid "View \"%s.%s\""
+msgstr "Vista \"%s.%s\""
+
+#: describe.c:827
+#, c-format
+msgid "Sequence \"%s.%s\""
+msgstr "Secuencia \"%s.%s\""
+
+#: describe.c:831
+#, c-format
+msgid "Index \"%s.%s\""
+msgstr "мndice \"%s.%s\""
+
+#: describe.c:835
+#, c-format
+msgid "Special relation \"%s.%s\""
+msgstr "RelaciСn especial \"%s.%s\""
+
+#: describe.c:839
+#, c-format
+msgid "TOAST table \"%s.%s\""
+msgstr "Tabla TOAST \"%s.%s\""
+
+#: describe.c:843
+#, c-format
+msgid "Composite type \"%s.%s\""
+msgstr "Tipo compuesto \"%s.%s\""
+
+#: describe.c:847
+#, c-format
+msgid "?%c? \"%s.%s\""
+msgstr "?%c? \"%s.%s\""
+
+#: describe.c:883
+msgid "primary key, "
+msgstr "llave primaria, "
+
+#: describe.c:885
+msgid "unique, "
+msgstr "Зnico, "
+
+#: describe.c:891
+#, c-format
+msgid "for table \"%s.%s\""
+msgstr "de tabla \"%s.%s\""
+
+#: describe.c:929
+#, c-format
+msgid "View definition: %s"
+msgstr "DefiniciСn de vista: %s"
+
+#: describe.c:935
+msgid "Rules"
+msgstr "Reglas"
+
+#: describe.c:1083
+msgid "Indexes:"
+msgstr "мndices:"
+
+#: describe.c:1091
+#, c-format
+msgid "    \"%s\""
+msgstr "    \"%s\""
+
+#: describe.c:1097
+msgid " primary key,"
+msgstr " llave primaria,"
+
+#: describe.c:1099
+msgid " unique,"
+msgstr " Зnico,"
+
+#: describe.c:1116
+msgid "Check constraints:"
+msgstr "Restricciones CHECK:"
+
+#: describe.c:1120
+#, c-format
+msgid "    \"%s\" CHECK %s"
+msgstr "    \"%s\" CHECK %s"
+
+#: describe.c:1130
+msgid "Foreign-key constraints:"
+msgstr "Restricciones de llave forАnea:"
+
+#: describe.c:1134
+#, c-format
+msgid "    \"%s\" %s"
+msgstr "    \"%s\" %s"
+
+#: describe.c:1144
+msgid "Rules:"
+msgstr "Reglas:"
+
+#: describe.c:1162
+msgid "Triggers:"
+msgstr ""
+
+#: describe.c:1184
+msgid "Inherits"
+msgstr "Hereda"
+
+#: describe.c:1270
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#: describe.c:1270
+msgid "User ID"
+msgstr "ID de usuario"
+
+#: describe.c:1271
+msgid "superuser, create database"
+msgstr "superusuario, crea bases de datos"
+
+#: describe.c:1272
+msgid "superuser"
+msgstr "superusuario"
+
+#: describe.c:1272
+msgid "create database"
+msgstr "crea bases de datos"
+
+#: describe.c:1273
+msgid "Attributes"
+msgstr "Atributos"
+
+#: describe.c:1286
+msgid "List of database users"
+msgstr "Listado de usuarios de la base de datos"
+
+#: describe.c:1333
+msgid "special"
+msgstr "especial"
+
+#: describe.c:1394
+msgid "No matching relations found.\n"
+msgstr "No se encontraron relaciones coincidentes.\n"
+
+#: describe.c:1396
+msgid "No relations found.\n"
+msgstr "No se encontraron relaciones.\n"
+
+#: describe.c:1401
+msgid "List of relations"
+msgstr "Listado de relaciones"
+
+#: describe.c:1440
+msgid "Modifier"
+msgstr "Modificador"
+
+#: describe.c:1454
+msgid "List of domains"
+msgstr "Listado de dominios"
+
+#: describe.c:1487
+msgid "Source"
+msgstr "Fuente"
+
+#: describe.c:1488
+msgid "Destination"
+msgstr "Destino"
+
+#: describe.c:1489 describe.c:1546
+msgid "yes"
+msgstr "sМ"
+
+#: describe.c:1490 describe.c:1544
+msgid "no"
+msgstr "no"
+
+#: describe.c:1491
+msgid "Default?"
+msgstr "Por omisiСn?"
+
+#: describe.c:1505
+msgid "List of conversions"
+msgstr "Listado de conversiones"
+
+#: describe.c:1540
+msgid "Source type"
+msgstr "Tipo fuente"
+
+#: describe.c:1541
+msgid "Target type"
+msgstr "Tipo destino"
+
+#: describe.c:1542
+msgid "(binary compatible)"
+msgstr "(binario-compatible)"
+
+#: describe.c:1543
+msgid "Function"
+msgstr "FunciСn"
+
+#: describe.c:1545
+msgid "in assignment"
+msgstr "en asignaciСn"
+
+#: describe.c:1547
+msgid "Implicit?"
+msgstr "ImplМcito?"
+
+#: describe.c:1555
+msgid "List of casts"
+msgstr "Listado de conversiones de tipo (casts)"
+
+#: describe.c:1596
+msgid "List of schemas"
+msgstr "Listado de schemas"
+
diff --git a/src/bin/psql/po/ru.po b/src/bin/psql/po/ru.po
index 448fc7e039..654f0aa399 100644
--- a/src/bin/psql/po/ru.po
+++ b/src/bin/psql/po/ru.po
@@ -1,19 +1,19 @@
 # ru.po
 # PSQL Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.5 2003/08/01 16:19:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.6 2003/08/24 21:18:52 petere Exp $
 #
 # ChangeLog:
-#   - July 26-31, 2003: Update for 7.4.x; <mokhov@cs.concordia.ca>
+#   - July 26 - August 23, 2003: Update for 7.4.x; <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - August 2001 - August 2002: Transaltion and maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
-"POT-Creation-Date: 2003-07-26 04:19-0300\n"
-"PO-Revision-Date: 2003-07-31 22:22-0500\n"
+"POT-Creation-Date: 2003-08-23 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 14:00-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -82,12 +82,12 @@ msgstr "История записана в файл \"%s\".\n"
 #: command.c:1160
 #: command.c:1257
 #: command.c:1975
-#: common.c:81
+#: common.c:80
 #: copy.c:88
 #: copy.c:116
 #: describe.c:51
 #: mainloop.c:78
-#: mainloop.c:340
+#: mainloop.c:341
 msgid "out of memory\n"
 msgstr "недостаточно памяти\n"
 
@@ -117,8 +117,8 @@ msgstr "Cекундомер выключен."
 #: command.c:1669
 #: command.c:1691
 #: command.c:1721
-#: common.c:130
-#: copy.c:379
+#: common.c:129
+#: copy.c:378
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
@@ -136,16 +136,16 @@ msgstr "ошибка при анализе синтаксиса в конце строки\n"
 
 #: command.c:1362
 #: command.c:1386
-#: startup.c:176
-#: startup.c:194
+#: startup.c:173
+#: startup.c:191
 msgid "Password: "
 msgstr "Пароль: "
 
 #: command.c:1400
-#: common.c:176
-#: common.c:346
+#: common.c:175
+#: common.c:345
 #: common.c:396
-#: common.c:612
+#: common.c:611
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -284,29 +284,29 @@ msgstr "\\pset: неизвестная опция: %s\n"
 msgid "\\!: failed\n"
 msgstr "\\!: неудачно\n"
 
-#: common.c:74
+#: common.c:73
 #, c-format
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: xstrdup: не возможно сделать копию нулевого указателя (внутренняя ошибка)\n"
 
-#: common.c:258
+#: common.c:257
 msgid "connection to server was lost\n"
 msgstr "подсоединение к серверу было потеряно\n"
 
-#: common.c:262
+#: common.c:261
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Подсоединение к серверу было потеряно. Попытка переустановить: "
 
-#: common.c:267
+#: common.c:266
 msgid "Failed.\n"
 msgstr "Безуспешно.\n"
 
-#: common.c:274
+#: common.c:273
 msgid "Succeeded.\n"
 msgstr "Успешно.\n"
 
 #: common.c:372
-#: common.c:580
+#: common.c:579
 msgid "You are currently not connected to a database.\n"
 msgstr "В данный момент вы не подсоединены к базе данных.\n"
 
@@ -315,7 +315,7 @@ msgstr "В данный момент вы не подсоединены к базе данных.\n"
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Получено асинхронное оповещение \"%s\" от процесса-сервера с PID %d.\n"
 
-#: common.c:535
+#: common.c:531
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -323,12 +323,12 @@ msgstr ""
 "Введите данные для копирования с последующим символом новой строки (newline).\n"
 "Закончите с обратным слешем и точкой на самой линии."
 
-#: common.c:552
+#: common.c:550
 #, c-format
 msgid "Time: %.2f ms\n"
 msgstr "Время: %.2f тс\n"
 
-#: common.c:588
+#: common.c:587
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
@@ -343,26 +343,26 @@ msgstr ""
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: необходимы аргументы\n"
 
-#: copy.c:290
+#: copy.c:289
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: ошибка при анализе синтаксиса в \"%s\"\n"
 
-#: copy.c:292
+#: copy.c:291
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: ошибка при анализе синтаксиса в конце строки\n"
 
-#: copy.c:390
+#: copy.c:389
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: нельзя использовать COPY TO/FROM для директорий\n"
 
-#: copy.c:411
+#: copy.c:410
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:415
+#: copy.c:414
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: неожидаемый ответ (%d)\n"
@@ -428,7 +428,7 @@ msgstr "  -X              не читать файл настроек при старте (~/.psqlrc)"
 
 #: help.c:99
 msgid "  --help          show this help, then exit"
-msgstr "  --help          показать эту позсказку и выйти"
+msgstr "  --help          показать эту подсказку и выйти"
 
 #: help.c:100
 msgid "  --version       output version information, then exit"
@@ -674,7 +674,7 @@ msgstr ""
 
 #: help.c:209
 msgid "Informational\n"
-msgstr "Иформационные\n"
+msgstr "Информационные\n"
 
 #: help.c:210
 msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
@@ -839,7 +839,7 @@ msgstr ""
 "Нет справки по \"%-.*s\".\n"
 "Попробуйте \\h без аргументов для просмотра имеющейся помощи.\n"
 
-#: input.c:221
+#: input.c:226
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "не получилось сохранить историю в \"%s\": %s\n"
@@ -857,7 +857,7 @@ msgstr "%s: текущая транзакция отменена\n"
 #: large_obj.c:61
 #, c-format
 msgid "%s: unknown transaction status\n"
-msgstr "%s: неизвестное состояние транзации\n"
+msgstr "%s: неизвестное состояние транзакции\n"
 
 #: describe.c:106
 #: describe.c:157
@@ -866,7 +866,7 @@ msgstr "%s: неизвестное состояние транзации\n"
 #: describe.c:339
 #: describe.c:438
 #: describe.c:718
-#: describe.c:1338
+#: describe.c:1343
 #: large_obj.c:278
 msgid "Description"
 msgstr "Описание"
@@ -875,35 +875,35 @@ msgstr "Описание"
 msgid "Large objects"
 msgstr "Большие объекты"
 
-#: mainloop.c:205
+#: mainloop.c:206
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "Используйте \"\\q\" чтобы выйти из %s.\n"
 
-#: print.c:417
+#: print.c:421
 msgid "(No rows)\n"
 msgstr "(Нет записей)\n"
 
-#: print.c:1180
+#: print.c:1186
 msgid "(1 row)"
 msgstr "(1 запись)"
 
-#: print.c:1182
+#: print.c:1188
 #, c-format
 msgid "(%d rows)"
 msgstr "(записей: %d)"
 
-#: startup.c:131
-#: startup.c:570
+#: startup.c:128
+#: startup.c:567
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: недостаточно памяти\n"
 
-#: startup.c:170
+#: startup.c:167
 msgid "User name: "
 msgstr "Имя пользователя: "
 
-#: startup.c:266
+#: startup.c:263
 #, c-format
 msgid ""
 "Welcome to %s %s, the PostgreSQL interactive terminal.\n"
@@ -924,42 +924,42 @@ msgstr ""
 "           \\q для выхода\n"
 "\n"
 
-#: startup.c:424
+#: startup.c:421
 #, c-format
 msgid "%s: couldn't set printing parameter \"%s\"\n"
 msgstr "%s: не получилось установить параметр печати \"%s\"\n"
 
-#: startup.c:470
+#: startup.c:467
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: не получилось удалить переменную \"%s\"\n"
 
-#: startup.c:480
+#: startup.c:477
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: не получилось установить переменную \"%s\"\n"
 
-#: startup.c:511
-#: startup.c:517
+#: startup.c:508
+#: startup.c:514
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Наберите \"%s --help\" для более подробной информации.\n"
 
-#: startup.c:535
+#: startup.c:532
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: внимание: излишняя опция: \"%s\" -- проигнорирована\n"
 
-#: startup.c:542
+#: startup.c:539
 #, c-format
 msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 msgstr "%s: Внимание: Опция -u устарела. Используйте -U.\n"
 
-#: startup.c:599
+#: startup.c:596
 msgid "contains support for command-line editing"
 msgstr "поддерживает редактирование командной строки"
 
-#: startup.c:622
+#: startup.c:619
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -974,9 +974,9 @@ msgstr ""
 #: describe.c:290
 #: describe.c:384
 #: describe.c:438
-#: describe.c:1331
-#: describe.c:1437
-#: describe.c:1485
+#: describe.c:1336
+#: describe.c:1442
+#: describe.c:1490
 msgid "Schema"
 msgstr "Схема"
 
@@ -986,10 +986,10 @@ msgstr "Схема"
 #: describe.c:290
 #: describe.c:332
 #: describe.c:438
-#: describe.c:1331
-#: describe.c:1438
-#: describe.c:1486
-#: describe.c:1581
+#: describe.c:1336
+#: describe.c:1443
+#: describe.c:1491
+#: describe.c:1586
 msgid "Name"
 msgstr "Имя"
 
@@ -1007,7 +1007,7 @@ msgstr "Список агрегатных функций"
 
 #: describe.c:147
 msgid "Result data type"
-msgstr "Результирующий тип данных"
+msgstr "Тип данных результата"
 
 #: describe.c:148
 msgid "Argument data types"
@@ -1015,8 +1015,8 @@ msgstr "Типы данных аргументов"
 
 #: describe.c:156
 #: describe.c:332
-#: describe.c:1333
-#: describe.c:1582
+#: describe.c:1338
+#: describe.c:1587
 msgid "Owner"
 msgstr "Владелец"
 
@@ -1069,7 +1069,7 @@ msgid "List of databases"
 msgstr "Список баз данных"
 
 #: describe.c:384
-#: describe.c:1348
+#: describe.c:1353
 msgid "Table"
 msgstr "Таблица"
 
@@ -1103,22 +1103,22 @@ msgid "data type"
 msgstr "тип данных"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "table"
 msgstr "таблица"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "view"
 msgstr "вид"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "index"
 msgstr "индекс"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "sequence"
 msgstr "последовательность"
 
@@ -1149,8 +1149,8 @@ msgid "Column"
 msgstr "Колонка"
 
 #: describe.c:705
-#: describe.c:1333
-#: describe.c:1439
+#: describe.c:1338
+#: describe.c:1444
 msgid "Type"
 msgstr "Тип"
 
@@ -1213,168 +1213,172 @@ msgstr "для таблицы \"%s.%s\""
 
 #: describe.c:929
 #, c-format
-msgid "View definition: %s"
-msgstr "Определение вида: %s"
+msgid ""
+"View definition:\n"
+"%s"
+msgstr ""
+"Определение вида:\n"
+"%s"
 
 #: describe.c:935
 msgid "Rules"
 msgstr "Правила"
 
-#: describe.c:1083
+#: describe.c:1084
 msgid "Indexes:"
 msgstr "Индексы:"
 
-#: describe.c:1091
+#: describe.c:1092
 #, c-format
 msgid "    \"%s\""
 msgstr "    \"%s\""
 
-#: describe.c:1097
+#: describe.c:1098
 msgid " primary key,"
 msgstr " ключевое поле,"
 
-#: describe.c:1099
+#: describe.c:1100
 msgid " unique,"
 msgstr " unique,"
 
-#: describe.c:1116
+#: describe.c:1118
 msgid "Check constraints:"
 msgstr "CHECK-констрэйнты:"
 
-#: describe.c:1120
+#: describe.c:1122
 #, c-format
 msgid "    \"%s\" CHECK %s"
 msgstr "    \"%s\" CHECK %s"
 
 # TO REWVIEW
-#: describe.c:1130
+#: describe.c:1133
 msgid "Foreign-key constraints:"
 msgstr "Ограничения по вторичному ключу:"
 
-#: describe.c:1134
+#: describe.c:1137
 #, c-format
 msgid "    \"%s\" %s"
 msgstr "    \"%s\" %s"
 
-#: describe.c:1144
+#: describe.c:1148
 msgid "Rules:"
 msgstr "Правила:"
 
-#: describe.c:1162
+#: describe.c:1167
 msgid "Triggers:"
 msgstr "Триггеры:"
 
-#: describe.c:1184
+#: describe.c:1189
 msgid "Inherits"
 msgstr "Наследует"
 
-#: describe.c:1270
+#: describe.c:1275
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: describe.c:1270
+#: describe.c:1275
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: describe.c:1271
+#: describe.c:1276
 msgid "superuser, create database"
 msgstr "superuser: создание базы данных"
 
-#: describe.c:1272
+#: describe.c:1277
 msgid "superuser"
 msgstr "superuser"
 
-#: describe.c:1272
+#: describe.c:1277
 msgid "create database"
 msgstr "создание базы данных"
 
-#: describe.c:1273
+#: describe.c:1278
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: describe.c:1286
+#: describe.c:1291
 msgid "List of database users"
 msgstr "Список пользователей базы данных"
 
-#: describe.c:1333
+#: describe.c:1338
 msgid "special"
 msgstr "особенный"
 
-#: describe.c:1394
+#: describe.c:1399
 msgid "No matching relations found.\n"
 msgstr "Подходящих связей не найдено.\n"
 
-#: describe.c:1396
+#: describe.c:1401
 msgid "No relations found.\n"
 msgstr "Связи не найдены.\n"
 
-#: describe.c:1401
+#: describe.c:1406
 msgid "List of relations"
 msgstr "Список связей"
 
-#: describe.c:1440
+#: describe.c:1445
 msgid "Modifier"
 msgstr "Модификаторы"
 
-#: describe.c:1454
+#: describe.c:1459
 msgid "List of domains"
 msgstr "Список доменов"
 
-#: describe.c:1487
+#: describe.c:1492
 msgid "Source"
 msgstr "Источник"
 
-#: describe.c:1488
+#: describe.c:1493
 msgid "Destination"
 msgstr "Назначение"
 
-#: describe.c:1489
-#: describe.c:1546
+#: describe.c:1494
+#: describe.c:1551
 msgid "yes"
 msgstr "да"
 
-#: describe.c:1490
-#: describe.c:1544
+#: describe.c:1495
+#: describe.c:1549
 msgid "no"
 msgstr "нет"
 
-#: describe.c:1491
+#: describe.c:1496
 msgid "Default?"
 msgstr "По умолчанию?"
 
-#: describe.c:1505
+#: describe.c:1510
 msgid "List of conversions"
 msgstr "Список конверсий"
 
-#: describe.c:1540
+#: describe.c:1545
 msgid "Source type"
 msgstr "Исходный тип"
 
-#: describe.c:1541
+#: describe.c:1546
 msgid "Target type"
 msgstr "Тип назначения"
 
-#: describe.c:1542
+#: describe.c:1547
 msgid "(binary compatible)"
 msgstr "(двоично-совместимый)"
 
-#: describe.c:1543
+#: describe.c:1548
 msgid "Function"
 msgstr "Функция"
 
-#: describe.c:1545
+#: describe.c:1550
 msgid "in assignment"
 msgstr "в присвоении"
 
-#: describe.c:1547
+#: describe.c:1552
 msgid "Implicit?"
-msgstr "Поздразмевается?"
+msgstr "Подразумевается?"
 
-#: describe.c:1555
+#: describe.c:1560
 msgid "List of casts"
 msgstr "Список конверсий типов"
 
-#: describe.c:1596
+#: describe.c:1601
 msgid "List of schemas"
 msgstr "Список схем"
 
diff --git a/src/bin/scripts/po/ru.po b/src/bin/scripts/po/ru.po
index eec0b09420..0fa231765d 100644
--- a/src/bin/scripts/po/ru.po
+++ b/src/bin/scripts/po/ru.po
@@ -1,24 +1,24 @@
 # ru.po
 # PGSCRIPTS Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/scripts/po/Attic/ru.po,v 1.1 2003/08/01 16:19:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/po/Attic/ru.po,v 1.2 2003/08/24 21:18:52 petere Exp $
 #
 # ChangeLog:
-#   - July 24-26, 2003: Initial Translation for 7.4.*; Serguei A. Mokhov, <mokhov@cs.concordia.ca>
+#   - July 24 - August 23, 2003: Initial Translation for 7.4.*; Serguei A. Mokhov, <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
 "POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-07-26 20:25-0500\n"
+"PO-Revision-Date: 2003-08-23 12:44-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clusterdb.c:94
-#: clusterdb.c:109
+#: clusterdb.c:96
+#: clusterdb.c:111
 #: createdb.c:101
 #: createdb.c:120
 #: createlang.c:94
@@ -34,38 +34,38 @@ msgstr ""
 #: droplang.c:151
 #: dropuser.c:83
 #: dropuser.c:98
-#: vacuumdb.c:110
-#: vacuumdb.c:125
+#: vacuumdb.c:112
+#: vacuumdb.c:127
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Наберите \"%s --help\" для более подробной информации.\n"
 
-#: clusterdb.c:107
+#: clusterdb.c:109
 #: createdb.c:118
 #: createlang.c:113
 #: createuser.c:129
 #: dropdb.c:98
 #: droplang.c:107
 #: dropuser.c:96
-#: vacuumdb.c:123
+#: vacuumdb.c:125
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr ""
+msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
 
 #: createdb.c:128
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
-msgstr ""
+msgstr "%s: \"%s\" не является верным именем кодировки\n"
 
 #: createdb.c:170
 #, c-format
 msgid "%s: database creation failed: %s"
-msgstr ""
+msgstr "%s: создание базы не удалось: %s"
 
 #: createdb.c:195
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
-msgstr ""
+msgstr "%s: создание комментария не удалось (база была создана): %s"
 
 #: createdb.c:213
 #, c-format
@@ -73,31 +73,33 @@ msgid ""
 "%s creates a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s создаёт базу PostgreSQL.\n"
+"\n"
 
-#: clusterdb.c:228
+#: clusterdb.c:232
 #: createdb.c:214
 #: createlang.c:272
-#: createuser.c:235
+#: createuser.c:236
 #: dropdb.c:143
-#: droplang.c:241
+#: droplang.c:242
 #: dropuser.c:143
-#: vacuumdb.c:252
+#: vacuumdb.c:256
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
 #: createdb.c:215
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ИМЯБД] [ОПИСАНИЕ]\n"
 
-#: clusterdb.c:230
+#: clusterdb.c:234
 #: createdb.c:216
 #: createlang.c:274
-#: createuser.c:237
+#: createuser.c:238
 #: dropdb.c:145
-#: droplang.c:243
+#: droplang.c:244
 #: dropuser.c:145
-#: vacuumdb.c:254
+#: vacuumdb.c:258
 msgid ""
 "\n"
 "Options:\n"
@@ -107,125 +109,133 @@ msgstr ""
 
 #: createdb.c:217
 msgid "  -D, --location=PATH       alternative place to store the database\n"
-msgstr ""
+msgstr "  -D, --location=ПУТЬ       альтернативное место хранения базы\n"
 
 #: createdb.c:218
 msgid "  -E, --encoding=ENCODING   encoding for the database\n"
-msgstr ""
+msgstr "  -E, --encoding=КОДИРОВКА  кодировка для базы\n"
 
 #: createdb.c:219
 msgid "  -O, --owner=OWNER         database user to own the new database\n"
-msgstr ""
+msgstr "  -O, --owner=ВЛАДЕЛЕЦ      пользователь-владелец новой базы\n"
 
 #: createdb.c:220
 msgid "  -T, --template=TEMPLATE   template database to copy\n"
-msgstr ""
+msgstr "  -T, --template=ШАБЛОН     база-шаблон для копирования\n"
 
-#: clusterdb.c:234
+#: clusterdb.c:238
 #: createdb.c:221
 #: createlang.c:276
-#: createuser.c:246
+#: createuser.c:247
 #: dropdb.c:146
-#: droplang.c:245
+#: droplang.c:246
 #: dropuser.c:146
 msgid "  -e, --echo                show the commands being sent to the server\n"
-msgstr ""
+msgstr "  -e, --echo                показывать команды отправленные серверу\n"
 
-#: clusterdb.c:235
+#: clusterdb.c:239
 #: createdb.c:222
-#: createuser.c:247
+#: createuser.c:248
 #: dropdb.c:148
 #: dropuser.c:148
 msgid "  -q, --quiet               don't write any messages\n"
-msgstr ""
+msgstr "  -q, --quiet               не показывать никакие сообщения\n"
 
-#: clusterdb.c:236
+#: clusterdb.c:240
 #: createdb.c:223
 #: createlang.c:283
-#: createuser.c:248
+#: createuser.c:249
 #: dropdb.c:153
-#: droplang.c:251
+#: droplang.c:252
 #: dropuser.c:153
 msgid "  --help                    show this help, then exit\n"
-msgstr ""
+msgstr "  --help                    показать эту спраку и выйти\n"
 
-#: clusterdb.c:237
+#: clusterdb.c:241
 #: createdb.c:224
 #: createlang.c:284
-#: createuser.c:249
+#: createuser.c:250
 #: dropdb.c:154
-#: droplang.c:252
+#: droplang.c:253
 #: dropuser.c:154
 msgid "  --version                 output version information, then exit\n"
-msgstr ""
+msgstr "  --version                 показать версию и выйти\n"
 
-#: clusterdb.c:238
+#: clusterdb.c:242
 #: createdb.c:225
-#: createuser.c:250
-#: vacuumdb.c:265
+#: createuser.c:251
+#: vacuumdb.c:269
 msgid ""
 "\n"
 "Connection options:\n"
 msgstr ""
+"\n"
+"Опции подсоединения:\n"
 
-#: clusterdb.c:239
+#: clusterdb.c:243
 #: createdb.c:226
 #: createlang.c:279
-#: createuser.c:251
+#: createuser.c:252
 #: dropdb.c:149
-#: droplang.c:247
+#: droplang.c:248
 #: dropuser.c:149
-#: vacuumdb.c:266
+#: vacuumdb.c:270
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
-msgstr ""
+msgstr "  -h, --host=ХОСТ           сервер баз данных или директория сокетов\n"
 
-#: clusterdb.c:240
+#: clusterdb.c:244
 #: createdb.c:227
 #: createlang.c:280
-#: createuser.c:252
+#: createuser.c:253
 #: dropdb.c:150
-#: droplang.c:248
+#: droplang.c:249
 #: dropuser.c:150
-#: vacuumdb.c:267
+#: vacuumdb.c:271
 msgid "  -p, --port=PORT           database server port\n"
-msgstr ""
+msgstr "  -p, --port=ПОРТ           порт сервера баз данных\n"
 
-#: clusterdb.c:241
+#: clusterdb.c:245
 #: createdb.c:228
 #: createlang.c:281
 #: dropdb.c:151
-#: droplang.c:249
-#: vacuumdb.c:268
+#: droplang.c:250
+#: vacuumdb.c:272
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr ""
+"  -U, --username=ПОЛЬЗОВАТЕЛЬ\n"
+"                            имя пользователя для подсоединения\n"
 
-#: clusterdb.c:242
+#: clusterdb.c:246
 #: createdb.c:229
 #: createlang.c:282
 #: dropdb.c:152
-#: droplang.c:250
-#: vacuumdb.c:269
+#: droplang.c:251
+#: vacuumdb.c:273
 msgid "  -W, --password            prompt for password\n"
-msgstr ""
+msgstr "  -W, --password            запросить пароль\n"
 
 #: createdb.c:230
 msgid ""
 "\n"
 "By default, a database with the same name as the current user is created.\n"
 msgstr ""
+"\n"
+"По умолчанию имя создаваемой базы такоеже как текущее имя пользователя.\n"
 
-#: clusterdb.c:244
+#: clusterdb.c:248
 #: createdb.c:231
 #: createlang.c:285
-#: createuser.c:257
+#: createuser.c:258
 #: dropdb.c:155
-#: droplang.c:253
+#: droplang.c:254
 #: dropuser.c:155
-#: vacuumdb.c:271
+#: vacuumdb.c:275
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
+"\n"
+"Сообщать об ошибках: <pgsql-bugs@postgresql.org>.\n"
 
 #: createlang.c:140
 #: droplang.c:134
@@ -245,7 +255,7 @@ msgstr "нет"
 #: createlang.c:140
 #: droplang.c:134
 msgid "Trusted?"
-msgstr ""
+msgstr "Доверяемый?"
 
 #: createlang.c:147
 #: droplang.c:141
@@ -256,26 +266,26 @@ msgstr "Процедурные Языки"
 #: droplang.c:150
 #, c-format
 msgid "%s: missing required argument language name\n"
-msgstr ""
+msgstr "%s: отсутствует необходимый аргумент -- имя языка\n"
 
 #: createlang.c:206
 #, c-format
 msgid "%s: unsupported language \"%s\"\n"
-msgstr ""
+msgstr "%s: язык \"%s\" не поддерживается\n"
 
 #: createlang.c:207
 msgid "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and plpythonu.\n"
-msgstr ""
+msgstr "Поддерживаемые языки: plpgsql, pltcl, pltclu, plperl, plperlu и plpythonu.\n"
 
 #: createlang.c:222
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
-msgstr ""
+msgstr "%s: язык \"%s\" уже установлен в базе \"%s\"\n"
 
 #: createlang.c:256
 #, c-format
 msgid "%s: language installation failed: %s"
-msgstr ""
+msgstr "%s: установка языка не удалась: %s"
 
 #: createlang.c:271
 #, c-format
@@ -283,130 +293,139 @@ msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s устанавливает процедурный язык в базу PostgreSQL.\n"
+"\n"
 
 #: createlang.c:273
-#: droplang.c:242
+#: droplang.c:243
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... ЯЗЫК [ИМЯБД]\n"
 
 #: createlang.c:275
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
-msgstr ""
+msgstr "  -d, --dbname=ИМЯБД       база в которой установить язык\n"
 
 #: createlang.c:277
-#: droplang.c:246
+#: droplang.c:247
 msgid "  -l, --list                show a list of currently installed languages\n"
-msgstr ""
+msgstr "  -l, --list                показать список установленных языков\n"
 
 #: createlang.c:278
 msgid "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-msgstr ""
+msgstr "  -L, --pglib=ДИРЕКТОРИЯ    найти файл интерпретатора в ДИРЕКТОРИИ\n"
 
 #: createuser.c:141
 #, c-format
 msgid "%s: user ID must be a positive number\n"
-msgstr ""
+msgstr "%s: ID пользователя должно быть положительным числом\n"
 
 #: createuser.c:147
 msgid "Enter name of user to add: "
-msgstr ""
+msgstr "Введите имя добавляемого пользователя: "
 
-#: createuser.c:153
+#: createuser.c:154
 msgid "Enter password for new user: "
-msgstr ""
+msgstr "Введите пароль для нового пользователя: "
 
-#: createuser.c:154
+#: createuser.c:155
 msgid "Enter it again: "
 msgstr "Введите снова: "
 
-#: createuser.c:157
+#: createuser.c:158
 msgid "Passwords didn't match.\n"
 msgstr "Пароли не совпадают.\n"
 
-#: createuser.c:168
+#: createuser.c:169
 msgid "Shall the new user be allowed to create databases? (y/n) "
-msgstr ""
+msgstr "Разрешить новому пользователю создавать базы? (y/n) "
 
-#: createuser.c:179
+#: createuser.c:180
 msgid "Shall the new user be allowed to create more new users? (y/n) "
-msgstr ""
+msgstr "Разрешить новому пользователю создавать пользователей? (y/n) "
 
-#: createuser.c:218
+#: createuser.c:219
 #, c-format
 msgid "%s: creation of new user failed: %s"
-msgstr ""
+msgstr "%s: создание нового пользователя не удалось: %s"
 
-#: createuser.c:234
+#: createuser.c:235
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL user.\n"
 "\n"
 msgstr ""
+"%s создаёт нового пользователья PostgreSQL.\n"
+"\n"
 
-#: createuser.c:236
+#: createuser.c:237
 #: dropuser.c:144
 #, c-format
 msgid "  %s [OPTION]... [USERNAME]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ПОЛЬЗОВАТЕЛЬ]\n"
 
-#: createuser.c:238
+#: createuser.c:239
 msgid "  -a, --adduser             user can add new users\n"
-msgstr ""
+msgstr "  -a, --adduser             пользователь может создавать других пользователей\n"
 
-#: createuser.c:239
+#: createuser.c:240
 msgid "  -A, --no-adduser          user cannot add new users\n"
-msgstr ""
+msgstr "  -A, --no-adduser          пользователь не сможет создавать пользователей\n"
 
-#: createuser.c:240
+#: createuser.c:241
 msgid "  -d, --createdb            user can create new databases\n"
-msgstr ""
+msgstr "  -d, --createdb            пользователь может создавать новые базы\n"
 
-#: createuser.c:241
+#: createuser.c:242
 msgid "  -D, --no-createdb         user cannot create databases\n"
-msgstr ""
+msgstr "  -D, --no-createdb         пользователь не может создавать базы\n"
 
-#: createuser.c:242
+#: createuser.c:243
 msgid "  -P, --pwprompt            assign a password to new user\n"
-msgstr ""
+msgstr "  -P, --pwprompt            создать пароль новому пользователю\n"
 
-#: createuser.c:243
+#: createuser.c:244
 msgid "  -E, --encrypted           encrypt stored password\n"
-msgstr ""
+msgstr "  -E, --encrypted           зашифровать сохранённый пароль\n"
 
-#: createuser.c:244
+#: createuser.c:245
 msgid "  -N, --unencrypted         do no encrypt stored password\n"
-msgstr ""
+msgstr "  -N, --unencrypted         не щифровать сохранённый пароль\n"
 
-#: createuser.c:245
+#: createuser.c:246
 msgid "  -i, --sysid=SYSID         select sysid for new user\n"
-msgstr ""
+msgstr "  -i, --sysid=SYSID         выбрать sysid для нового пользователья\n"
 
-#: createuser.c:253
-msgid "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
+#: createuser.c:254
+msgid  "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr ""
+"  -U, --username=ПОЛЬЗОВАТЕЛЬ\n"
+"                            имя пользователья для подсоединения (но не для создания)\n"
 
-#: createuser.c:254
+#: createuser.c:255
 #: dropuser.c:152
 msgid "  -W, --password            prompt for password to connect\n"
-msgstr ""
+msgstr "  -W, --password            запросить пароль для подсоединения\n"
 
-#: createuser.c:255
+#: createuser.c:256
 msgid ""
 "\n"
 "If one of -a, -A, -d, -D, and USERNAME is not specified, you will\n"
 "be prompted interactively.\n"
 msgstr ""
+"\n"
+"Если одно из: -a, -A, -d, -D и ПОЛЬЗОВАТЕЛЬ не указано, вы будете\n"
+"запрошены интерактивно.\n"
 
 #: dropdb.c:91
 #, c-format
 msgid "%s: missing required argument database name\n"
-msgstr ""
+msgstr "%s: отсутствует необходимый аргумент: имя базы\n"
 
 #: dropdb.c:108
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
-msgstr ""
+msgstr "База \"%s\" будет полностью удалена.\n"
 
 #: dropdb.c:109
 #: dropuser.c:110
@@ -416,7 +435,7 @@ msgstr "Вы уверены? (y/n) "
 #: dropdb.c:126
 #, c-format
 msgid "%s: database removal failed: %s"
-msgstr ""
+msgstr "%s: не удалось удалить базу: %s"
 
 #: dropdb.c:142
 #, c-format
@@ -424,51 +443,55 @@ msgid ""
 "%s removes a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s удаляет базу PostgreSQL.\n"
+"\n"
 
 #: dropdb.c:144
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ИМЯБД]\n"
 
 #: dropdb.c:147
 #: dropuser.c:147
 msgid "  -i, --interactive         prompt before deleting anything\n"
-msgstr ""
+msgstr "  -i, --interactive         подтвердить перед удалением чего-либо\n"
 
-#: droplang.c:169
+#: droplang.c:170
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
-msgstr ""
+msgstr "%s: язык \"%s\" не установлен в базе \"%s\"\n"
 
-#: droplang.c:185
+#: droplang.c:186
 #, c-format
 msgid "%s: still %s functions declared in language \"%s\"; language not removed\n"
-msgstr ""
+msgstr "%s: существуют ещё фунции (%s) в языке \"%s\" ; язык не удалён\n"
 
-#: droplang.c:226
+#: droplang.c:227
 #, c-format
 msgid "%s: language removal failed: %s"
-msgstr ""
+msgstr "%s: не удалось удалить язык: %s"
 
-#: droplang.c:240
+#: droplang.c:241
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
 "\n"
 msgstr ""
+"%s удаляет процедурный язык из базы.\n"
+"\n"
 
-#: droplang.c:244
+#: droplang.c:245
 msgid "  -d, --dbname=DBNAME       database from which to remove the language\n"
-msgstr ""
+msgstr "  -d, --dbname=ИМЯБД        база из которой удалить язык\n"
 
 #: dropuser.c:103
 msgid "Enter name of user to drop: "
-msgstr ""
+msgstr "Введите имя пользователя для удаления: "
 
 #: dropuser.c:109
 #, c-format
 msgid "User \"%s\" will be permanently removed.\n"
-msgstr ""
+msgstr "Пользователь \"%s\" будет полностью удалён.\n"
 
 #: dropuser.c:126
 #, c-format
@@ -481,144 +504,154 @@ msgid ""
 "%s removes a PostgreSQL user.\n"
 "\n"
 msgstr ""
+"%s удаляет пользователя PostgreSQL.\n"
+"\n"
 
 #: dropuser.c:151
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr ""
+"  -U, --username=ПОЛЬЗОВАТЕЛЬ\n"
+"                            имя пользователя для подсоединения (не для удаления)\n"
 
-#: clusterdb.c:117
+#: clusterdb.c:119
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr ""
 
-#: clusterdb.c:123
+#: clusterdb.c:125
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr ""
 
-#: clusterdb.c:178
+#: clusterdb.c:181
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
 
-#: clusterdb.c:181
+#: clusterdb.c:184
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr ""
 
-#: clusterdb.c:213
+#: clusterdb.c:217
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr ""
 
-#: clusterdb.c:227
+#: clusterdb.c:231
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
 "\n"
 msgstr ""
 
-#: clusterdb.c:229
-#: vacuumdb.c:253
+#: clusterdb.c:233
+#: vacuumdb.c:257
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ИМЯБД]\n"
 
-#: clusterdb.c:231
+#: clusterdb.c:235
 msgid "  -a, --all                 cluster all databases\n"
 msgstr ""
 
-#: clusterdb.c:232
+#: clusterdb.c:236
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr ""
 
-#: clusterdb.c:233
+#: clusterdb.c:237
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr ""
 
-#: clusterdb.c:243
+#: clusterdb.c:247
 msgid ""
 "\n"
 "Read the description of the SQL command CLUSTER for details.\n"
 msgstr ""
+"\n"
+"Читайте описание SQL-команды CLUSTER для более подробной информации.\n"
 
-#: vacuumdb.c:133
+#: vacuumdb.c:135
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
 
-#: vacuumdb.c:139
+#: vacuumdb.c:141
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr ""
 
-#: vacuumdb.c:201
+#: vacuumdb.c:204
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
 
-#: vacuumdb.c:204
+#: vacuumdb.c:207
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr ""
 
-#: vacuumdb.c:237
+#: vacuumdb.c:241
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr ""
 
-#: vacuumdb.c:251
+#: vacuumdb.c:255
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s очищает и анализирует базу PostgreSQL.\n"
+"\n"
 
-#: vacuumdb.c:255
+#: vacuumdb.c:259
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr ""
 
-#: vacuumdb.c:256
+#: vacuumdb.c:260
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr ""
 
-#: vacuumdb.c:257
+#: vacuumdb.c:261
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr ""
 
-#: vacuumdb.c:258
+#: vacuumdb.c:262
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr ""
 
-#: vacuumdb.c:259
+#: vacuumdb.c:263
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr ""
 
-#: vacuumdb.c:260
+#: vacuumdb.c:264
 msgid "  -e, --echo                      show the commands being sent to the server\n"
-msgstr ""
+msgstr "  -e, --echo                      показывать команды отправляемые серверу\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:265
 msgid "  -q, --quiet                     don't write any messages\n"
-msgstr ""
+msgstr "  -q, --quiet                     не выводить сообщения\n"
 
-#: vacuumdb.c:262
+#: vacuumdb.c:266
 msgid "  -v, --verbose                   write a lot of output\n"
-msgstr ""
+msgstr "  -v, --verbose                   многсловный вывод\n"
 
-#: vacuumdb.c:263
+#: vacuumdb.c:267
 msgid "  --help                          show this help, then exit\n"
-msgstr ""
+msgstr "  --help                          показать эту справку и выйти\n"
 
-#: vacuumdb.c:264
+#: vacuumdb.c:268
 msgid "  --version                       output version information, then exit\n"
-msgstr ""
+msgstr "  --version                       показать опцию и выйти\n"
 
-#: vacuumdb.c:270
+#: vacuumdb.c:274
 msgid ""
 "\n"
 "Read the description of the SQL command VACUUM for details.\n"
 msgstr ""
+"\n"
+"Читайте описание SQL-команды VACUUM для более подробной информации.\n"
 
 #: common.c:88
 #: common.c:114