summaryrefslogtreecommitdiff
path: root/src/bin/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/scripts')
-rw-r--r--src/bin/scripts/po/es.po21
-rw-r--r--src/bin/scripts/po/pt_BR.po276
-rw-r--r--src/bin/scripts/po/ru.po285
-rw-r--r--src/bin/scripts/po/sv.po386
-rw-r--r--src/bin/scripts/po/zh_CN.po403
5 files changed, 770 insertions, 601 deletions
diff --git a/src/bin/scripts/po/es.po b/src/bin/scripts/po/es.po
index 34b0b5c6d3f..e832fbbb5f8 100644
--- a/src/bin/scripts/po/es.po
+++ b/src/bin/scripts/po/es.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: pgscripts (PostgreSQL 9.6)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2016-05-02 20:14+0000\n"
-"PO-Revision-Date: 2016-05-03 12:17-0300\n"
+"PO-Revision-Date: 2016-05-25 11:14-0500\n"
"Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
"Language-Team: Castellano <pgsql-es-ayuda@postgresql.org>\n"
"Language: es\n"
@@ -21,7 +21,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.8.7\n"
#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
#: ../../common/fe_memutils.c:98
@@ -223,8 +223,8 @@ msgstr " -h, --host=ANFITRIÓN nombre del servidor o directorio del socket
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PUERTO puerto del servidor\n"
-#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:410 vacuumdb.c:960
+#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248 reindexdb.c:410
+#: vacuumdb.c:960
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USUARIO nombre de usuario para la conexión\n"
@@ -271,10 +271,9 @@ msgid "Password: "
msgstr "Contraseña: "
#: common.c:113
-#, fuzzy, c-format
-#| msgid "%s: could not connect to database %s\n"
+#, c-format
msgid "%s: could not connect to database %s: out of memory\n"
-msgstr "%s: no se pudo conectar a la base de datos %s\n"
+msgstr "%s: no se pudo conectar a la base de datos %s: memoria agotada\n"
#: common.c:141
#, c-format
@@ -1019,8 +1018,7 @@ msgstr ""
"Lea la descripción de la orden REINDEX de SQL para obtener mayores detalles.\n"
#: vacuumdb.c:191
-#, fuzzy, c-format
-#| msgid "%s: number of parallel \"jobs\" must be at least 1\n"
+#, c-format
msgid "%s: number of parallel jobs must be at least 1\n"
msgstr "%s: número de trabajos en paralelo debe ser al menos 1\n"
@@ -1087,10 +1085,9 @@ msgstr ""
"%s"
#: vacuumdb.c:929
-#, fuzzy, c-format
-#| msgid "%s: invalid argument: %s\n"
+#, c-format
msgid "%s: invalid socket: %s"
-msgstr "%s: el argumento no es válido: %s\n"
+msgstr "%s: el socket no es válido: %s"
#: vacuumdb.c:938
#, c-format
diff --git a/src/bin/scripts/po/pt_BR.po b/src/bin/scripts/po/pt_BR.po
index 50f201e1d5b..029a2506c57 100644
--- a/src/bin/scripts/po/pt_BR.po
+++ b/src/bin/scripts/po/pt_BR.po
@@ -5,16 +5,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 9.5\n"
+"Project-Id-Version: PostgreSQL 9.6\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-13 17:22-0300\n"
-"PO-Revision-Date: 2005-10-06 00:21-0300\n"
+"POT-Creation-Date: 2016-06-06 22:14+0000\n"
+"PO-Revision-Date: 2016-06-07 06:54-0400\n"
"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n>1);\n"
#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
#: ../../common/fe_memutils.c:98
@@ -41,19 +42,46 @@ msgstr "usuário não existe"
msgid "user name lookup failure: error code %lu"
msgstr "falhou ao pesquisar nome de usuário: código de erro %lu"
+#: ../../fe_utils/print.c:354
+#, c-format
+msgid "(%lu row)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(%lu registro)"
+msgstr[1] "(%lu registros)"
+
+#: ../../fe_utils/print.c:2906
+#, c-format
+msgid "Interrupted\n"
+msgstr "Interrompido\n"
+
+#: ../../fe_utils/print.c:2970
+#, c-format
+msgid "Cannot add header to table content: column count of %d exceeded.\n"
+msgstr "Não pode adicionar cabeçalho a conteúdo de tabela: quantidade de colunas %d foi excedida.\n"
+
+#: ../../fe_utils/print.c:3010
+#, c-format
+msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
+msgstr "Não pode adicionar célula a conteúdo de tabela: quantidade total de células %d foi excedida.\n"
+
+#: ../../fe_utils/print.c:3259
+#, c-format
+msgid "invalid output format (internal error): %d"
+msgstr "formato de saída inválido (erro interno): %d"
+
#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
-#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
-#: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
+#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:169
+#: createuser.c:184 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
#: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
-#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:130 reindexdb.c:149
-#: vacuumdb.c:208 vacuumdb.c:227
+#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:131 reindexdb.c:150
+#: vacuumdb.c:209 vacuumdb.c:228
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
-#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
-#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:147
-#: vacuumdb.c:225
+#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:182
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:148
+#: vacuumdb.c:226
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: muitos argumentos para linha de comando (primeiro é \"%s\")\n"
@@ -92,21 +120,21 @@ msgstr ""
"%s agrupa todas as tabelas agrupadas anteriormente no banco de dados.\n"
"\n"
-#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
-#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:392
-#: vacuumdb.c:931
+#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:349
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:393
+#: vacuumdb.c:939
#, c-format
msgid "Usage:\n"
msgstr "Uso:\n"
-#: clusterdb.c:263 reindexdb.c:393 vacuumdb.c:932
+#: clusterdb.c:263 reindexdb.c:394 vacuumdb.c:940
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [OPÇÃO]... [NOMEBD]\n"
-#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
-#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:394
-#: vacuumdb.c:933
+#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:351
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:395
+#: vacuumdb.c:941
#, c-format
msgid ""
"\n"
@@ -125,13 +153,13 @@ msgstr " -a, --all agrupa todos os bancos de dados\n"
msgid " -d, --dbname=DBNAME database to cluster\n"
msgstr " -d, --dbname=NOMEBD banco de dados a ser agrupado\n"
-#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
-#: droplang.c:241 dropuser.c:159 reindexdb.c:397
+#: clusterdb.c:267 createlang.c:240 createuser.c:355 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:398
#, c-format
msgid " -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo mostra os comandos enviados ao servidor\n"
-#: clusterdb.c:268 reindexdb.c:399
+#: clusterdb.c:268 reindexdb.c:400
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet não exibe nenhuma mensagem\n"
@@ -141,26 +169,26 @@ msgstr " -q, --quiet não exibe nenhuma mensagem\n"
msgid " -t, --table=TABLE cluster specific table(s) only\n"
msgstr " -t, --table=TABELA agrupa somente a(s) tabela(s) especificada(s)\n"
-#: clusterdb.c:270 reindexdb.c:403
+#: clusterdb.c:270 reindexdb.c:404
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose mostra muitas mensagens\n"
-#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
-#: droplang.c:243 dropuser.c:162 reindexdb.c:404
+#: clusterdb.c:271 createlang.c:242 createuser.c:369 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:405
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version mostra informação sobre a versão e termina\n"
-#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
-#: droplang.c:244 dropuser.c:164 reindexdb.c:405
+#: clusterdb.c:272 createlang.c:243 createuser.c:374 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:406
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help mostra essa ajuda e termina\n"
-#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
-#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:406
-#: vacuumdb.c:949
+#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:375
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:407
+#: vacuumdb.c:957
#, c-format
msgid ""
"\n"
@@ -169,37 +197,37 @@ msgstr ""
"\n"
"Opções de conexão:\n"
-#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:407 vacuumdb.c:950
+#: clusterdb.c:274 createlang.c:245 createuser.c:376 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:408 vacuumdb.c:958
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=MÁQUINA máquina do servidor de banco de dados ou diretório do soquete\n"
-#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:951
+#: clusterdb.c:275 createlang.c:246 createuser.c:377 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:409 vacuumdb.c:959
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORTA porta do servidor de banco de dados\n"
#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:409 vacuumdb.c:952
+#: reindexdb.c:410 vacuumdb.c:960
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USUÁRIO nome do usuário para se conectar\n"
-#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:953
+#: clusterdb.c:277 createlang.c:248 createuser.c:379 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:411 vacuumdb.c:961
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password nunca pergunta senha\n"
-#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:954
+#: clusterdb.c:278 createlang.c:249 createuser.c:380 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:412 vacuumdb.c:962
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password pergunta senha\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:955
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:413 vacuumdb.c:963
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=NOMEBD especifica um banco de dados para manutenção\n"
@@ -213,9 +241,9 @@ msgstr ""
"\n"
"Leia a descrição do comando SQL CLUSTER para obter detalhes.\n"
-#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
-#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:414
-#: vacuumdb.c:957
+#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:381
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:415
+#: vacuumdb.c:965
#, c-format
msgid ""
"\n"
@@ -467,46 +495,46 @@ msgstr " -d, --dbname=NOMEBD banco de dados para instalar linguagem\n"
msgid " -l, --list show a list of currently installed languages\n"
msgstr " -l, --list mostra a lista das linguagens instaladas\n"
-#: createuser.c:190
+#: createuser.c:191
msgid "Enter name of role to add: "
msgstr "Digite o nome da role a ser adicionada: "
-#: createuser.c:205
+#: createuser.c:206
msgid "Enter password for new role: "
msgstr "Digite a senha para a nova role: "
-#: createuser.c:206
+#: createuser.c:207
msgid "Enter it again: "
msgstr "Digite-a novamente: "
-#: createuser.c:209
+#: createuser.c:210
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Senhas não correspondem.\n"
-#: createuser.c:218
+#: createuser.c:219
msgid "Shall the new role be a superuser?"
msgstr "A nova role poderá criar um super-usuário?"
-#: createuser.c:233
+#: createuser.c:234
msgid "Shall the new role be allowed to create databases?"
msgstr "A nova role poderá criar bancos de dados?"
-#: createuser.c:241
+#: createuser.c:242
msgid "Shall the new role be allowed to create more new roles?"
msgstr "A nova role poderá criar novas roles?"
-#: createuser.c:275
+#: createuser.c:276
#, c-format
msgid "Password encryption failed.\n"
msgstr "Criptografia de senha falhou.\n"
-#: createuser.c:332
+#: createuser.c:333
#, c-format
msgid "%s: creation of new role failed: %s"
msgstr "%s: criação de nova role falhou: %s"
-#: createuser.c:347
+#: createuser.c:348
#, c-format
msgid ""
"%s creates a new PostgreSQL role.\n"
@@ -515,37 +543,37 @@ msgstr ""
"%s cria uma nova role do PostgreSQL.\n"
"\n"
-#: createuser.c:349 dropuser.c:157
+#: createuser.c:350 dropuser.c:157
#, c-format
msgid " %s [OPTION]... [ROLENAME]\n"
msgstr " %s [OPÇÃO]... [NOME_ROLE]\n"
-#: createuser.c:351
+#: createuser.c:352
#, c-format
msgid " -c, --connection-limit=N connection limit for role (default: no limit)\n"
msgstr " -c, --connection-limit=N limite de conexão por role (padrão: ilimitado)\n"
-#: createuser.c:352
+#: createuser.c:353
#, c-format
msgid " -d, --createdb role can create new databases\n"
msgstr " -d, --createdb role pode criar novos bancos de dados\n"
-#: createuser.c:353
+#: createuser.c:354
#, c-format
msgid " -D, --no-createdb role cannot create databases (default)\n"
msgstr " -D, --no-createdb role não pode criar novos bancos de dados (padrão)\n"
-#: createuser.c:355
+#: createuser.c:356
#, c-format
msgid " -E, --encrypted encrypt stored password\n"
msgstr " -E, --encrypted criptografa a senha armazenada\n"
-#: createuser.c:356
+#: createuser.c:357
#, c-format
msgid " -g, --role=ROLE new role will be a member of this role\n"
msgstr " -g, --role=ROLE nova role será um membro desta role\n"
-#: createuser.c:357
+#: createuser.c:358
#, c-format
msgid ""
" -i, --inherit role inherits privileges of roles it is a\n"
@@ -554,52 +582,52 @@ msgstr ""
" -i, --inherit role herda privilégios de roles das quais ela\n"
" é um membro (padrão)\n"
-#: createuser.c:359
+#: createuser.c:360
#, c-format
msgid " -I, --no-inherit role does not inherit privileges\n"
msgstr " -I, --no-inherit role não herda privilégios\n"
-#: createuser.c:360
+#: createuser.c:361
#, c-format
msgid " -l, --login role can login (default)\n"
msgstr " -l, --login role pode efetuar login (padrão)\n"
-#: createuser.c:361
+#: createuser.c:362
#, c-format
msgid " -L, --no-login role cannot login\n"
msgstr " -L, --no-login role não pode efetuar login\n"
-#: createuser.c:362
+#: createuser.c:363
#, c-format
msgid " -N, --unencrypted do not encrypt stored password\n"
msgstr " -N, --unencrypted não criptografa a senha armazenada\n"
-#: createuser.c:363
+#: createuser.c:364
#, c-format
msgid " -P, --pwprompt assign a password to new role\n"
msgstr " -P, --pwprompt atribui uma senha a nova role\n"
-#: createuser.c:364
+#: createuser.c:365
#, c-format
msgid " -r, --createrole role can create new roles\n"
msgstr " -r, --createrole role pode criar novas roles\n"
-#: createuser.c:365
+#: createuser.c:366
#, c-format
msgid " -R, --no-createrole role cannot create roles (default)\n"
msgstr " -R, --no-createrole role não pode criar novas roles (padrão)\n"
-#: createuser.c:366
+#: createuser.c:367
#, c-format
msgid " -s, --superuser role will be superuser\n"
msgstr " -s, --superuser role será super-usuário\n"
-#: createuser.c:367
+#: createuser.c:368
#, c-format
msgid " -S, --no-superuser role will not be superuser (default)\n"
msgstr " -S, --no-superuser role não será super-usuário (padrão)\n"
-#: createuser.c:369
+#: createuser.c:370
#, c-format
msgid ""
" --interactive prompt for missing role name and attributes rather\n"
@@ -608,17 +636,17 @@ msgstr ""
" --interactive pergunta pelo nome e atributos não informados da role\n"
" ao invés de utilizar o padrão\n"
-#: createuser.c:371
+#: createuser.c:372
#, c-format
msgid " --replication role can initiate replication\n"
msgstr " --replication role pode iniciar replicação\n"
-#: createuser.c:372
+#: createuser.c:373
#, c-format
msgid " --no-replication role cannot initiate replication\n"
msgstr " --no-replication role não pode iniciar replicação\n"
-#: createuser.c:377
+#: createuser.c:378
#, c-format
msgid " -U, --username=USERNAME user name to connect as (not the one to create)\n"
msgstr " -U, --username=USUÁRIO nome do usuário para se conectar (não é o usuário a ser criado)\n"
@@ -826,77 +854,77 @@ msgstr " -t, --timeout=SEGS segundos a esperar ao tentar conexão, 0 desa
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USUÁRIO nome do usuário para se conectar\n"
-#: reindexdb.c:159
+#: reindexdb.c:160
#, c-format
msgid "%s: cannot reindex all databases and a specific one at the same time\n"
msgstr "%s: não pode reindexar todos os bancos de dados e um específico ao mesmo tempo\n"
-#: reindexdb.c:164
+#: reindexdb.c:165
#, c-format
msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
msgstr "%s: não pode reindexar todos os bancos de dados e os catálogos do sistema ao mesmo tempo\n"
-#: reindexdb.c:169
+#: reindexdb.c:170
#, c-format
msgid "%s: cannot reindex specific schema(s) in all databases\n"
msgstr "%s: não pode reindexar esquema(s) específico(s) em todos os bancos de dados\n"
-#: reindexdb.c:174
+#: reindexdb.c:175
#, c-format
msgid "%s: cannot reindex specific table(s) in all databases\n"
msgstr "%s: não pode reindexar tabela(s) específica(s) em todos os bancos de dados\n"
-#: reindexdb.c:179
+#: reindexdb.c:180
#, c-format
msgid "%s: cannot reindex specific index(es) in all databases\n"
msgstr "%s: não pode reindexar índice(s) específico(s) em todos os bancos de dados\n"
-#: reindexdb.c:190
+#: reindexdb.c:191
#, c-format
msgid "%s: cannot reindex specific schema(s) and system catalogs at the same time\n"
msgstr "%s: não pode reindexar esquema(s) específico(s) e os catálogos do sistema ao mesmo tempo\n"
-#: reindexdb.c:195
+#: reindexdb.c:196
#, c-format
msgid "%s: cannot reindex specific table(s) and system catalogs at the same time\n"
msgstr "%s: não pode reindexar tabela(s) específica(s) e os catálogos do sistema ao mesmo tempo\n"
-#: reindexdb.c:200
+#: reindexdb.c:201
#, c-format
msgid "%s: cannot reindex specific index(es) and system catalogs at the same time\n"
msgstr "%s: não pode reindexar índice(s) específico(s) e os catálogos do sistema ao mesmo tempo\n"
-#: reindexdb.c:306
+#: reindexdb.c:307
#, c-format
msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
msgstr "%s: reindexação da tabela \"%s\" no banco de dados \"%s\" falhou: %s"
-#: reindexdb.c:309
+#: reindexdb.c:310
#, c-format
msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
msgstr "%s: reindexação do índice \"%s\" no banco de dados \"%s\" falhou: %s"
-#: reindexdb.c:312
+#: reindexdb.c:313
#, c-format
msgid "%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"
msgstr "%s: reindexação do esquema \"%s\" no banco de dados \"%s\" falhou: %s"
-#: reindexdb.c:315
+#: reindexdb.c:316
#, c-format
msgid "%s: reindexing of database \"%s\" failed: %s"
msgstr "%s: reindexação do banco de dados \"%s\" falhou: %s"
-#: reindexdb.c:346
+#: reindexdb.c:347
#, c-format
msgid "%s: reindexing database \"%s\"\n"
msgstr "%s: reindexando banco de dados \"%s\"\n"
-#: reindexdb.c:379
+#: reindexdb.c:380
#, c-format
msgid "%s: reindexing of system catalogs failed: %s"
msgstr "%s: reindexação dos catálogos do sistema falhou: %s"
-#: reindexdb.c:391
+#: reindexdb.c:392
#, c-format
msgid ""
"%s reindexes a PostgreSQL database.\n"
@@ -905,37 +933,37 @@ msgstr ""
"%s reindexa um banco de dados PostgreSQL.\n"
"\n"
-#: reindexdb.c:395
+#: reindexdb.c:396
#, c-format
msgid " -a, --all reindex all databases\n"
msgstr " -a, --all reindexa todos os bancos de dados\n"
-#: reindexdb.c:396
+#: reindexdb.c:397
#, c-format
msgid " -d, --dbname=DBNAME database to reindex\n"
msgstr " -d, --dbname=NOMEBD banco de dados a ser reindexado\n"
-#: reindexdb.c:398
+#: reindexdb.c:399
#, c-format
msgid " -i, --index=INDEX recreate specific index(es) only\n"
msgstr " -i, --index=ÍNDICE reindexa somente índice(s) especificado(s)\n"
-#: reindexdb.c:400
+#: reindexdb.c:401
#, c-format
msgid " -s, --system reindex system catalogs\n"
msgstr " -s, --system reindexa os catálogos do sistema\n"
-#: reindexdb.c:401
+#: reindexdb.c:402
#, c-format
msgid " -S, --schema=SCHEMA reindex specific schema(s) only\n"
msgstr " -S, --schema=ESQUEMA reindexa somente esquema(s) especificado(s)\n"
-#: reindexdb.c:402
+#: reindexdb.c:403
#, c-format
msgid " -t, --table=TABLE reindex specific table(s) only\n"
msgstr " -t, --table=TABELA reindexa somente tabela(s) especificada(s)\n"
-#: reindexdb.c:413
+#: reindexdb.c:414
#, c-format
msgid ""
"\n"
@@ -944,64 +972,70 @@ msgstr ""
"\n"
"Leia a descrição do comando SQL REINDEX para obter detalhes.\n"
-#: vacuumdb.c:190
+#: vacuumdb.c:191
#, c-format
msgid "%s: number of parallel jobs must be at least 1\n"
msgstr "%s: número de tarefas paralelas deve ser pelo menos 1\n"
-#: vacuumdb.c:196
+#: vacuumdb.c:197
#, c-format
msgid "%s: too many parallel jobs requested (maximum: %d)\n"
msgstr "%s: muitas tarefas paralelas solicitadas (máximo: %d)\n"
-#: vacuumdb.c:235 vacuumdb.c:241
+#: vacuumdb.c:236 vacuumdb.c:242
#, c-format
msgid "%s: cannot use the \"%s\" option when performing only analyze\n"
msgstr "%s: não pode utilizar a opção \"%s\" ao executar somente análise\n"
-#: vacuumdb.c:258
+#: vacuumdb.c:259
#, c-format
msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
msgstr "%s: não pode limpar todos os bancos de dados e um específico ao mesmo tempo\n"
-#: vacuumdb.c:264
+#: vacuumdb.c:265
#, c-format
msgid "%s: cannot vacuum specific table(s) in all databases\n"
msgstr "%s: não pode limpar tabela(s) específica(s) em todos os bancos de dados\n"
-#: vacuumdb.c:350
+#: vacuumdb.c:351
msgid "Generating minimal optimizer statistics (1 target)"
msgstr "Gerando estatísticas mínimas para otimizador (1 alvo)"
-#: vacuumdb.c:351
+#: vacuumdb.c:352
msgid "Generating medium optimizer statistics (10 targets)"
msgstr "Gerando estatísticas parciais para otimizador (10 alvos)"
-#: vacuumdb.c:352
+#: vacuumdb.c:353
msgid "Generating default (full) optimizer statistics"
msgstr "Gerando estatísticas padrão (completa) para otimizador"
-#: vacuumdb.c:361
+#: vacuumdb.c:362
#, c-format
msgid "%s: processing database \"%s\": %s\n"
msgstr "%s: processando banco de dados \"%s\": %s\n"
-#: vacuumdb.c:364
+#: vacuumdb.c:365
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: limpando banco de dados \"%s\"\n"
-#: vacuumdb.c:694
+#: vacuumdb.c:695
#, c-format
msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
msgstr "%s: limpeza na tabela \"%s\" no banco de dados \"%s\" falhou: %s"
-#: vacuumdb.c:697 vacuumdb.c:814
+#: vacuumdb.c:698 vacuumdb.c:815
#, c-format
msgid "%s: vacuuming of database \"%s\" failed: %s"
msgstr "%s: limpeza no banco de dados \"%s\" falhou: %s"
-#: vacuumdb.c:930
+#: vacuumdb.c:929
+#, fuzzy, c-format
+#| msgid "%s: invalid argument: %s\n"
+msgid "%s: invalid socket: %s"
+msgstr "%s: argumento inválido: %s\n"
+
+#: vacuumdb.c:938
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -1010,67 +1044,67 @@ msgstr ""
"%s limpa e analisa um banco de dados PostgreSQL.\n"
"\n"
-#: vacuumdb.c:934
+#: vacuumdb.c:942
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all limpa todos bancos de dados\n"
-#: vacuumdb.c:935
+#: vacuumdb.c:943
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=NOMEBD banco de dados a ser limpo\n"
-#: vacuumdb.c:936
+#: vacuumdb.c:944
#, c-format
msgid " -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo mostra os comandos enviados ao servidor\n"
-#: vacuumdb.c:937
+#: vacuumdb.c:945
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full faz uma limpeza completa\n"
-#: vacuumdb.c:938
+#: vacuumdb.c:946
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr " -F, --freeze congela informação sobre transação de registros\n"
-#: vacuumdb.c:939
+#: vacuumdb.c:947
#, c-format
msgid " -j, --jobs=NUM use this many concurrent connections to vacuum\n"
msgstr " -j, --jobs=NUM use esse número de conexões concorrentes para limpar\n"
-#: vacuumdb.c:940
+#: vacuumdb.c:948
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet não exibe nenhuma mensagem\n"
-#: vacuumdb.c:941
+#: vacuumdb.c:949
#, c-format
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr " -t, --table='TABELA[(COLUNAS)]' limpa somente tabela(s) específica(s)\n"
-#: vacuumdb.c:942
+#: vacuumdb.c:950
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose mostra muitas mensagens\n"
-#: vacuumdb.c:943
+#: vacuumdb.c:951
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version mostra informação sobre a versão e termina\n"
-#: vacuumdb.c:944
+#: vacuumdb.c:952
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr " -z, --analyze atualiza estatísticas do otimizador\n"
-#: vacuumdb.c:945
+#: vacuumdb.c:953
#, c-format
msgid " -Z, --analyze-only only update optimizer statistics; no vacuum\n"
msgstr " -Z, --analyze-only atualiza somente estatísticas do otimizador; sem limpeza\n"
-#: vacuumdb.c:946
+#: vacuumdb.c:954
#, c-format
msgid ""
" --analyze-in-stages only update optimizer statistics, in multiple\n"
@@ -1079,12 +1113,12 @@ msgstr ""
" --analyze-in-stages atualiza somente estatísticas do otimizador, em\n"
" múltiplos estágios para resultados mais rápidos; sem limpeza\n"
-#: vacuumdb.c:948
+#: vacuumdb.c:956
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help mostra essa ajuda e termina\n"
-#: vacuumdb.c:956
+#: vacuumdb.c:964
#, c-format
msgid ""
"\n"
diff --git a/src/bin/scripts/po/ru.po b/src/bin/scripts/po/ru.po
index 835cb99e076..ff2e69619b4 100644
--- a/src/bin/scripts/po/ru.po
+++ b/src/bin/scripts/po/ru.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9 current\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-12-08 22:43+0000\n"
+"POT-Creation-Date: 2016-05-27 16:14+0000\n"
"PO-Revision-Date: 2015-12-09 13:40+0300\n"
"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
@@ -62,18 +62,50 @@ msgstr "пользователь не существует"
msgid "user name lookup failure: error code %lu"
msgstr "распознать имя пользователя не удалось (код ошибки: %lu)"
+#: ../../fe_utils/print.c:354
+#, c-format
+msgid "(%lu row)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(%lu строка)"
+msgstr[1] "(%lu строки)"
+msgstr[2] "(%lu строк)"
+
+#: ../../fe_utils/print.c:2906
+#, c-format
+msgid "Interrupted\n"
+msgstr "Прерывание\n"
+
+#: ../../fe_utils/print.c:2970
+#, c-format
+msgid "Cannot add header to table content: column count of %d exceeded.\n"
+msgstr ""
+"Добавить заголовок к содержимому таблицы нельзя: число столбцов превышает "
+"%d.\n"
+
+#: ../../fe_utils/print.c:3010
+#, c-format
+msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
+msgstr ""
+"Добавить ячейку к содержимому таблицы нельзя: общее число ячеек превышает "
+"%d.\n"
+
+#: ../../fe_utils/print.c:3259
+#, c-format
+msgid "invalid output format (internal error): %d"
+msgstr "неверный формат вывода (внутренняя ошибка): %d"
+
#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
-#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
-#: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
+#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:169
+#: createuser.c:184 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
#: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
-#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:130 reindexdb.c:149
+#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:131 reindexdb.c:150
#: vacuumdb.c:209 vacuumdb.c:228
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
-#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
-#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:147
+#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:182
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:148
#: vacuumdb.c:226
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
@@ -113,21 +145,21 @@ msgstr ""
"%s упорядочивает данные всех кластеризованных таблиц в базе данных.\n"
"\n"
-#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
-#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:392
-#: vacuumdb.c:975
+#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:349
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:393
+#: vacuumdb.c:939
#, c-format
msgid "Usage:\n"
msgstr "Использование:\n"
-#: clusterdb.c:263 reindexdb.c:393 vacuumdb.c:976
+#: clusterdb.c:263 reindexdb.c:394 vacuumdb.c:940
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [ПАРАМЕТР]... [ИМЯ_БД]\n"
-#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
-#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:394
-#: vacuumdb.c:977
+#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:351
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:395
+#: vacuumdb.c:941
#, c-format
msgid ""
"\n"
@@ -146,14 +178,14 @@ msgstr " -a, --all кластеризовать все базы
msgid " -d, --dbname=DBNAME database to cluster\n"
msgstr " -d, --dbname=ИМЯ_БД имя базы данных для кластеризации\n"
-#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
-#: droplang.c:241 dropuser.c:159 reindexdb.c:397
+#: clusterdb.c:267 createlang.c:240 createuser.c:355 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:398
#, c-format
msgid ""
" -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo отображать команды, отправляемые серверу\n"
-#: clusterdb.c:268 reindexdb.c:399
+#: clusterdb.c:268 reindexdb.c:400
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet не выводить никакие сообщения\n"
@@ -164,26 +196,26 @@ msgid " -t, --table=TABLE cluster specific table(s) only\n"
msgstr ""
" -t, --table=ТАБЛИЦА кластеризовать только указанную таблицу(ы)\n"
-#: clusterdb.c:270 reindexdb.c:403
+#: clusterdb.c:270 reindexdb.c:404
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose выводить исчерпывающие сообщения\n"
-#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
-#: droplang.c:243 dropuser.c:162 reindexdb.c:404
+#: clusterdb.c:271 createlang.c:242 createuser.c:369 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:405
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version показать версию и выйти\n"
-#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
-#: droplang.c:244 dropuser.c:164 reindexdb.c:405
+#: clusterdb.c:272 createlang.c:243 createuser.c:374 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:406
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help показать эту справку и выйти\n"
-#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
-#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:406
-#: vacuumdb.c:993
+#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:375
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:407
+#: vacuumdb.c:957
#, c-format
msgid ""
"\n"
@@ -192,39 +224,39 @@ msgstr ""
"\n"
"Параметры подключения:\n"
-#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:407 vacuumdb.c:994
+#: clusterdb.c:274 createlang.c:245 createuser.c:376 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:408 vacuumdb.c:958
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr ""
" -h, --host=ИМЯ имя сервера баз данных или каталог сокетов\n"
-#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:995
+#: clusterdb.c:275 createlang.c:246 createuser.c:377 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:409 vacuumdb.c:959
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=ПОРТ порт сервера баз данных\n"
-#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:409 vacuumdb.c:996
+#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248 reindexdb.c:410
+#: vacuumdb.c:960
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr ""
" -U, --username=ИМЯ имя пользователя для подключения к серверу\n"
-#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:997
+#: clusterdb.c:277 createlang.c:248 createuser.c:379 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:411 vacuumdb.c:961
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password не запрашивать пароль\n"
-#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:998
+#: clusterdb.c:278 createlang.c:249 createuser.c:380 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:412 vacuumdb.c:962
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password запросить пароль\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:999
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:413 vacuumdb.c:963
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=ИМЯ_БД выбор другой обслуживаемой базы данных\n"
@@ -238,9 +270,9 @@ msgstr ""
"\n"
"Подробнее о кластеризации вы можете узнать в описании SQL-команды CLUSTER.\n"
-#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
-#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:414
-#: vacuumdb.c:1001
+#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:381
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:415
+#: vacuumdb.c:965
#, c-format
msgid ""
"\n"
@@ -249,58 +281,58 @@ msgstr ""
"\n"
"Об ошибках сообщайте по адресу <pgsql-bugs@postgresql.org>.\n"
-#: common.c:73 common.c:123
+#: common.c:82 common.c:128
msgid "Password: "
msgstr "Пароль: "
-#: common.c:105
+#: common.c:113
#, c-format
msgid "%s: could not connect to database %s: out of memory\n"
msgstr "%s: не удалось подключиться к базе %s (нехватка памяти)\n"
-#: common.c:139
+#: common.c:141
#, c-format
msgid "%s: could not connect to database %s: %s"
msgstr "%s: не удалось подключиться к базе %s: %s"
-#: common.c:188 common.c:216
+#: common.c:190 common.c:218
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: ошибка при выполнении запроса: %s"
-#: common.c:190 common.c:218
+#: common.c:192 common.c:220
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: запрос: %s\n"
#. translator: abbreviation for "yes"
-#: common.c:259
+#: common.c:261
msgid "y"
msgstr "y"
#. translator: abbreviation for "no"
-#: common.c:261
+#: common.c:263
msgid "n"
msgstr "n"
#. translator: This is a question followed by the translated options for
#. "yes" and "no".
-#: common.c:271
+#: common.c:273
#, c-format
msgid "%s (%s/%s) "
msgstr "%s (%s - да/%s - нет) "
-#: common.c:292
+#: common.c:294
#, c-format
msgid "Please answer \"%s\" or \"%s\".\n"
msgstr "Пожалуйста, введите \"%s\" или \"%s\".\n"
-#: common.c:371 common.c:408
+#: common.c:373 common.c:410
#, c-format
msgid "Cancel request sent\n"
msgstr "Сигнал отмены отправлен\n"
-#: common.c:374 common.c:412
+#: common.c:376 common.c:414
#, c-format
msgid "Could not send cancel request: %s"
msgstr "Отправить сигнал отмены не удалось: %s"
@@ -502,46 +534,46 @@ msgid ""
" -l, --list show a list of currently installed languages\n"
msgstr " -l, --list показать список установленных языков\n"
-#: createuser.c:190
+#: createuser.c:191
msgid "Enter name of role to add: "
msgstr "Введите имя новой роли: "
-#: createuser.c:205
+#: createuser.c:206
msgid "Enter password for new role: "
msgstr "Введите пароль для новой роли: "
-#: createuser.c:206
+#: createuser.c:207
msgid "Enter it again: "
msgstr "Повторите его: "
-#: createuser.c:209
+#: createuser.c:210
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Пароли не совпадают.\n"
-#: createuser.c:218
+#: createuser.c:219
msgid "Shall the new role be a superuser?"
msgstr "Должна ли новая роль иметь полномочия суперпользователя?"
-#: createuser.c:233
+#: createuser.c:234
msgid "Shall the new role be allowed to create databases?"
msgstr "Новая роль должна иметь право создавать базы данных?"
-#: createuser.c:241
+#: createuser.c:242
msgid "Shall the new role be allowed to create more new roles?"
msgstr "Новая роль должна иметь право создавать другие роли?"
-#: createuser.c:275
+#: createuser.c:276
#, c-format
msgid "Password encryption failed.\n"
msgstr "Ошибка при шифровании пароля.\n"
-#: createuser.c:332
+#: createuser.c:333
#, c-format
msgid "%s: creation of new role failed: %s"
msgstr "%s: создать роль не удалось: %s"
-#: createuser.c:347
+#: createuser.c:348
#, c-format
msgid ""
"%s creates a new PostgreSQL role.\n"
@@ -550,12 +582,12 @@ msgstr ""
"%s создаёт роль пользователя PostgreSQL.\n"
"\n"
-#: createuser.c:349 dropuser.c:157
+#: createuser.c:350 dropuser.c:157
#, c-format
msgid " %s [OPTION]... [ROLENAME]\n"
msgstr " %s [ПАРАМЕТР]... [ИМЯ_РОЛИ]\n"
-#: createuser.c:351
+#: createuser.c:352
#, c-format
msgid ""
" -c, --connection-limit=N connection limit for role (default: no limit)\n"
@@ -563,29 +595,29 @@ msgstr ""
" -c, --connection-limit=N предел подключений для роли\n"
" (по умолчанию предела нет)\n"
-#: createuser.c:352
+#: createuser.c:353
#, c-format
msgid " -d, --createdb role can create new databases\n"
msgstr " -d, --createdb роль с правом создания баз данных\n"
-#: createuser.c:353
+#: createuser.c:354
#, c-format
msgid " -D, --no-createdb role cannot create databases (default)\n"
msgstr ""
" -D, --no-createdb роль без права создания баз данных (по "
"умолчанию)\n"
-#: createuser.c:355
+#: createuser.c:356
#, c-format
msgid " -E, --encrypted encrypt stored password\n"
msgstr " -E, --encrypted зашифровать сохранённый пароль\n"
-#: createuser.c:356
+#: createuser.c:357
#, c-format
msgid " -g, --role=ROLE new role will be a member of this role\n"
msgstr " -g, --role=РОЛЬ новая роль будет включена в эту роль\n"
-#: createuser.c:357
+#: createuser.c:358
#, c-format
msgid ""
" -i, --inherit role inherits privileges of roles it is a\n"
@@ -595,57 +627,57 @@ msgstr ""
"она\n"
" включена (по умолчанию)\n"
-#: createuser.c:359
+#: createuser.c:360
#, c-format
msgid " -I, --no-inherit role does not inherit privileges\n"
msgstr " -I, --no-inherit роль не наследует права\n"
-#: createuser.c:360
+#: createuser.c:361
#, c-format
msgid " -l, --login role can login (default)\n"
msgstr ""
" -l, --login роль с правом подключения к серверу (по "
"умолчанию)\n"
-#: createuser.c:361
+#: createuser.c:362
#, c-format
msgid " -L, --no-login role cannot login\n"
msgstr " -L, --no-login роль без права подключения\n"
-#: createuser.c:362
+#: createuser.c:363
#, c-format
msgid " -N, --unencrypted do not encrypt stored password\n"
msgstr " -N, --unencrypted не шифровать сохранённый пароль\n"
-#: createuser.c:363
+#: createuser.c:364
#, c-format
msgid " -P, --pwprompt assign a password to new role\n"
msgstr " -P, --pwprompt назначить пароль новой роли\n"
-#: createuser.c:364
+#: createuser.c:365
#, c-format
msgid " -r, --createrole role can create new roles\n"
msgstr " -r, --createrole роль с правом создания других ролей\n"
-#: createuser.c:365
+#: createuser.c:366
#, c-format
msgid " -R, --no-createrole role cannot create roles (default)\n"
msgstr ""
" -R, --no-createrole роль без права создания ролей (по умолчанию)\n"
-#: createuser.c:366
+#: createuser.c:367
#, c-format
msgid " -s, --superuser role will be superuser\n"
msgstr " -s, --superuser роль с полномочиями суперпользователя\n"
-#: createuser.c:367
+#: createuser.c:368
#, c-format
msgid " -S, --no-superuser role will not be superuser (default)\n"
msgstr ""
" -S, --no-superuser роль без полномочий суперпользователя (по "
"умолчанию)\n"
-#: createuser.c:369
+#: createuser.c:370
#, c-format
msgid ""
" --interactive prompt for missing role name and attributes "
@@ -655,17 +687,17 @@ msgstr ""
" --interactive запрашивать отсутствующие атрибуты и имя роли,\n"
" а не использовать значения по умолчанию\n"
-#: createuser.c:371
+#: createuser.c:372
#, c-format
msgid " --replication role can initiate replication\n"
msgstr " --replication роль может инициировать репликацию\n"
-#: createuser.c:372
+#: createuser.c:373
#, c-format
msgid " --no-replication role cannot initiate replication\n"
msgstr " --no-replication роль не может инициировать репликацию\n"
-#: createuser.c:377
+#: createuser.c:378
#, c-format
msgid ""
" -U, --username=USERNAME user name to connect as (not the one to create)\n"
@@ -890,35 +922,35 @@ msgid " -U, --username=USERNAME user name to connect as\n"
msgstr ""
" -U, --username=ИМЯ имя пользователя для подключения к серверу\n"
-#: reindexdb.c:159
+#: reindexdb.c:160
#, c-format
msgid "%s: cannot reindex all databases and a specific one at the same time\n"
msgstr ""
"%s: нельзя переиндексировать все базы данных и одну конкретную одновременно\n"
-#: reindexdb.c:164
+#: reindexdb.c:165
#, c-format
msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
msgstr ""
"%s: нельзя переиндексировать все базы данных и системные каталоги "
"одновременно\n"
-#: reindexdb.c:169
+#: reindexdb.c:170
#, c-format
msgid "%s: cannot reindex specific schema(s) in all databases\n"
msgstr "%s: нельзя переиндексировать указанную схему(ы) во всех базах\n"
-#: reindexdb.c:174
+#: reindexdb.c:175
#, c-format
msgid "%s: cannot reindex specific table(s) in all databases\n"
msgstr "%s: нельзя переиндексировать указанную таблицу(ы) во всех базах\n"
-#: reindexdb.c:179
+#: reindexdb.c:180
#, c-format
msgid "%s: cannot reindex specific index(es) in all databases\n"
msgstr "%s: нельзя переиндексировать указанный индекс(ы) во всех базах\n"
-#: reindexdb.c:190
+#: reindexdb.c:191
#, c-format
msgid ""
"%s: cannot reindex specific schema(s) and system catalogs at the same time\n"
@@ -926,7 +958,7 @@ msgstr ""
"%s: нельзя переиндексировать указанную схему(ы) и системные каталоги "
"одновременно\n"
-#: reindexdb.c:195
+#: reindexdb.c:196
#, c-format
msgid ""
"%s: cannot reindex specific table(s) and system catalogs at the same time\n"
@@ -934,7 +966,7 @@ msgstr ""
"%s: нельзя переиндексировать указанную таблицу(ы) и системные каталоги "
"одновременно\n"
-#: reindexdb.c:200
+#: reindexdb.c:201
#, c-format
msgid ""
"%s: cannot reindex specific index(es) and system catalogs at the same time\n"
@@ -942,37 +974,37 @@ msgstr ""
"%s: нельзя переиндексировать указанный индекс(ы) и системные каталоги "
"одновременно\n"
-#: reindexdb.c:306
+#: reindexdb.c:307
#, c-format
msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
msgstr "%s: переиндексировать таблицу \"%s\" в базе \"%s\" не удалось: %s"
-#: reindexdb.c:309
+#: reindexdb.c:310
#, c-format
msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
msgstr "%s: переиндексировать индекс \"%s\" в базе \"%s\" не удалось: %s"
-#: reindexdb.c:312
+#: reindexdb.c:313
#, c-format
msgid "%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"
msgstr "%s: переиндексировать схему \"%s\" в базе \"%s\" не удалось: %s"
-#: reindexdb.c:315
+#: reindexdb.c:316
#, c-format
msgid "%s: reindexing of database \"%s\" failed: %s"
msgstr "%s: переиндексировать базу данных \"%s\" не удалось: %s"
-#: reindexdb.c:346
+#: reindexdb.c:347
#, c-format
msgid "%s: reindexing database \"%s\"\n"
msgstr "%s: переиндексация базы данных \"%s\"\n"
-#: reindexdb.c:379
+#: reindexdb.c:380
#, c-format
msgid "%s: reindexing of system catalogs failed: %s"
msgstr "%s: переиндексировать системные каталоги не удалось: %s"
-#: reindexdb.c:391
+#: reindexdb.c:392
#, c-format
msgid ""
"%s reindexes a PostgreSQL database.\n"
@@ -981,39 +1013,39 @@ msgstr ""
"%s переиндексирует базу данных PostgreSQL.\n"
"\n"
-#: reindexdb.c:395
+#: reindexdb.c:396
#, c-format
msgid " -a, --all reindex all databases\n"
msgstr " -a, --all переиндексировать все базы данных\n"
-#: reindexdb.c:396
+#: reindexdb.c:397
#, c-format
msgid " -d, --dbname=DBNAME database to reindex\n"
msgstr " -d, --dbname=БД имя базы для переиндексации\n"
-#: reindexdb.c:398
+#: reindexdb.c:399
#, c-format
msgid " -i, --index=INDEX recreate specific index(es) only\n"
msgstr " -i, --index=ИНДЕКС пересоздать только указанный индекс(ы)\n"
-#: reindexdb.c:400
+#: reindexdb.c:401
#, c-format
msgid " -s, --system reindex system catalogs\n"
msgstr " -s, --system переиндексировать системные каталоги\n"
-#: reindexdb.c:401
+#: reindexdb.c:402
#, c-format
msgid " -S, --schema=SCHEMA reindex specific schema(s) only\n"
msgstr ""
" -S, --schema=СХЕМА переиндексировать только указанную схему(ы)\n"
-#: reindexdb.c:402
+#: reindexdb.c:403
#, c-format
msgid " -t, --table=TABLE reindex specific table(s) only\n"
msgstr ""
" -t, --table=ТАБЛИЦА переиндексировать только указанную таблицу(ы)\n"
-#: reindexdb.c:413
+#: reindexdb.c:414
#, c-format
msgid ""
"\n"
@@ -1048,39 +1080,44 @@ msgstr "%s: нельзя очистить все базы данных и одн
msgid "%s: cannot vacuum specific table(s) in all databases\n"
msgstr "%s: нельзя очистить одну указанную таблицу(ы) во всех базах\n"
-#: vacuumdb.c:363
+#: vacuumdb.c:351
msgid "Generating minimal optimizer statistics (1 target)"
msgstr "Вычисление минимальной статистики для оптимизатора (1 запись)"
-#: vacuumdb.c:364
+#: vacuumdb.c:352
msgid "Generating medium optimizer statistics (10 targets)"
msgstr "Вычисление средней статистики для оптимизатора (10 записей)"
-#: vacuumdb.c:365
+#: vacuumdb.c:353
msgid "Generating default (full) optimizer statistics"
msgstr "Вычисление стандартной (полной) статистики для оптимизатора"
-#: vacuumdb.c:374
+#: vacuumdb.c:362
#, c-format
msgid "%s: processing database \"%s\": %s\n"
msgstr "%s: обработка базы данных \"%s\": %s\n"
-#: vacuumdb.c:377
+#: vacuumdb.c:365
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: очистка базы данных \"%s\"\n"
-#: vacuumdb.c:738
+#: vacuumdb.c:695
#, c-format
msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
msgstr "%s: очистить таблицу \"%s\" в базе \"%s\" не удалось: %s"
-#: vacuumdb.c:741 vacuumdb.c:858
+#: vacuumdb.c:698 vacuumdb.c:815
#, c-format
msgid "%s: vacuuming of database \"%s\" failed: %s"
msgstr "%s: очистить базу данных \"%s\" не удалось: %s"
-#: vacuumdb.c:974
+#: vacuumdb.c:929
+#, c-format
+msgid "%s: invalid socket: %s"
+msgstr "%s: неверный сокет: %s"
+
+#: vacuumdb.c:938
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -1089,17 +1126,17 @@ msgstr ""
"%s очищает и анализирует базу данных PostgreSQL.\n"
"\n"
-#: vacuumdb.c:978
+#: vacuumdb.c:942
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all очистить все базы данных\n"
-#: vacuumdb.c:979
+#: vacuumdb.c:943
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=ИМЯ_БД очистить указанную базу данных\n"
-#: vacuumdb.c:980
+#: vacuumdb.c:944
#, c-format
msgid ""
" -e, --echo show the commands being sent to the "
@@ -1107,19 +1144,19 @@ msgid ""
msgstr ""
" -e, --echo отображать команды, отправляемые серверу\n"
-#: vacuumdb.c:981
+#: vacuumdb.c:945
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full произвести полную очистку\n"
-#: vacuumdb.c:982
+#: vacuumdb.c:946
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr ""
" -F, --freeze заморозить информацию о транзакциях в "
"строках\n"
-#: vacuumdb.c:983
+#: vacuumdb.c:947
#, c-format
msgid ""
" -j, --jobs=NUM use this many concurrent connections to "
@@ -1128,34 +1165,34 @@ msgstr ""
" -j, --jobs=ЧИСЛО запускать для очистки заданное число "
"заданий\n"
-#: vacuumdb.c:984
+#: vacuumdb.c:948
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet не выводить сообщения\n"
-#: vacuumdb.c:985
+#: vacuumdb.c:949
#, c-format
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr ""
" -t, --table='ТАБЛ[(СТОЛБЦЫ)]' очистить только указанную таблицу(ы)\n"
-#: vacuumdb.c:986
+#: vacuumdb.c:950
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose выводить исчерпывающие сообщения\n"
-#: vacuumdb.c:987
+#: vacuumdb.c:951
#, c-format
msgid ""
" -V, --version output version information, then exit\n"
msgstr " -V, --version показать версию и выйти\n"
-#: vacuumdb.c:988
+#: vacuumdb.c:952
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr " -z, --analyze обновить статистику оптимизатора\n"
-#: vacuumdb.c:989
+#: vacuumdb.c:953
#, c-format
msgid ""
" -Z, --analyze-only only update optimizer statistics; no "
@@ -1164,7 +1201,7 @@ msgstr ""
" -Z, --analyze-only только обновить статистику оптимизатора,\n"
" не очищать БД\n"
-#: vacuumdb.c:990
+#: vacuumdb.c:954
#, c-format
msgid ""
" --analyze-in-stages only update optimizer statistics, in "
@@ -1176,12 +1213,12 @@ msgstr ""
" (в несколько проходов для большей "
"скорости), без очистки\n"
-#: vacuumdb.c:992
+#: vacuumdb.c:956
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help показать эту справку и выйти\n"
-#: vacuumdb.c:1000
+#: vacuumdb.c:964
#, c-format
msgid ""
"\n"
diff --git a/src/bin/scripts/po/sv.po b/src/bin/scripts/po/sv.po
index 5308219d251..bfe54b91be0 100644
--- a/src/bin/scripts/po/sv.po
+++ b/src/bin/scripts/po/sv.po
@@ -5,24 +5,25 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.6\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-11-28 12:42+0000\n"
-"PO-Revision-Date: 2014-11-28 16:40+0100\n"
+"POT-Creation-Date: 2016-06-06 22:14+0000\n"
+"PO-Revision-Date: 2016-06-07 06:54-0400\n"
"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
#, c-format
msgid "out of memory\n"
msgstr "slut på minne\n"
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
#, c-format
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "kan inte duplicera null-pekare (internt fel)\n"
@@ -36,24 +37,52 @@ msgstr "kunde inte slå upp effektivt användar-id %ld: %s"
msgid "user does not exist"
msgstr "användaren finns inte"
-#: ../../common/username.c:61
-#, c-format
-msgid "user name lookup failure: %s"
+#: ../../common/username.c:62
+#, fuzzy, c-format
+#| msgid "user name lookup failure: %s"
+msgid "user name lookup failure: error code %lu"
msgstr "misslyckad sökning efter användarnamn: %s"
+#: ../../fe_utils/print.c:354
+#, c-format
+msgid "(%lu row)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(%lu rad)"
+msgstr[1] "(%lu rader)"
+
+#: ../../fe_utils/print.c:2906
+#, c-format
+msgid "Interrupted\n"
+msgstr "Avbruten\n"
+
+#: ../../fe_utils/print.c:2970
+#, c-format
+msgid "Cannot add header to table content: column count of %d exceeded.\n"
+msgstr ""
+
+#: ../../fe_utils/print.c:3010
+#, c-format
+msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
+msgstr ""
+
+#: ../../fe_utils/print.c:3259
+#, c-format
+msgid "invalid output format (internal error): %d"
+msgstr "ogiltigt utdataformat (internt fel): %d"
+
#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
-#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
-#: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
+#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:169
+#: createuser.c:184 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
#: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
-#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:120 reindexdb.c:139
-#: vacuumdb.c:139 vacuumdb.c:159
+#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:131 reindexdb.c:150
+#: vacuumdb.c:209 vacuumdb.c:228
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Försök med \"%s --help\" för mer information.\n"
-#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
-#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:137
-#: vacuumdb.c:157
+#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:182
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:148
+#: vacuumdb.c:226
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: För många kommandoradsargument. Först kommer \"%s\".\n"
@@ -92,21 +121,21 @@ msgstr ""
"%s klustrar alla tidigare klustrade tabeller i en databas.\n"
"\n"
-#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
-#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:342
-#: vacuumdb.c:425
+#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:349
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:393
+#: vacuumdb.c:939
#, c-format
msgid "Usage:\n"
msgstr "Användning:\n"
-#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:426
+#: clusterdb.c:263 reindexdb.c:394 vacuumdb.c:940
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [FLAGGA]... [DBNAMN]\n"
-#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
-#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:344
-#: vacuumdb.c:427
+#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:351
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:395
+#: vacuumdb.c:941
#, c-format
msgid ""
"\n"
@@ -125,13 +154,13 @@ msgstr " -a, --all klustra alla databaser\n"
msgid " -d, --dbname=DBNAME database to cluster\n"
msgstr " -d, --dbname=DBNAME databas att klustra\n"
-#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
-#: droplang.c:241 dropuser.c:159 reindexdb.c:347
+#: clusterdb.c:267 createlang.c:240 createuser.c:355 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:398
#, c-format
msgid " -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo visa kommandon som skickas till servern\n"
-#: clusterdb.c:268 reindexdb.c:349
+#: clusterdb.c:268 reindexdb.c:400
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet skriv inte ut några meddelanden\n"
@@ -141,26 +170,26 @@ msgstr " -q, --quiet skriv inte ut några meddelanden\n"
msgid " -t, --table=TABLE cluster specific table(s) only\n"
msgstr " -t, --table=TABELL klustra denna tabell (får upprepas)\n"
-#: clusterdb.c:270
+#: clusterdb.c:270 reindexdb.c:404
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose skriv massor med utdata\n"
-#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
-#: droplang.c:243 dropuser.c:162 reindexdb.c:352
+#: clusterdb.c:271 createlang.c:242 createuser.c:369 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:405
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
-#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
-#: droplang.c:244 dropuser.c:164 reindexdb.c:353
+#: clusterdb.c:272 createlang.c:243 createuser.c:374 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:406
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
-#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
-#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:354
-#: vacuumdb.c:442
+#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:375
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:407
+#: vacuumdb.c:957
#, c-format
msgid ""
"\n"
@@ -169,37 +198,37 @@ msgstr ""
"\n"
"Växlar för förbindelser:\n"
-#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:443
+#: clusterdb.c:274 createlang.c:245 createuser.c:376 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:408 vacuumdb.c:958
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=VÄRDNAMN databasens värdnamn eller filkatalog för uttag\n"
-#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:444
+#: clusterdb.c:275 createlang.c:246 createuser.c:377 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:409 vacuumdb.c:959
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORT databasens tjänsteport\n"
#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:357 vacuumdb.c:445
+#: reindexdb.c:410 vacuumdb.c:960
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=ANVÄNDARE användarnamn vid förbindelsen\n"
-#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:446
+#: clusterdb.c:277 createlang.c:248 createuser.c:379 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:411 vacuumdb.c:961
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password ingen efterfrågan av lösenord\n"
-#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:447
+#: clusterdb.c:278 createlang.c:249 createuser.c:380 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:412 vacuumdb.c:962
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password framtvinga fråga om lösenord\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:448
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:413 vacuumdb.c:963
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=DBNAMN annat val av underhållsdatabas\n"
@@ -213,9 +242,9 @@ msgstr ""
"\n"
"Läs beskrivningen av SQL-kommandot CLUSTER för detaljer.\n"
-#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
-#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:362
-#: vacuumdb.c:450
+#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:381
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:415
+#: vacuumdb.c:965
#, c-format
msgid ""
"\n"
@@ -224,58 +253,59 @@ msgstr ""
"\n"
"Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
-#: common.c:69 common.c:115
+#: common.c:82 common.c:128
msgid "Password: "
msgstr "Lösenord: "
-#: common.c:104
-#, c-format
-msgid "%s: could not connect to database %s\n"
+#: common.c:113
+#, fuzzy, c-format
+#| msgid "%s: could not connect to database %s\n"
+msgid "%s: could not connect to database %s: out of memory\n"
msgstr "%s: Kunde inte skapa förbindelse med databas %s.\n"
-#: common.c:131
+#: common.c:141
#, c-format
msgid "%s: could not connect to database %s: %s"
msgstr "%s: Kunde inte skapa förbindelse med databas %s: %s"
-#: common.c:180 common.c:208
+#: common.c:190 common.c:218
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: Fråga misslyckades: %s"
-#: common.c:182 common.c:210
+#: common.c:192 common.c:220
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: Frågan var: %s\n"
#. translator: abbreviation for "yes"
-#: common.c:251
+#: common.c:261
msgid "y"
msgstr "j"
#. translator: abbreviation for "no"
-#: common.c:253
+#: common.c:263
msgid "n"
msgstr "n"
#. translator: This is a question followed by the translated options for
#. "yes" and "no".
-#: common.c:263
+#: common.c:273
#, c-format
msgid "%s (%s/%s) "
msgstr "%s (%s/%s) "
-#: common.c:284
+#: common.c:294
#, c-format
msgid "Please answer \"%s\" or \"%s\".\n"
msgstr "Var vänlig att svara \"%s\" eller \"%s\".\n"
-#: common.c:362 common.c:395
+#: common.c:373 common.c:410
#, c-format
msgid "Cancel request sent\n"
msgstr "Avbrottsbegäran skickad.\n"
-#: common.c:364 common.c:397
+#: common.c:376 common.c:414
#, c-format
msgid "Could not send cancel request: %s"
msgstr "Kunde inte skicka avbrottsbegäran: %s"
@@ -467,46 +497,46 @@ msgstr " -d, --dbname=DBNAMN databas där språket installeras\n"
msgid " -l, --list show a list of currently installed languages\n"
msgstr " -l, --list lista alla nu installerade språk\n"
-#: createuser.c:190
+#: createuser.c:191
msgid "Enter name of role to add: "
msgstr "Giv namnet på den roll som skall läggas till: "
-#: createuser.c:205
+#: createuser.c:206
msgid "Enter password for new role: "
msgstr "Uppgiv lösenord för den nya rollen: "
-#: createuser.c:206
+#: createuser.c:207
msgid "Enter it again: "
msgstr "Uppgiv det igen: "
-#: createuser.c:209
+#: createuser.c:210
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Lösenorden stämmer inte överens.\n"
-#: createuser.c:218
+#: createuser.c:219
msgid "Shall the new role be a superuser?"
msgstr "Skall den nya rollen vara en superanvändare?"
-#: createuser.c:233
+#: createuser.c:234
msgid "Shall the new role be allowed to create databases?"
msgstr "Skall den nya rollen tillåtas skapa databaser?"
-#: createuser.c:241
+#: createuser.c:242
msgid "Shall the new role be allowed to create more new roles?"
msgstr "Skall den nya rollen tillåtas skapa fler nya roller?"
-#: createuser.c:275
+#: createuser.c:276
#, c-format
msgid "Password encryption failed.\n"
msgstr "Misslyckad lösenordskryptering.\n"
-#: createuser.c:332
+#: createuser.c:333
#, c-format
msgid "%s: creation of new role failed: %s"
msgstr "%s: Misslyckades med att skapa ny roll: %s"
-#: createuser.c:347
+#: createuser.c:348
#, c-format
msgid ""
"%s creates a new PostgreSQL role.\n"
@@ -515,37 +545,37 @@ msgstr ""
"%s skapar en ny roll för PostgreSQL.\n"
"\n"
-#: createuser.c:349 dropuser.c:157
+#: createuser.c:350 dropuser.c:157
#, c-format
msgid " %s [OPTION]... [ROLENAME]\n"
msgstr " %s [FLAGGA]... [ROLLNAMN]\n"
-#: createuser.c:351
+#: createuser.c:352
#, c-format
msgid " -c, --connection-limit=N connection limit for role (default: no limit)\n"
msgstr " -c, --connection-limit=N anslutningstak för rollen (standard: ingen gräns)\n"
-#: createuser.c:352
+#: createuser.c:353
#, c-format
msgid " -d, --createdb role can create new databases\n"
msgstr " -d, --createdb rollen kan skapa nya databaser\n"
-#: createuser.c:353
+#: createuser.c:354
#, c-format
msgid " -D, --no-createdb role cannot create databases (default)\n"
msgstr " -D, --no-createdb rollen kan inte skapa databaser (standard)\n"
-#: createuser.c:355
+#: createuser.c:356
#, c-format
msgid " -E, --encrypted encrypt stored password\n"
msgstr " -E, --encrypted lösenordet skall sparas krypterat\n"
-#: createuser.c:356
+#: createuser.c:357
#, c-format
msgid " -g, --role=ROLE new role will be a member of this role\n"
msgstr " -g, --role=ROLL rollen skapas som medlem av ROLL\n"
-#: createuser.c:357
+#: createuser.c:358
#, c-format
msgid ""
" -i, --inherit role inherits privileges of roles it is a\n"
@@ -554,52 +584,52 @@ msgstr ""
" -i, --inherit rollen ärver rättigheter från var roll den\n"
" är medlem av (standard)\n"
-#: createuser.c:359
+#: createuser.c:360
#, c-format
msgid " -I, --no-inherit role does not inherit privileges\n"
msgstr " -I, --no-inherit rollen ärver inga rättigheter\n"
-#: createuser.c:360
+#: createuser.c:361
#, c-format
msgid " -l, --login role can login (default)\n"
msgstr " -l, --login rollen kan logga in (standard)\n"
-#: createuser.c:361
+#: createuser.c:362
#, c-format
msgid " -L, --no-login role cannot login\n"
msgstr " -L, --no-login rollen kan inte logga in\n"
-#: createuser.c:362
+#: createuser.c:363
#, c-format
msgid " -N, --unencrypted do not encrypt stored password\n"
msgstr " -N, --unencrypted lösenordet sparas okrypterat\n"
-#: createuser.c:363
+#: createuser.c:364
#, c-format
msgid " -P, --pwprompt assign a password to new role\n"
msgstr " -P, --pwprompt tilldela den nya rollen ett lösenord\n"
-#: createuser.c:364
+#: createuser.c:365
#, c-format
msgid " -r, --createrole role can create new roles\n"
msgstr " -r, --createrole rollen kan skapa nya roller\n"
-#: createuser.c:365
+#: createuser.c:366
#, c-format
msgid " -R, --no-createrole role cannot create roles (default)\n"
msgstr " -R, --no-createrole rollen kan inte skapa roller (standard)\n"
-#: createuser.c:366
+#: createuser.c:367
#, c-format
msgid " -s, --superuser role will be superuser\n"
msgstr " -s, --superuser rollen är en superanvändare\n"
-#: createuser.c:367
+#: createuser.c:368
#, c-format
msgid " -S, --no-superuser role will not be superuser (default)\n"
msgstr " -S, --no-superuser rollen är inte superanvändare (standard)\n"
-#: createuser.c:369
+#: createuser.c:370
#, c-format
msgid ""
" --interactive prompt for missing role name and attributes rather\n"
@@ -608,17 +638,17 @@ msgstr ""
" --interactive fråga efter rollnamn och egenskaper, snarare än\n"
" att falla tillbaka på förval\n"
-#: createuser.c:371
+#: createuser.c:372
#, c-format
msgid " --replication role can initiate replication\n"
msgstr " --replication rollen kan begära replikation\n"
-#: createuser.c:372
+#: createuser.c:373
#, c-format
msgid " --no-replication role cannot initiate replication\n"
msgstr " --no-replication rollen får inte begära replikation\n"
-#: createuser.c:377
+#: createuser.c:378
#, c-format
msgid " -U, --username=USERNAME user name to connect as (not the one to create)\n"
msgstr " -U, --username=ANVÄNDARE användarnamn vid förbindelsen (inte ny roll)\n"
@@ -830,62 +860,80 @@ msgstr ""
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=ANVÄNDARE användarnamn vid förbindelsen\n"
-#: reindexdb.c:149
+#: reindexdb.c:160
#, c-format
msgid "%s: cannot reindex all databases and a specific one at the same time\n"
msgstr "%s: Kan inte nyindexera alla databaser och samtidigt en specifik databas.\n"
-#: reindexdb.c:154
+#: reindexdb.c:165
#, c-format
msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
msgstr "%s: Kan inte indexera alla databaser samtidigt med systemkatalogerna.\n"
-#: reindexdb.c:159
+#: reindexdb.c:170
+#, fuzzy, c-format
+#| msgid "%s: cannot reindex specific table(s) in all databases\n"
+msgid "%s: cannot reindex specific schema(s) in all databases\n"
+msgstr "%s: Kan inte indexera specifik tabell i alla databaser.\n"
+
+#: reindexdb.c:175
#, c-format
msgid "%s: cannot reindex specific table(s) in all databases\n"
msgstr "%s: Kan inte indexera specifik tabell i alla databaser.\n"
-#: reindexdb.c:164
+#: reindexdb.c:180
#, c-format
msgid "%s: cannot reindex specific index(es) in all databases\n"
msgstr "%s: Kan inte återskapa specifikt index i alla databaser.\n"
-#: reindexdb.c:175
+#: reindexdb.c:191
+#, fuzzy, c-format
+#| msgid "%s: cannot reindex specific table(s) and system catalogs at the same time\n"
+msgid "%s: cannot reindex specific schema(s) and system catalogs at the same time\n"
+msgstr "%s: Kan inte indexera specifik tabell och systemkatalogerna samtidigt.\n"
+
+#: reindexdb.c:196
#, c-format
msgid "%s: cannot reindex specific table(s) and system catalogs at the same time\n"
msgstr "%s: Kan inte indexera specifik tabell och systemkatalogerna samtidigt.\n"
-#: reindexdb.c:180
+#: reindexdb.c:201
#, c-format
msgid "%s: cannot reindex specific index(es) and system catalogs at the same time\n"
msgstr "%s: Kan inte återskapa specifikt index och systemkatalogerna samtidigt.\n"
-#: reindexdb.c:264
+#: reindexdb.c:307
#, c-format
msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
msgstr "%s: Misslyckad indexering av tabell \"%s\" i databasen \"%s\": %s"
-#: reindexdb.c:267
+#: reindexdb.c:310
#, c-format
msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
msgstr "%s: Misslyckad indexering av index \"%s\" i databasen \"%s\": %s"
-#: reindexdb.c:270
+#: reindexdb.c:313
+#, fuzzy, c-format
+#| msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
+msgid "%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: Misslyckad indexering av tabell \"%s\" i databasen \"%s\": %s"
+
+#: reindexdb.c:316
#, c-format
msgid "%s: reindexing of database \"%s\" failed: %s"
msgstr "%s: Misslyckad indexering av databasen \"%s\": %s"
-#: reindexdb.c:301
+#: reindexdb.c:347
#, c-format
msgid "%s: reindexing database \"%s\"\n"
msgstr "%s: Nyindexering av databasen \"%s\".\n"
-#: reindexdb.c:329
+#: reindexdb.c:380
#, c-format
msgid "%s: reindexing of system catalogs failed: %s"
msgstr "%s: Misslyckad indexering av systemkatalogerna: %s"
-#: reindexdb.c:341
+#: reindexdb.c:392
#, c-format
msgid ""
"%s reindexes a PostgreSQL database.\n"
@@ -894,32 +942,38 @@ msgstr ""
"%s indexerar en PostgreSQL-databas på nytt.\n"
"\n"
-#: reindexdb.c:345
+#: reindexdb.c:396
#, c-format
msgid " -a, --all reindex all databases\n"
msgstr " -a, --all nyindexera alla databaser\n"
-#: reindexdb.c:346
+#: reindexdb.c:397
#, c-format
msgid " -d, --dbname=DBNAME database to reindex\n"
msgstr " -d, --dbname=DBNAME databas att nyindexera\n"
-#: reindexdb.c:348
+#: reindexdb.c:399
#, c-format
msgid " -i, --index=INDEX recreate specific index(es) only\n"
msgstr " -i, --index=INDEX återskapa enbart detta index (får upprepas)\n"
-#: reindexdb.c:350
+#: reindexdb.c:401
#, c-format
msgid " -s, --system reindex system catalogs\n"
msgstr " -s, --system nyindexera systemkatalogerna\n"
-#: reindexdb.c:351
+#: reindexdb.c:402
+#, fuzzy, c-format
+#| msgid " -n, --schema=SCHEMA dump the named schema(s) only\n"
+msgid " -S, --schema=SCHEMA reindex specific schema(s) only\n"
+msgstr " -n, --schema=SCHEMA dumpa bara de namngivna scheman\n"
+
+#: reindexdb.c:403
#, c-format
msgid " -t, --table=TABLE reindex specific table(s) only\n"
msgstr " -t, --table=TABELL nyindexera endast denna tabell (får upprepas)\n"
-#: reindexdb.c:361
+#: reindexdb.c:414
#, c-format
msgid ""
"\n"
@@ -928,54 +982,73 @@ msgstr ""
"\n"
"Läs beskrivningen av SQL-kommandot REINDEX för detaljer.\n"
-#: vacuumdb.c:167
-#, c-format
-msgid "%s: cannot use the \"full\" option when performing only analyze\n"
-msgstr "%s: Växeln \"full\" kan inte utföras med enbart analys.\n"
+#: vacuumdb.c:191
+#, fuzzy, c-format
+#| msgid "length for type %s must be at least 1"
+msgid "%s: number of parallel jobs must be at least 1\n"
+msgstr "längden för typ %s måste vara minst 1"
-#: vacuumdb.c:173
+#: vacuumdb.c:197
#, c-format
-msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
-msgstr "%s: Växeln \"freeze\" kan inte utföras med enbart analys.\n"
+msgid "%s: too many parallel jobs requested (maximum: %d)\n"
+msgstr ""
-#: vacuumdb.c:186
+#: vacuumdb.c:236 vacuumdb.c:242
+#, fuzzy, c-format
+#| msgid "%s: cannot use the \"full\" option when performing only analyze\n"
+msgid "%s: cannot use the \"%s\" option when performing only analyze\n"
+msgstr "%s: Växeln \"full\" kan inte utföras med enbart analys.\n"
+
+#: vacuumdb.c:259
#, c-format
msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
msgstr "%s: Kan inte städa i alla databaser och samtidigt i ytterligare en.\n"
-#: vacuumdb.c:192
+#: vacuumdb.c:265
#, c-format
msgid "%s: cannot vacuum specific table(s) in all databases\n"
msgstr "%s: Kan inte städa en specifik tabell i alla databaser.\n"
-#: vacuumdb.c:244
-#, c-format
-msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: Misslyckad städning av tabell \"%s\" i databasen \"%s\": %s"
-
-#: vacuumdb.c:247
-#, c-format
-msgid "%s: vacuuming of database \"%s\" failed: %s"
-msgstr "%s: Misslyckad städning i databasen \"%s\": %s"
-
-#: vacuumdb.c:333
+#: vacuumdb.c:351
msgid "Generating minimal optimizer statistics (1 target)"
msgstr "Skapar minsta optimeringsstatistik, för ett mål."
-#: vacuumdb.c:334
+#: vacuumdb.c:352
msgid "Generating medium optimizer statistics (10 targets)"
msgstr "Skapar mellanstor optimeringsstatistik, för tio mål."
-#: vacuumdb.c:335
+#: vacuumdb.c:353
msgid "Generating default (full) optimizer statistics"
msgstr "Skapar förvald, en fullstor, optimeringsstatistik."
-#: vacuumdb.c:406
+#: vacuumdb.c:362
+#, fuzzy, c-format
+#| msgid "%s: clustering database \"%s\"\n"
+msgid "%s: processing database \"%s\": %s\n"
+msgstr "%s: Klustring av databasen \"%s\".\n"
+
+#: vacuumdb.c:365
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: Utför vacuum i databasen \"%s\".\n"
-#: vacuumdb.c:424
+#: vacuumdb.c:695
+#, c-format
+msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: Misslyckad städning av tabell \"%s\" i databasen \"%s\": %s"
+
+#: vacuumdb.c:698 vacuumdb.c:815
+#, c-format
+msgid "%s: vacuuming of database \"%s\" failed: %s"
+msgstr "%s: Misslyckad städning i databasen \"%s\": %s"
+
+#: vacuumdb.c:929
+#, fuzzy, c-format
+#| msgid "%s: invalid argument: %s\n"
+msgid "%s: invalid socket: %s"
+msgstr "%s: Ogiltigt argument: %s\n"
+
+#: vacuumdb.c:938
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -984,76 +1057,86 @@ msgstr ""
"%s städar och analyserar en PostgreSQL-databas.\n"
"\n"
-#: vacuumdb.c:428
+#: vacuumdb.c:942
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all städar i alla databaser\n"
-#: vacuumdb.c:429
+#: vacuumdb.c:943
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=DBNAMN databas att utföra vacuum i\n"
-#: vacuumdb.c:430
+#: vacuumdb.c:944
#, c-format
msgid " -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo visa kommandon som skickas till servern\n"
-#: vacuumdb.c:431
+#: vacuumdb.c:945
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full utför full städning\n"
-#: vacuumdb.c:432
+#: vacuumdb.c:946
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr " -F, --freeze fixera utsagor om radtransaktioner\n"
-#: vacuumdb.c:433
+#: vacuumdb.c:947
+#, fuzzy, c-format
+#| msgid " -e, --echo show the commands being sent to the server\n"
+msgid " -j, --jobs=NUM use this many concurrent connections to vacuum\n"
+msgstr " -e, --echo visa kommandon som skickas till servern\n"
+
+#: vacuumdb.c:948
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet skriv inte ut några meddelanden\n"
-#: vacuumdb.c:434
+#: vacuumdb.c:949
#, c-format
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr " -t, --table='TABELL[(SPALTER)]' städa enbart i dessa tabeller\n"
-#: vacuumdb.c:435
+#: vacuumdb.c:950
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose skriv massor med utdata\n"
-#: vacuumdb.c:436
+#: vacuumdb.c:951
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
-#: vacuumdb.c:437
+#: vacuumdb.c:952
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr " -z, --analyze uppdatera optimeringsstatistik\n"
-#: vacuumdb.c:438
-#, c-format
-msgid " -Z, --analyze-only only update optimizer statistics\n"
+#: vacuumdb.c:953
+#, fuzzy, c-format
+#| msgid " -Z, --analyze-only only update optimizer statistics\n"
+msgid " -Z, --analyze-only only update optimizer statistics; no vacuum\n"
msgstr " -Z, --analyze-only uppdatera bara optimeringsstatistik\n"
-#: vacuumdb.c:439
-#, c-format
+#: vacuumdb.c:954
+#, fuzzy, c-format
+#| msgid ""
+#| " --analyze-in-stages only update optimizer statistics, in multiple\n"
+#| " stages for faster results\n"
msgid ""
" --analyze-in-stages only update optimizer statistics, in multiple\n"
-" stages for faster results\n"
+" stages for faster results; no vacuum\n"
msgstr ""
" --analyze-in-stages uppdatera bara optimeringsstatistik, men i\n"
" flera steg för snabbare utfall\n"
-#: vacuumdb.c:441
+#: vacuumdb.c:956
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
-#: vacuumdb.c:449
+#: vacuumdb.c:964
#, c-format
msgid ""
"\n"
@@ -1061,3 +1144,6 @@ msgid ""
msgstr ""
"\n"
"Läs beskrivningen av SQL-kommandot VACUUM för detaljer.\n"
+
+#~ msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
+#~ msgstr "%s: Växeln \"freeze\" kan inte utföras med enbart analys.\n"
diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index 786e75e0ffa..35b06bcba9f 100644
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,15 +6,16 @@ msgid ""
msgstr ""
"Project-Id-Version: pgscripts (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-11-26 18:44+0000\n"
-"PO-Revision-Date: 2015-12-02 14:46+0800\n"
+"POT-Creation-Date: 2016-04-18 04:44+0000\n"
+"PO-Revision-Date: 2016-05-19 20:42+0800\n"
"Last-Translator: Yuwei Peng <ywpeng@whu.edu.cn>\n"
-"Language-Team: Chinese (Simplified)\n"
+"Language-Team: Chinese (Simplified) <ywpeng@whu.edu.cn>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.7\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
#: ../../common/fe_memutils.c:98
@@ -42,18 +43,45 @@ msgstr "用户不存在"
msgid "user name lookup failure: error code %lu"
msgstr "用户名查找失败:错误代码%lu"
+# print.c:1202
+#: ../../fe_utils/print.c:354
+#, c-format
+msgid "(%lu row)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(%lu 行记录)"
+
+#: ../../fe_utils/print.c:2906
+#, c-format
+msgid "Interrupted\n"
+msgstr "已中断\n"
+
+#: ../../fe_utils/print.c:2970
+#, c-format
+msgid "Cannot add header to table content: column count of %d exceeded.\n"
+msgstr "无法对表的内容增加标题:已经超过%d列的数量.\n"
+
+#: ../../fe_utils/print.c:3010
+#, c-format
+msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
+msgstr "无法对表的内容添加单元: 总共有%d个单元超过.\n"
+
+#: ../../fe_utils/print.c:3259
+#, c-format
+msgid "invalid output format (internal error): %d"
+msgstr "无效的输出格式 (内部错误): %d"
+
#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
-#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
-#: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
+#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:169
+#: createuser.c:184 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
#: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
-#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:130 reindexdb.c:149
+#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:131 reindexdb.c:150
#: vacuumdb.c:209 vacuumdb.c:228
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
-#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:147
+#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:182
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:148
#: vacuumdb.c:226
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
@@ -93,21 +121,21 @@ msgstr ""
"%s 对一个数据库中先前已经建过簇的表进行建簇.\n"
"\n"
-#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
-#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:392
-#: vacuumdb.c:975
+#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:349
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:393
+#: vacuumdb.c:939
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: clusterdb.c:263 reindexdb.c:393 vacuumdb.c:976
+#: clusterdb.c:263 reindexdb.c:394 vacuumdb.c:940
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [选项]... [数据库名]\n"
-#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
-#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:394
-#: vacuumdb.c:977
+#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:351
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:395
+#: vacuumdb.c:941
#, c-format
msgid ""
"\n"
@@ -126,14 +154,14 @@ msgstr " -a, --all 对所有数据库建簇\n"
msgid " -d, --dbname=DBNAME database to cluster\n"
msgstr " -d, --dbname=DBNAME 对数据库 DBNAME 建簇\n"
-#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
-#: droplang.c:241 dropuser.c:159 reindexdb.c:397
+#: clusterdb.c:267 createlang.c:240 createuser.c:355 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:398
#, c-format
msgid ""
" -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo 显示发送到服务端的命令\n"
-#: clusterdb.c:268 reindexdb.c:399
+#: clusterdb.c:268 reindexdb.c:400
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet 不写任何信息\n"
@@ -143,26 +171,26 @@ msgstr " -q, --quiet 不写任何信息\n"
msgid " -t, --table=TABLE cluster specific table(s) only\n"
msgstr " -t, --table=TABLE 只对指定的表建簇\n"
-#: clusterdb.c:270 reindexdb.c:403
+#: clusterdb.c:270 reindexdb.c:404
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose 写大量的输出\n"
-#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
-#: droplang.c:243 dropuser.c:162 reindexdb.c:404
+#: clusterdb.c:271 createlang.c:242 createuser.c:369 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:405
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
-#: droplang.c:244 dropuser.c:164 reindexdb.c:405
+#: clusterdb.c:272 createlang.c:243 createuser.c:374 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:406
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
-#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:406
-#: vacuumdb.c:993
+#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:375
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:407
+#: vacuumdb.c:957
#, c-format
msgid ""
"\n"
@@ -171,37 +199,37 @@ msgstr ""
"\n"
"联接选项:\n"
-#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:407 vacuumdb.c:994
+#: clusterdb.c:274 createlang.c:245 createuser.c:376 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:408 vacuumdb.c:958
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=HOSTNAM 数据库服务器所在机器的主机名或套接字目录\n"
-#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:995
+#: clusterdb.c:275 createlang.c:246 createuser.c:377 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:409 vacuumdb.c:959
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORT 数据库服务器端口号\n"
#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:409 vacuumdb.c:996
+#: reindexdb.c:410 vacuumdb.c:960
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USERNAME 联接的用户名\n"
-#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:997
+#: clusterdb.c:277 createlang.c:248 createuser.c:379 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:411 vacuumdb.c:961
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password 永远不提示输入口令\n"
-#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:998
+#: clusterdb.c:278 createlang.c:249 createuser.c:380 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:412 vacuumdb.c:962
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password 强制提示输入口令\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:999
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:413 vacuumdb.c:963
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=DBNAME 更改维护数据库\n"
@@ -215,9 +243,9 @@ msgstr ""
"\n"
"阅读 SQL 命令 CLUSTER 的描述信息, 以便获得更详细的信息.\n"
-#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
-#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:414
-#: vacuumdb.c:1001
+#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:381
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:415
+#: vacuumdb.c:965
#, c-format
msgid ""
"\n"
@@ -226,60 +254,59 @@ msgstr ""
"\n"
"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-#: common.c:73 common.c:123
+#: common.c:82 common.c:128
msgid "Password: "
msgstr "口令: "
-#: common.c:105
+#: common.c:113
#, c-format
-#| msgid "%s: could not connect to database %s\n"
msgid "%s: could not connect to database %s: out of memory\n"
msgstr "%s:无法连接到数据库 %s:内存不足\n"
-#: common.c:139
+#: common.c:141
#, c-format
msgid "%s: could not connect to database %s: %s"
msgstr "%s: 无法联接到数据库 %s: %s"
-#: common.c:188 common.c:216
+#: common.c:190 common.c:218
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: 查询失败: %s"
-#: common.c:190 common.c:218
+#: common.c:192 common.c:220
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: 查询是: %s\n"
#. translator: abbreviation for "yes"
-#: common.c:259
+#: common.c:261
msgid "y"
msgstr "y"
#. translator: abbreviation for "no"
-#: common.c:261
+#: common.c:263
msgid "n"
msgstr "n"
#. translator: This is a question followed by the translated options for
#. "yes" and "no".
-#: common.c:271
+#: common.c:273
#, c-format
msgid "%s (%s/%s) "
msgstr "%s (%s/%s) "
-#: common.c:292
+#: common.c:294
#, c-format
msgid "Please answer \"%s\" or \"%s\".\n"
msgstr "请回答\"%s\"或\"%s\".\n"
-#: common.c:371 common.c:408
+#: common.c:373 common.c:410
#, c-format
msgid "Cancel request sent\n"
msgstr "取消发送的请求\n"
# fe-connect.c:1322
-#: common.c:374 common.c:412
+#: common.c:376 common.c:414
#, c-format
msgid "Could not send cancel request: %s"
msgstr "无法发送取消请求: %s"
@@ -475,46 +502,46 @@ msgid ""
" -l, --list show a list of currently installed languages\n"
msgstr " -l, --list 显示当前已经安装了的语言列表\n"
-#: createuser.c:190
+#: createuser.c:191
msgid "Enter name of role to add: "
msgstr "输入要增加的角色名称: "
-#: createuser.c:205
+#: createuser.c:206
msgid "Enter password for new role: "
msgstr "为新角色输入的口令: "
-#: createuser.c:206
+#: createuser.c:207
msgid "Enter it again: "
msgstr "再输入一遍: "
-#: createuser.c:209
+#: createuser.c:210
#, c-format
msgid "Passwords didn't match.\n"
msgstr "口令不匹配.\n"
-#: createuser.c:218
+#: createuser.c:219
msgid "Shall the new role be a superuser?"
msgstr "新的角色是否是超级用户?"
-#: createuser.c:233
+#: createuser.c:234
msgid "Shall the new role be allowed to create databases?"
msgstr "新的角色允许创建数据库吗?"
-#: createuser.c:241
+#: createuser.c:242
msgid "Shall the new role be allowed to create more new roles?"
msgstr "新角色允许创建其它新的角色吗? "
-#: createuser.c:275
+#: createuser.c:276
#, c-format
msgid "Password encryption failed.\n"
msgstr "密码加密失败.\n"
-#: createuser.c:332
+#: createuser.c:333
#, c-format
msgid "%s: creation of new role failed: %s"
msgstr "%s: 创建新用户失败: %s"
-#: createuser.c:347
+#: createuser.c:348
#, c-format
msgid ""
"%s creates a new PostgreSQL role.\n"
@@ -523,38 +550,38 @@ msgstr ""
"%s 创建一个新的 PostgreSQL 用户.\n"
"\n"
-#: createuser.c:349 dropuser.c:157
+#: createuser.c:350 dropuser.c:157
#, c-format
msgid " %s [OPTION]... [ROLENAME]\n"
msgstr " %s [选项]... [用户名]\n"
-#: createuser.c:351
+#: createuser.c:352
#, c-format
msgid ""
" -c, --connection-limit=N connection limit for role (default: no limit)\n"
msgstr " -c, --connection-limit=N 角色的连接限制(缺省: 没有限制)\n"
-#: createuser.c:352
+#: createuser.c:353
#, c-format
msgid " -d, --createdb role can create new databases\n"
msgstr " -d, --createdb 此角色可以创建新数据库\n"
-#: createuser.c:353
+#: createuser.c:354
#, c-format
msgid " -D, --no-createdb role cannot create databases (default)\n"
msgstr " -D, --no-createdb 此角色不可以创建新数据库(默认)\n"
-#: createuser.c:355
+#: createuser.c:356
#, c-format
msgid " -E, --encrypted encrypt stored password\n"
msgstr " -E, --encrypted 口令加密存储\n"
-#: createuser.c:356
+#: createuser.c:357
#, c-format
msgid " -g, --role=ROLE new role will be a member of this role\n"
msgstr " -g, --role=ROLE 新的角色必须是这个角色的成员\n"
-#: createuser.c:357
+#: createuser.c:358
#, c-format
msgid ""
" -i, --inherit role inherits privileges of roles it is a\n"
@@ -563,52 +590,52 @@ msgstr ""
" -i, --inherit 角色能够继承它所属角色的权限\n"
" (这是缺省情况)\n"
-#: createuser.c:359
+#: createuser.c:360
#, c-format
msgid " -I, --no-inherit role does not inherit privileges\n"
msgstr " -I, --no-inherit 角色不继承权限\n"
-#: createuser.c:360
+#: createuser.c:361
#, c-format
msgid " -l, --login role can login (default)\n"
msgstr " -l, --login 角色能够登录(这是缺省情况)\n"
-#: createuser.c:361
+#: createuser.c:362
#, c-format
msgid " -L, --no-login role cannot login\n"
msgstr " -L, --no-login 角色不能登录\n"
-#: createuser.c:362
+#: createuser.c:363
#, c-format
msgid " -N, --unencrypted do not encrypt stored password\n"
msgstr " -N, --unencrypted 口令不加密存储\n"
-#: createuser.c:363
+#: createuser.c:364
#, c-format
msgid " -P, --pwprompt assign a password to new role\n"
msgstr " -P, --pwprompt 给新角色指定口令\n"
-#: createuser.c:364
+#: createuser.c:365
#, c-format
msgid " -r, --createrole role can create new roles\n"
msgstr " -r, --createrole 这个角色可以创建新的角色\n"
-#: createuser.c:365
+#: createuser.c:366
#, c-format
msgid " -R, --no-createrole role cannot create roles (default)\n"
msgstr " -R, --no-createrole 这个角色没有创建其它角色的权限(默认)\n"
-#: createuser.c:366
+#: createuser.c:367
#, c-format
msgid " -s, --superuser role will be superuser\n"
msgstr " -s, --superuser 角色将是超级用户\n"
-#: createuser.c:367
+#: createuser.c:368
#, c-format
msgid " -S, --no-superuser role will not be superuser (default)\n"
msgstr " -S, --no-superuser 角色不能是超级用户(默认)\n"
-#: createuser.c:369
+#: createuser.c:370
#, c-format
msgid ""
" --interactive prompt for missing role name and attributes "
@@ -618,17 +645,17 @@ msgstr ""
" --interactive 提示缺少角色名及其属性\n"
" 而不是使用默认值\n"
-#: createuser.c:371
+#: createuser.c:372
#, c-format
msgid " --replication role can initiate replication\n"
msgstr " --replication 角色能启动复制\n"
-#: createuser.c:372
+#: createuser.c:373
#, c-format
msgid " --no-replication role cannot initiate replication\n"
msgstr " --no-replication 角色不能启动复制\n"
-#: createuser.c:377
+#: createuser.c:378
#, c-format
msgid ""
" -U, --username=USERNAME user name to connect as (not the one to create)\n"
@@ -777,13 +804,11 @@ msgstr "%s: 无法取得缺省选项\n"
#: pg_isready.c:199
#, c-format
-#| msgid "Server started and accepting connections\n"
msgid "accepting connections\n"
msgstr "接受连接\n"
#: pg_isready.c:202
#, c-format
-#| msgid "Server started and accepting connections\n"
msgid "rejecting connections\n"
msgstr "拒绝连接\n"
@@ -799,7 +824,6 @@ msgstr "没有尝试\n"
#: pg_isready.c:211
#, c-format
-#| msgid "[unknown]"
msgid "unknown\n"
msgstr "未知\n"
@@ -860,85 +884,80 @@ msgstr ""
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USERNAME 连接的用户名\n"
-#: reindexdb.c:159
+#: reindexdb.c:160
#, c-format
msgid "%s: cannot reindex all databases and a specific one at the same time\n"
msgstr "%s: 无法对所有数据库和一个指定的索引同时进行索引重建操作\n"
-#: reindexdb.c:164
+#: reindexdb.c:165
#, c-format
msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
msgstr "%s: 无法对所有数据库和系统目录同时进行索引重建操作\n"
-#: reindexdb.c:169
+#: reindexdb.c:170
#, c-format
-#| msgid "%s: cannot reindex specific table(s) in all databases\n"
msgid "%s: cannot reindex specific schema(s) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定模式上的索引进行重建\n"
-#: reindexdb.c:174
+#: reindexdb.c:175
#, c-format
msgid "%s: cannot reindex specific table(s) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定表上的索引进行重建\n"
-#: reindexdb.c:179
+#: reindexdb.c:180
#, c-format
msgid "%s: cannot reindex specific index(es) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定的索引进行重建\n"
-#: reindexdb.c:190
+#: reindexdb.c:191
#, c-format
-#| msgid ""
-#| "%s: cannot reindex specific table(s) and system catalogs at the same "
-#| "time\n"
msgid ""
"%s: cannot reindex specific schema(s) and system catalogs at the same time\n"
msgstr "%s:无法对指定的模式和系统目录同时进行索引重建\n"
-#: reindexdb.c:195
+#: reindexdb.c:196
#, c-format
msgid ""
"%s: cannot reindex specific table(s) and system catalogs at the same time\n"
msgstr "%s: 无法对指定的表和系统视图同时进行索引重建操作\n"
-#: reindexdb.c:200
+#: reindexdb.c:201
#, c-format
msgid ""
"%s: cannot reindex specific index(es) and system catalogs at the same time\n"
msgstr "%s: 无法对指定索引和系统视图同时进行索引重建操作\n"
-#: reindexdb.c:306
+#: reindexdb.c:307
#, c-format
msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库\"%3$s\"中对表\"%2$s\"上的索引重新创建失败: %4$s"
-#: reindexdb.c:309
+#: reindexdb.c:310
#, c-format
msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库\"%3$s\"中对索引\"%2$s\"重新创建失败: %4$s"
-#: reindexdb.c:312
+#: reindexdb.c:313
#, c-format
-#| msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
msgid "%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库\"%3$s\"中对模式\"%2$s\"的索引重建失败:%4$s"
-#: reindexdb.c:315
+#: reindexdb.c:316
#, c-format
msgid "%s: reindexing of database \"%s\" failed: %s"
msgstr "%s: 在数据库\"%s\"上重新创建索引失败: %s"
-#: reindexdb.c:346
+#: reindexdb.c:347
#, c-format
msgid "%s: reindexing database \"%s\"\n"
msgstr "%s: 对数据库 \"%s\" 重新创建索引\n"
-#: reindexdb.c:379
+#: reindexdb.c:380
#, c-format
msgid "%s: reindexing of system catalogs failed: %s"
msgstr "%s: 对目录视图重新创建索引失败: %s"
-#: reindexdb.c:391
+#: reindexdb.c:392
#, c-format
msgid ""
"%s reindexes a PostgreSQL database.\n"
@@ -947,38 +966,37 @@ msgstr ""
"%s 对一个PostgreSQL 数据库重新创建索引.\n"
"\n"
-#: reindexdb.c:395
+#: reindexdb.c:396
#, c-format
msgid " -a, --all reindex all databases\n"
msgstr " -a, --all 对所有数据库进行重建索引操作\n"
-#: reindexdb.c:396
+#: reindexdb.c:397
#, c-format
msgid " -d, --dbname=DBNAME database to reindex\n"
msgstr " -d, --dbname=数据库名称 对数据库中的索引进行重建\n"
-#: reindexdb.c:398
+#: reindexdb.c:399
#, c-format
msgid " -i, --index=INDEX recreate specific index(es) only\n"
msgstr " -i, --index=INDEX 仅重新创建指定的索引\n"
-#: reindexdb.c:400
+#: reindexdb.c:401
#, c-format
msgid " -s, --system reindex system catalogs\n"
msgstr " -s, --system 对系统视图重新创建索引\n"
-#: reindexdb.c:401
+#: reindexdb.c:402
#, c-format
-#| msgid " -n, --schema=SCHEMA dump the named schema(s) only\n"
msgid " -S, --schema=SCHEMA reindex specific schema(s) only\n"
msgstr " -S, --schema=SCHEMA 只对指定模式重建索引\n"
-#: reindexdb.c:402
+#: reindexdb.c:403
#, c-format
msgid " -t, --table=TABLE reindex specific table(s) only\n"
msgstr " -t, --table=表名 只对指定的表重新创建索引\n"
-#: reindexdb.c:413
+#: reindexdb.c:414
#, c-format
msgid ""
"\n"
@@ -989,7 +1007,6 @@ msgstr ""
#: vacuumdb.c:191
#, c-format
-#| msgid "%s: maximum number of parallel jobs is %d\n"
msgid "%s: number of parallel jobs must be at least 1\n"
msgstr "%s:并行工作的数量必须至少为1\n"
@@ -1000,7 +1017,6 @@ msgstr "%s:请求了太多并行任务(最大:%d)\n"
#: vacuumdb.c:236 vacuumdb.c:242
#, c-format
-#| msgid "%s: cannot use the \"full\" option when performing only analyze\n"
msgid "%s: cannot use the \"%s\" option when performing only analyze\n"
msgstr "%s:在只执行分析的时候,无法使用\"%s\"选项\n"
@@ -1014,40 +1030,45 @@ msgstr "%s: 无法对所有数据库和一个指定的数据库同时清理\n"
msgid "%s: cannot vacuum specific table(s) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定的表进行清理\n"
-#: vacuumdb.c:363
+#: vacuumdb.c:351
msgid "Generating minimal optimizer statistics (1 target)"
msgstr "产生最小优化器统计(一个目标)"
-#: vacuumdb.c:364
+#: vacuumdb.c:352
msgid "Generating medium optimizer statistics (10 targets)"
msgstr "产生中等优化器统计(10个目标)"
-#: vacuumdb.c:365
+#: vacuumdb.c:353
msgid "Generating default (full) optimizer statistics"
msgstr "产生缺省(完全)优化器统计"
-#: vacuumdb.c:374
+#: vacuumdb.c:362
#, c-format
-#| msgid "%s: clustering database \"%s\"\n"
msgid "%s: processing database \"%s\": %s\n"
msgstr "%s:处理数据库\"%s\":%s\n"
-#: vacuumdb.c:377
+#: vacuumdb.c:365
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: 清理数据库 \"%s\"\n"
-#: vacuumdb.c:738
+#: vacuumdb.c:695
#, c-format
msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 清理失败: %4$s"
-#: vacuumdb.c:741 vacuumdb.c:858
+#: vacuumdb.c:698 vacuumdb.c:815
#, c-format
msgid "%s: vacuuming of database \"%s\" failed: %s"
msgstr "%s: 数据库 \"%s\" 清理失败: %s"
-#: vacuumdb.c:974
+#: vacuumdb.c:929
+#, c-format
+#| msgid "%s: invalid option %s\n"
+msgid "%s: invalid socket: %s"
+msgstr "%s: 无效套接字: %s"
+
+#: vacuumdb.c:938
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -1056,81 +1077,75 @@ msgstr ""
"%s 清理并且优化一个 PostgreSQL 数据库.\n"
"\n"
-#: vacuumdb.c:978
+#: vacuumdb.c:942
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all 清理所有的数据库\n"
-#: vacuumdb.c:979
+#: vacuumdb.c:943
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=DBNAME 清理数据库 DBNAME\n"
-#: vacuumdb.c:980
+#: vacuumdb.c:944
#, c-format
msgid ""
" -e, --echo show the commands being sent to the "
"server\n"
msgstr " -e, --echo 显示发送到服务端的命令\n"
-#: vacuumdb.c:981
+#: vacuumdb.c:945
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full 完全清理\n"
-#: vacuumdb.c:982
+#: vacuumdb.c:946
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr " -F, --freeze 冻结记录的事务信息\n"
-#: vacuumdb.c:983
+#: vacuumdb.c:947
#, c-format
-#| msgid " -j, --jobs=NUM use this many parallel jobs to dump\n"
msgid ""
" -j, --jobs=NUM use this many concurrent connections to "
"vacuum\n"
msgstr " -j, --jobs=NUM 使用这么多个并发连接进行清理\n"
-#: vacuumdb.c:984
+#: vacuumdb.c:948
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet 不写任何信息\n"
-#: vacuumdb.c:985
+#: vacuumdb.c:949
#, c-format
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr " -t, --table='TABLE[(COLUMNS)]' 只清理指定的表\n"
-#: vacuumdb.c:986
+#: vacuumdb.c:950
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose 写大量的输出\n"
-#: vacuumdb.c:987
+#: vacuumdb.c:951
#, c-format
msgid ""
" -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: vacuumdb.c:988
+#: vacuumdb.c:952
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr " -z, --analyze 更新优化器统计\n"
-#: vacuumdb.c:989
+#: vacuumdb.c:953
#, c-format
-#| msgid " -Z, --analyze-only only update optimizer statistics\n"
msgid ""
" -Z, --analyze-only only update optimizer statistics; no "
"vacuum\n"
msgstr " -Z, --analyze-only 只更新优化器统计信息,但不做清理\n"
-#: vacuumdb.c:990
+#: vacuumdb.c:954
#, c-format
-#| msgid ""
-#| " --analyze-in-stages only update optimizer statistics, in "
-#| "multiple\n"
-#| " stages for faster results\n"
msgid ""
" --analyze-in-stages only update optimizer statistics, in "
"multiple\n"
@@ -1140,12 +1155,12 @@ msgstr ""
"段;\n"
" 不做清理\n"
-#: vacuumdb.c:992
+#: vacuumdb.c:956
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助信息, 然后退出\n"
-#: vacuumdb.c:1000
+#: vacuumdb.c:964
#, c-format
msgid ""
"\n"
@@ -1154,80 +1169,80 @@ msgstr ""
"\n"
"阅读 SQL 命令 VACUUM 的描述信息, 以便获得更详细的信息.\n"
-#~ msgid "%s: could not obtain information about current user: %s\n"
-#~ msgstr "%s: 无法获得当前用户的信息: %s\n"
+#~ msgid "user name lookup failure: %s"
+#~ msgstr "用户名查找失败: %s"
-#~ msgid "%s: could not get current user name: %s\n"
-#~ msgstr "%s: 无法获取当前用户名称: %s\n"
+#~ msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
+#~ msgstr "%s: 当只执行分析的时候,无法使用选项\"freeze\"\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s: 内存溢出\n"
#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --versoin 输出版本信息, 然后退出\n"
+#~ " -D, --location=PATH alternative place to store the database\n"
+#~ msgstr " -D, --location=PATH 选择一个地方存放数据库\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid " -W, --password prompt for password to connect\n"
+#~ msgstr " -W, --password 联接提示口令输入\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 输出版本信息, 然后退出\n"
+#~ msgid " -i, --sysid=SYSID select sysid for new user\n"
+#~ msgstr " -i, --sysid=SYSID 选择一个 sysid 给新用户\n"
+
+#~ msgid "%s: user ID must be a positive number\n"
+#~ msgstr "%s: 用户 ID 必需为一个正数\n"
#~ msgid ""
-#~ "\n"
-#~ "If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you "
-#~ "will\n"
-#~ "be prompted interactively.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "如果 -d, -D, -r, -R, -s, -S 和 ROLENAME 一个都没有指定,将使用交互式提示\n"
-#~ "你.\n"
+#~ " -L, --pglib=DIRECTORY find language interpreter file in DIRECTORY\n"
+#~ msgstr " -L, --pglib=DIRECTORY 在 DIRECTORY 目录中查找语言翻译文件\n"
#~ msgid ""
-#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
-#~ msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
+#~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
+#~ "plpythonu.\n"
+#~ msgstr ""
+#~ "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: unsupported language \"%s\"\n"
+#~ msgstr "%s: 不支持语言 \"%s\"\n"
+
+#~ msgid " -q, --quiet don't write any messages\n"
+#~ msgstr " -q, --quiet 不写任何信息\n"
#~ msgid ""
#~ " --version output version information, then exit\n"
#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid " -q, --quiet don't write any messages\n"
-#~ msgstr " -q, --quiet 不写任何信息\n"
-
-#~ msgid "%s: unsupported language \"%s\"\n"
-#~ msgstr "%s: 不支持语言 \"%s\"\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
#~ msgid ""
-#~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
-#~ "plpythonu.\n"
-#~ msgstr ""
-#~ "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
+#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
+#~ msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
#~ msgid ""
-#~ " -L, --pglib=DIRECTORY find language interpreter file in DIRECTORY\n"
-#~ msgstr " -L, --pglib=DIRECTORY 在 DIRECTORY 目录中查找语言翻译文件\n"
-
-#~ msgid "%s: user ID must be a positive number\n"
-#~ msgstr "%s: 用户 ID 必需为一个正数\n"
+#~ "\n"
+#~ "If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you "
+#~ "will\n"
+#~ "be prompted interactively.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "如果 -d, -D, -r, -R, -s, -S 和 ROLENAME 一个都没有指定,将使用交互式提示\n"
+#~ "你.\n"
-#~ msgid " -i, --sysid=SYSID select sysid for new user\n"
-#~ msgstr " -i, --sysid=SYSID 选择一个 sysid 给新用户\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 输出版本信息, 然后退出\n"
-#~ msgid " -W, --password prompt for password to connect\n"
-#~ msgstr " -W, --password 联接提示口令输入\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
#~ msgid ""
-#~ " -D, --location=PATH alternative place to store the database\n"
-#~ msgstr " -D, --location=PATH 选择一个地方存放数据库\n"
+#~ " --version output version information, then exit\n"
+#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s: 内存溢出\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
-#~ msgstr "%s: 当只执行分析的时候,无法使用选项\"freeze\"\n"
+#~ msgid "%s: could not get current user name: %s\n"
+#~ msgstr "%s: 无法获取当前用户名称: %s\n"
-#~ msgid "user name lookup failure: %s"
-#~ msgstr "用户名查找失败: %s"
+#~ msgid "%s: could not obtain information about current user: %s\n"
+#~ msgstr "%s: 无法获得当前用户的信息: %s\n"