Translation updates

3 files changed, 417 insertions, 320 deletions

diff --git a/src/bin/scripts/po/fr.po b/src/bin/scripts/po/fr.po
index d6087ab05a5..60434672263 100644
--- a/src/bin/scripts/po/fr.po
+++ b/src/bin/scripts/po/fr.po
@@ -2,7 +2,7 @@
 # translation of pgscripts-fr.po to FR_fr
 # French message translation file for pgscripts
 #
-# $PostgreSQL: pgsql/src/bin/scripts/po/fr.po,v 1.11 2006/10/21 21:03:03 petere Exp $
+# $PostgreSQL: pgsql/src/bin/scripts/po/fr.po,v 1.12 2006/11/24 17:11:57 petere Exp $
 #
 # Use these quotes: «%s»
 # Guillaume Lelarge <gleu@wanadoo.fr>, 2004, 2005.
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: pgscripts-fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-16 01:19-0300\n"
-"PO-Revision-Date: 2006-10-16 22:25+0100\n"
+"PO-Revision-Date: 2006-11-04 19:31+0100\n"
 "Last-Translator: Guillaume Lelarge <gleu@wanadoo.fr>\n"
 "Language-Team:  <pgsql-fr-general@postgresql.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr ""
 #: reindexdb.c:125
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayez «%s --help» pour plus d'informations.\n"
+msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
 #: createdb.c:119
 #: createlang.c:104
@@ -56,12 +56,12 @@ msgstr "Essayez «%s --help» pour plus d'informations.\n"
 #: reindexdb.c:124
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: trop d'arguments en ligne de commande (le premier étant «%s»)\n"
+msgstr "%s: trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
 #: createdb.c:129
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
-msgstr "%s: «%s» n'est pas un nom de codage valide\n"
+msgstr "%s : « %s » n'est pas un nom de codage valide\n"
 
 #: createdb.c:169
 #, c-format
@@ -120,48 +120,42 @@ msgstr ""
 #: createdb.c:224
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
-msgstr ""
-"  -D, --tablespace=ESPACELOGIQUE  espace logique par défaut\n"
-"                                  pour la base de données\n"
+msgstr "  -D, --tablespace=TABLESPACE   tablespace par défaut pour la base de données\n"
 
 #: createdb.c:225
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
-msgstr "  -E, --encoding=CODAGE        codage de la base de données\n"
+msgstr "  -E, --encoding=JEU            jeu de caractères de la base de données\n"
 
 #: createdb.c:226
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
-msgstr ""
-"  -O, --owner=PROPRIETAIRE     nom de l'utilisateur\n"
-"                               possédant cette nouvelle base de données\n"
+msgstr "  -O, --owner=PROPRIETAIRE      nom du propriétaire de cette nouvelle base de données\n"
 
 #: createdb.c:227
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
-msgstr "  -T, --template=MODELE        base de données modèle à copier\n"
+msgstr "  -T, --template=MODELE         base de données modèle à copier\n"
 
 #: createdb.c:228
 #, c-format
 msgid "  -e, --echo                   show the commands being sent to the server\n"
-msgstr "  -e, --echo                   affiche les commandes envoyées au serveur\n"
+msgstr "  -e, --echo                    affiche les commandes envoyées au serveur\n"
 
 #: createdb.c:229
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
-msgstr "  -q, --quiet                  n'écrit aucun message\n"
+msgstr "  -q, --quiet                   n'écrit aucun message\n"
 
 #: createdb.c:230
 #, c-format
 msgid "  --help                       show this help, then exit\n"
-msgstr "  --help                       affiche cette aide puis quitte\n"
+msgstr "  --help                        affiche cette aide puis quitte\n"
 
 #: createdb.c:231
 #, c-format
 msgid "  --version                    output version information, then exit\n"
-msgstr ""
-"  --version                    affiche les informations de version,\n"
-"                                puis quitte\n"
+msgstr "  --version                     affiche la version, puis quitte\n"
 
 #: createdb.c:232
 #: createuser.c:335
@@ -180,13 +174,13 @@ msgstr ""
 #, c-format
 msgid "  -h, --host=HOSTNAME          database server host or socket directory\n"
 msgstr ""
-"  -h, --host=HOTE              hôte du serveur de bases de données\n"
-"                               ou répertoire des sockets\n"
+"  -h, --host=HOTE               hôte du serveur de bases de données\n"
+"                                ou répertoire des sockets\n"
 
 #: createdb.c:234
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
-msgstr "  -p, --port=PORT              port du serveur de bases de données\n"
+msgstr "  -p, --port=PORT               port du serveur de bases de données\n"
 
 #: createdb.c:235
 #, c-format
@@ -196,7 +190,7 @@ msgstr "  -U, --username=NOMUTILISATEUR nom d'utilisateur pour la connexion\n"
 #: createdb.c:236
 #, c-format
 msgid "  -W, --password               prompt for password\n"
-msgstr "  -W, --password               exige un mot de passe\n"
+msgstr "  -W, --password                force la demande d'un mot de passe\n"
 
 #: createdb.c:237
 #, c-format
@@ -258,7 +252,7 @@ msgstr "%s: argument du nom du langage requis et manquant\n"
 #: createlang.c:173
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
-msgstr "%s : le langage «%s» est déjà installé pour la base de données «%s»\n"
+msgstr "%s : le langage « %s » est déjà installé pour la base de données « %s »\n"
 
 #: createlang.c:187
 #, c-format
@@ -370,15 +364,15 @@ msgstr "  --version                 affiche les informations de version, puis qu
 
 #: createuser.c:177
 msgid "Enter name of role to add: "
-msgstr "Entrez le nom du rôle à ajouter : "
+msgstr "Saisissez le nom du rôle à ajouter : "
 
 #: createuser.c:184
 msgid "Enter password for new role: "
-msgstr "Entrez le mot de passe pour le nouvel rôle : "
+msgstr "Saisissez le mot de passe pour le nouvel rôle : "
 
 #: createuser.c:185
 msgid "Enter it again: "
-msgstr "Entrez-le de nouveau : "
+msgstr "Saisissez-le de nouveau : "
 
 #: createuser.c:188
 #, c-format
@@ -524,7 +518,7 @@ msgid ""
 "be prompted interactively.\n"
 msgstr ""
 "\n"
-"Si au moins une des options -s, -S, -d, -D, -r, -R et NOMUTILISATEUR n'est pas spécifiée,\n"
+"Si au moins une des options -s, -S, -d, -D, -r, -R et NOMROLE n'est pas spécifiée,\n"
 "cela vous sera demandé interactivement.\n"
 
 #: dropdb.c:92
@@ -535,7 +529,7 @@ msgstr "%s: argument requis du nom de la base de données manquant\n"
 #: dropdb.c:107
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
-msgstr "La base de données «%s» sera supprimée sans retour en arrière possible.\n"
+msgstr "La base de données « %s » sera supprimée sans retour en arrière possible.\n"
 
 #: dropdb.c:108
 #: dropuser.c:109
@@ -570,12 +564,12 @@ msgstr "  -i, --interactive         demande une confirmation avant de supprimer
 #: droplang.c:192
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
-msgstr "%s: le langage «%s» n'est pas installé dans la base de données «%s»\n"
+msgstr "%s: le langage « %s » n'est pas installé dans la base de données «%s»\n"
 
 #: droplang.c:212
 #, c-format
 msgid "%s: still %s functions declared in language \"%s\"; language not removed\n"
-msgstr "%s: il existe encore les fonctions %s déclarées avec le langage «%s»; langage non supprimé\n"
+msgstr "%s : il existe encore les fonctions %s déclarées avec le langage « %s »; langage non supprimé\n"
 
 #: droplang.c:305
 #, c-format
@@ -603,12 +597,12 @@ msgstr "Entrez le nom du rôle à supprimer : "
 #: dropuser.c:108
 #, c-format
 msgid "Role \"%s\" will be permanently removed.\n"
-msgstr "Le rôle «%s» sera supprimé de façon permanente.\n"
+msgstr "Le rôle « %s » sera supprimé de façon permanente.\n"
 
 #: dropuser.c:124
 #, c-format
 msgid "%s: removal of role \"%s\" failed: %s"
-msgstr "%s: échec lors de la suppression du rôle «%s» : %s"
+msgstr "%s : échec lors de la suppression du rôle « %s » : %s"
 
 #: dropuser.c:144
 #, c-format
@@ -637,17 +631,17 @@ msgstr "%s: ne peut pas mettre en cluster une table spécifique dans toutes les b
 #: clusterdb.c:180
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: échec lors de la création du cluster de la table «%s» dans la base de données «%s» : %s"
+msgstr "%s : échec lors de la création du cluster de la table « %s » dans la base de données « %s » : %s"
 
 #: clusterdb.c:183
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
-msgstr "%s: échec lors de la création du cluster de la base de données «%s» : %s"
+msgstr "%s : échec lors de la création du cluster de la base de données « %s » : %s"
 
 #: clusterdb.c:219
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
-msgstr "%s: création du cluster de la base de données «%s»\n"
+msgstr "%s : création du cluster de la base de données « %s »\n"
 
 #: clusterdb.c:233
 #, c-format
@@ -693,30 +687,30 @@ msgstr ""
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
-"%s: ne peut pas lancer la commande vacuum sur toutes les bases de données et sur une spécifique\n"
+"%s : ne peut pas lancer la commande vacuum sur toutes les bases de données et sur une spécifique\n"
 "en même temps\n"
 
 #: vacuumdb.c:141
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr ""
-"%s: ne peut pas lancer la commande vacuum sur une table spécifique pour toutes les bases de\n"
+"%s : ne peut pas lancer la commande vacuum sur une table spécifique pour toutes les bases de\n"
 "données\n"
 
 #: vacuumdb.c:205
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: échec lors du nettoyage (vacuum) de la table «%s» dans la base de données «%s» : %s"
+msgstr "%s : échec lors du nettoyage (vacuum) de la table « %s » dans la base de données « %s » : %s"
 
 #: vacuumdb.c:208
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
-msgstr "%s: échec lors du nettoyage (vacuum) de la base de données «%s» : %s"
+msgstr "%s : échec lors du nettoyage (vacuum) de la base de données « %s » : %s"
 
 #: vacuumdb.c:245
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
-msgstr "%s: nettoyage (vacuum) de la base de données «%s»\n"
+msgstr "%s : nettoyage (vacuum) de la base de données « %s »\n"
 
 #: vacuumdb.c:259
 #, c-format
@@ -804,37 +798,37 @@ msgstr "%s : ne peut pas ré-indexer une table spécifique dans toutes les bases d
 #: reindexdb.c:148
 #, c-format
 msgid "%s: cannot reindex a specific index in all databases\n"
-msgstr "%s: ne peut pas ré-indexer un index spécifique dans toutes les bases de données\n"
+msgstr "%s : ne peut pas ré-indexer un index spécifique dans toutes les bases de données\n"
 
 #: reindexdb.c:159
 #, c-format
 msgid "%s: cannot reindex a specific table and system catalogs at the same time\n"
-msgstr "%s: ne peut pas ré-indexer une table spécifique et les catalogues système en même temps\n"
+msgstr "%s : ne peut pas ré-indexer une table spécifique et les catalogues système en même temps\n"
 
 #: reindexdb.c:164
 #, c-format
 msgid "%s: cannot reindex a specific index and system catalogs at the same time\n"
-msgstr "%s: ne peut pas ré-indexer un index spécifique et les catalogues système en même temps\n"
+msgstr "%s : ne peut pas ré-indexer un index spécifique et les catalogues système en même temps\n"
 
 #: reindexdb.c:239
 #, c-format
 msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: échec lors de la ré-indexation de la table «%s» dans la base de données «%s» : %s"
+msgstr "%s : échec lors de la ré-indexation de la table « %s » dans la base de données « %s » : %s"
 
 #: reindexdb.c:242
 #, c-format
 msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: échec lors de la ré-indexation de l'index «%s» dans la base de données «%s» : %s"
+msgstr "%s : échec lors de la ré-indexation de l'index « %s » dans la base de données « %s » : %s"
 
 #: reindexdb.c:245
 #, c-format
 msgid "%s: reindexing of database \"%s\" failed: %s"
-msgstr "%s: échec lors de la ré-indexation de la base de données «%s» : %s"
+msgstr "%s : échec lors de la ré-indexation de la base de données « %s » : %s"
 
 #: reindexdb.c:280
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
-msgstr "%s : ré-indexation de la base de données «%s»\n"
+msgstr "%s : ré-indexation de la base de données « %s »\n"
 
 #: reindexdb.c:311
 #, c-format
diff --git a/src/bin/scripts/po/pt_BR.po b/src/bin/scripts/po/pt_BR.po
index 42bbf57f22c..c7fa1bfc173 100644
--- a/src/bin/scripts/po/pt_BR.po
+++ b/src/bin/scripts/po/pt_BR.po
@@ -1,29 +1,28 @@
 # "pgscripts" translation to Brazilian Portuguese Language.
-# Euler Taveira de Oliveira <eulerto@yahoo.com.br>, 2003, 2004, 2005.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.1\n"
+"Project-Id-Version: PostgreSQL 8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-10 22:16-0300\n"
+"POT-Creation-Date: 2006-10-23 23:49-0200\n"
 "PO-Revision-Date: 2005-10-06 00:21-0300\n"
-"Last-Translator: Euler Taveira de Oliveira <eulerto@yahoo.com.br>\n"
-"Language-Team: Brazilian Portuguese <desenvolvimento-postgresql@listas."
-"postgresql.org.br>\n"
+"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
+"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: createdb.c:102 createdb.c:121 createlang.c:86 createlang.c:107
-#: createlang.c:153 createuser.c:150 createuser.c:165 dropdb.c:84 dropdb.c:93
+#: createdb.c:102 createdb.c:121 createlang.c:85 createlang.c:106
+#: createlang.c:152 createuser.c:157 createuser.c:172 dropdb.c:84 dropdb.c:93
 #: dropdb.c:101 droplang.c:96 droplang.c:117 droplang.c:164 dropuser.c:84
 #: dropuser.c:99 clusterdb.c:95 clusterdb.c:110 vacuumdb.c:112 vacuumdb.c:127
 #: reindexdb.c:111 reindexdb.c:125
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Tente \"%s --help\" para obter mais informação.\n"
+msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: createdb.c:119 createlang.c:105 createuser.c:163 dropdb.c:99 droplang.c:115
+#: createdb.c:119 createlang.c:104 createuser.c:170 dropdb.c:99 droplang.c:115
 #: dropuser.c:97 clusterdb.c:108 vacuumdb.c:125 reindexdb.c:124
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
@@ -39,12 +38,12 @@ msgstr "%s: \"%s\" não é um nome de codificação válido\n"
 msgid "%s: database creation failed: %s"
 msgstr "%s: criação do banco de dados falhou: %s"
 
-#: createdb.c:197
+#: createdb.c:198
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
 msgstr "%s: criação de comentário falhou (banco de dados foi criado): %s"
 
-#: createdb.c:218
+#: createdb.c:220
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -53,20 +52,20 @@ msgstr ""
 "%s cria um banco de dados PostgreSQL.\n"
 "\n"
 
-#: createdb.c:219 createlang.c:204 createuser.c:304 dropdb.c:148
-#: droplang.c:321 dropuser.c:147 clusterdb.c:234 vacuumdb.c:260
+#: createdb.c:221 createlang.c:204 createuser.c:313 dropdb.c:146
+#: droplang.c:321 dropuser.c:145 clusterdb.c:234 vacuumdb.c:260
 #: reindexdb.c:332
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: createdb.c:220
+#: createdb.c:222
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [OPÇÃO]... [NOMEBD] [DESCRIÇÃO]\n"
 
-#: createdb.c:221 createlang.c:206 createuser.c:306 dropdb.c:150
-#: droplang.c:323 dropuser.c:149 clusterdb.c:236 vacuumdb.c:262
+#: createdb.c:223 createlang.c:206 createuser.c:315 dropdb.c:148
+#: droplang.c:323 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
 #: reindexdb.c:334
 #, c-format
 msgid ""
@@ -76,53 +75,54 @@ msgstr ""
 "\n"
 "Opções:\n"
 
-#: createdb.c:222
+#: createdb.c:224
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr ""
-"  -D, --tablespace=TABLESPACE  tablespace padrão para o banco de dados\n"
+"  -D, --tablespace=ESPAÇO_DE_TABELAS  espaço de tabelas padrão para o banco "
+"de dados\n"
 
-#: createdb.c:223
+#: createdb.c:225
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=CODIFICAÇÃO   codificação para o banco de dados\n"
 
-#: createdb.c:224
+#: createdb.c:226
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr ""
-"  -O, --owner=DONO             usuário do banco que será dono do banco de "
-"dados\n"
+"  -O, --owner=DONO             usuário do banco que será dono do novo banco "
+"de dados\n"
 
-#: createdb.c:225
+#: createdb.c:227
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=MODELO        modelo de banco de dados para copiar\n"
 
-#: createdb.c:226
+#: createdb.c:228
 #, c-format
 msgid ""
 "  -e, --echo                   show the commands being sent to the server\n"
 msgstr ""
 "  -e, --echo                   mostra os comandos enviados ao servidor\n"
 
-#: createdb.c:227
+#: createdb.c:229
 #, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet                  não mostra nenhuma mensagem\n"
 
-#: createdb.c:228
+#: createdb.c:230
 #, c-format
 msgid "  --help                       show this help, then exit\n"
-msgstr "  --help                       mostra esta ajuda e sai\n"
+msgstr "  --help                       mostra esta ajuda e termina\n"
 
-#: createdb.c:229
+#: createdb.c:231
 #, c-format
 msgid "  --version                    output version information, then exit\n"
 msgstr ""
-"  --version                    mostra informação sobre a versão e sai\n"
+"  --version                    mostra informação sobre a versão e termina\n"
 
-#: createdb.c:230 createuser.c:326 clusterdb.c:244 vacuumdb.c:273
+#: createdb.c:232 createuser.c:335 clusterdb.c:244 vacuumdb.c:273
 #: reindexdb.c:344
 #, c-format
 msgid ""
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "Opções de conexão:\n"
 
-#: createdb.c:231
+#: createdb.c:233
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME          database server host or socket directory\n"
@@ -140,22 +140,22 @@ msgstr ""
 "  -h, --host=MÁQUINA        máquina do servidor de banco de dados ou "
 "diretório do soquete\n"
 
-#: createdb.c:232
+#: createdb.c:234
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORTA          porta do servidor de banco de dados\n"
 
-#: createdb.c:233
+#: createdb.c:235
 #, 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"
 
-#: createdb.c:234
+#: createdb.c:236
 #, c-format
 msgid "  -W, --password               prompt for password\n"
 msgstr "  -W, --password            pergunta senha\n"
 
-#: createdb.c:235
+#: createdb.c:237
 #, c-format
 msgid ""
 "\n"
@@ -164,8 +164,8 @@ msgstr ""
 "\n"
 "Por padrão, um banco de dados com o mesmo nome do usuário é criado.\n"
 
-#: createdb.c:236 createlang.c:216 createuser.c:333 dropdb.c:160
-#: droplang.c:333 dropuser.c:159 clusterdb.c:250 vacuumdb.c:279
+#: createdb.c:238 createlang.c:216 createuser.c:342 dropdb.c:158
+#: droplang.c:333 dropuser.c:157 clusterdb.c:250 vacuumdb.c:279
 #: reindexdb.c:350
 #, c-format
 msgid ""
@@ -173,39 +173,39 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Reporte erros a <pgsql-bugs@postgresql.org>.\n"
+"Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "Name"
 msgstr "Nome"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "yes"
 msgstr "sim"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "no"
 msgstr "não"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "Trusted?"
 msgstr "Confiável?"
 
-#: createlang.c:143 droplang.c:153
+#: createlang.c:142 droplang.c:153
 msgid "Procedural Languages"
 msgstr "Linguagens Procedurais"
 
-#: createlang.c:152 droplang.c:162
+#: createlang.c:151 droplang.c:162
 #, c-format
 msgid "%s: missing required argument language name\n"
 msgstr "%s: nome da linguagem é um argumento requerido\n"
 
-#: createlang.c:174
+#: createlang.c:173
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%s: linguagem \"%s\" já está instalada no banco de dados \"%s\"\n"
 
-#: createlang.c:188
+#: createlang.c:187
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: instalação de linguagem falhou: %s"
@@ -229,8 +229,8 @@ msgstr "  %s [OPÇÃO]... LINGUAGEM [NOMEBD]\n"
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=NOMEBD       banco de dados para instalar linguagem\n"
 
-#: createlang.c:208 createuser.c:322 dropdb.c:151 droplang.c:325
-#: dropuser.c:150 clusterdb.c:240 reindexdb.c:340
+#: createlang.c:208 createuser.c:331 dropdb.c:149 droplang.c:325
+#: dropuser.c:148 clusterdb.c:240 reindexdb.c:340
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
@@ -242,79 +242,85 @@ msgid ""
 "  -l, --list                show a list of currently installed languages\n"
 msgstr "  -l, --list                mostra a lista das linguagens instaladas\n"
 
-#: createlang.c:210 createuser.c:327 dropdb.c:154 droplang.c:327
-#: dropuser.c:153 clusterdb.c:245 vacuumdb.c:274 reindexdb.c:345
+#: createlang.c:210 createuser.c:336 dropdb.c:152 droplang.c:327
+#: dropuser.c:151 clusterdb.c:245 vacuumdb.c:274 reindexdb.c:345
 #, 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"
 
-#: createlang.c:211 createuser.c:328 dropdb.c:155 droplang.c:328
-#: dropuser.c:154 clusterdb.c:246 vacuumdb.c:275 reindexdb.c:346
+#: createlang.c:211 createuser.c:337 dropdb.c:153 droplang.c:328
+#: dropuser.c:152 clusterdb.c:246 vacuumdb.c:275 reindexdb.c:346
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORTA          porta do servidor de banco de dados\n"
 
-#: createlang.c:212 dropdb.c:156 droplang.c:329 clusterdb.c:247 vacuumdb.c:276
+#: createlang.c:212 dropdb.c:154 droplang.c:329 clusterdb.c:247 vacuumdb.c:276
 #: reindexdb.c:347
 #, 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"
 
-#: createlang.c:213 dropdb.c:157 droplang.c:330 clusterdb.c:248 vacuumdb.c:277
+#: createlang.c:213 dropdb.c:155 droplang.c:330 clusterdb.c:248 vacuumdb.c:277
 #: reindexdb.c:348
 #, c-format
 msgid "  -W, --password            prompt for password\n"
 msgstr "  -W, --password            pergunta senha\n"
 
-#: createlang.c:214 createuser.c:324 dropdb.c:158 droplang.c:331
-#: dropuser.c:157 clusterdb.c:242 reindexdb.c:342
+#: createlang.c:214 createuser.c:333 dropdb.c:156 droplang.c:331
+#: dropuser.c:155 clusterdb.c:242 reindexdb.c:342
 #, c-format
 msgid "  --help                    show this help, then exit\n"
-msgstr "  --help                    mostra esta ajuda e sai\n"
+msgstr "  --help                    mostra esta ajuda e termina\n"
 
-#: createlang.c:215 createuser.c:325 dropdb.c:159 droplang.c:332
-#: dropuser.c:158 clusterdb.c:243 reindexdb.c:343
+#: createlang.c:215 createuser.c:334 dropdb.c:157 droplang.c:332
+#: dropuser.c:156 clusterdb.c:243 reindexdb.c:343
 #, c-format
 msgid "  --version                 output version information, then exit\n"
-msgstr "  --version                 mostra informação sobre a versão e sai\n"
+msgstr ""
+"  --version                 mostra informação sobre a versão e termina\n"
 
-#: createuser.c:170
+#: createuser.c:177
 msgid "Enter name of role to add: "
 msgstr "Digite o nome da role a ser adicionada: "
 
-#: createuser.c:177
+#: createuser.c:184
 msgid "Enter password for new role: "
 msgstr "Digite a senha para a nova role: "
 
-#: createuser.c:178
+#: createuser.c:185
 msgid "Enter it again: "
 msgstr "Digite-a novamente: "
 
-#: createuser.c:181
+#: createuser.c:188
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Senhas não correspondem.\n"
 
-#: createuser.c:192
-msgid "Shall the new role be a superuser? (y/n) "
-msgstr "A nova role poderá criar um super-usuário? (s/n) "
+#: createuser.c:197
+msgid "Shall the new role be a superuser?"
+msgstr "A nova role poderá criar um super-usuário?"
+
+#: createuser.c:212
+msgid "Shall the new role be allowed to create databases?"
+msgstr "A nova role poderá criar bancos de dados?"
 
-#: createuser.c:210
-msgid "Shall the new role be allowed to create databases? (y/n) "
-msgstr "A nova role poderá criar bancos de dados? (s/n) "
+#: createuser.c:220
+msgid "Shall the new role be allowed to create more new roles?"
+msgstr "A nova role poderá criar novas roles?"
 
-#: createuser.c:221
-msgid "Shall the new role be allowed to create more new roles? (y/n) "
-msgstr "A nova role poderá criar novas roles? (s/n) "
+#: createuser.c:253
+#, c-format
+msgid "Password encryption failed.\n"
+msgstr "Criptografia de senha falhou.\n"
 
-#: createuser.c:284
+#: createuser.c:292
 #, c-format
 msgid "%s: creation of new role failed: %s"
 msgstr "%s: criação de nova role falhou: %s"
 
-#: createuser.c:303
+#: createuser.c:312
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL role.\n"
@@ -323,53 +329,53 @@ msgstr ""
 "%s cria uma nova role do PostgreSQL.\n"
 "\n"
 
-#: createuser.c:305 dropuser.c:148
+#: createuser.c:314 dropuser.c:146
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [OPÇÃO]... [NOME_ROLE]\n"
 
-#: createuser.c:307
+#: createuser.c:316
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
 msgstr "  -s, --superuser           role será super-usuário\n"
 
-#: createuser.c:308
+#: createuser.c:317
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser\n"
 msgstr "  -S, --no-superuser          role não será super-usuário\n"
 
-#: createuser.c:309
+#: createuser.c:318
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb            role pode criar novos bancos de dados\n"
 
-#: createuser.c:310
+#: createuser.c:319
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases\n"
 msgstr ""
 "  -D, --no-createdb         role não pode criar novos bancos de dados\n"
 
-#: createuser.c:311
+#: createuser.c:320
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
 msgstr "  -r, --createrole            role pode criar novas roles\n"
 
-#: createuser.c:312
+#: createuser.c:321
 #, c-format
 msgid "  -R, --no-createrole       role cannot create roles\n"
 msgstr "  -R, --no-createrole         role não pode criar novas roles\n"
 
-#: createuser.c:313
+#: createuser.c:322
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
 msgstr "  -l, --login                   role pode efetuar login (padrão)\n"
 
-#: createuser.c:314
+#: createuser.c:323
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
 msgstr "  -L, --no-login          role não pode efetuar login\n"
 
-#: createuser.c:315
+#: createuser.c:324
 #, c-format
 msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
@@ -378,40 +384,40 @@ msgstr ""
 "  -i, --inherit             role herda privilégios de roles das quais ela\n"
 "                            é um membro (padrão)\n"
 
-#: createuser.c:317
+#: createuser.c:326
 #, 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:318
+#: createuser.c:327
 #, 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:319
+#: createuser.c:328
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
 msgstr "  -P, --pwprompt            atribui uma senha a nova role\n"
 
-#: createuser.c:320
+#: createuser.c:329
 #, c-format
 msgid "  -E, --encrypted           encrypt stored password\n"
 msgstr "  -E, --encrypted           criptografa a senha armazenada\n"
 
-#: createuser.c:321
+#: createuser.c:330
 #, c-format
 msgid "  -N, --unencrypted         do not encrypt stored password\n"
 msgstr "  -N, --unencrypted         não criptografa a senha armazenada\n"
 
-#: createuser.c:323 dropdb.c:153 dropuser.c:152 clusterdb.c:241
+#: createuser.c:332 dropdb.c:151 dropuser.c:150 clusterdb.c:241
 #: reindexdb.c:341
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               não exibe nenhuma mensagem\n"
 
-#: createuser.c:329
+#: createuser.c:338
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
@@ -419,12 +425,12 @@ msgstr ""
 "  -U, --username=USUÁRIO    nome do usuário para se conectar (não é o "
 "usuário a ser criado)\n"
 
-#: createuser.c:330 dropuser.c:156
+#: createuser.c:339 dropuser.c:154
 #, c-format
 msgid "  -W, --password            prompt for password to connect\n"
 msgstr "  -W, --password            pergunta senha ao conectar\n"
 
-#: createuser.c:331
+#: createuser.c:340
 #, c-format
 msgid ""
 "\n"
@@ -441,21 +447,21 @@ msgstr ""
 msgid "%s: missing required argument database name\n"
 msgstr "%s: nome do banco de dados é um argumento requerido\n"
 
-#: dropdb.c:109
+#: dropdb.c:107
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
 msgstr "Banco de dados \"%s\" será permanentemente removido.\n"
 
-#: dropdb.c:110 dropuser.c:111
-msgid "Are you sure? (y/n) "
-msgstr "Você tem certeza? (s/n) "
+#: dropdb.c:108 dropuser.c:109
+msgid "Are you sure?"
+msgstr "Você tem certeza?"
 
-#: dropdb.c:128
+#: dropdb.c:125
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: remoção do banco de dados falhou: %s"
 
-#: dropdb.c:147
+#: dropdb.c:145
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -464,29 +470,30 @@ msgstr ""
 "%s remove um banco de dados PostgreSQL.\n"
 "\n"
 
-#: dropdb.c:149
+#: dropdb.c:147
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [OPÇÃO]... NOMEBD]\n"
 
-#: dropdb.c:152 dropuser.c:151
+#: dropdb.c:150 dropuser.c:149
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         pergunta antes de apagar algo\n"
 
-#: droplang.c:193
+#: droplang.c:192
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%s: linguagem \"%s\" não está instalada no banco de dados \"%s\"\n"
 
-#: droplang.c:213
+#: droplang.c:212
 #, c-format
 msgid ""
 "%s: still %s functions declared in language \"%s\"; language not removed\n"
 msgstr ""
-"%s: funções %s declaradas na linguagem \"%s\"; linguagem não foi removida\n"
+"%s: ainda há %s funções declaradas na linguagem \"%s\"; linguagem não foi "
+"removida\n"
 
-#: droplang.c:306
+#: droplang.c:305
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: remoção da linguagem falhou: %s"
@@ -510,17 +517,17 @@ msgstr ""
 msgid "Enter name of role to drop: "
 msgstr "Digite o nome da role a ser removida: "
 
-#: dropuser.c:110
+#: dropuser.c:108
 #, c-format
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "Role \"%s\" será permanentemente removida.\n"
 
-#: dropuser.c:127
+#: dropuser.c:124
 #, c-format
 msgid "%s: removal of role \"%s\" failed: %s"
 msgstr "%s: remoção da role \"%s\" falhou: %s"
 
-#: dropuser.c:146
+#: dropuser.c:144
 #, c-format
 msgid ""
 "%s removes a PostgreSQL role.\n"
@@ -529,7 +536,7 @@ msgstr ""
 "%s remove uma role do PostgreSQL.\n"
 "\n"
 
-#: dropuser.c:155
+#: dropuser.c:153
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
@@ -607,29 +614,28 @@ msgstr ""
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
-"%s: não pode faxinar todos os bancos de dados e um específico ao mesmo "
-"tempo\n"
+"%s: não pode limpar todos os bancos de dados e um específico ao mesmo tempo\n"
 
 #: vacuumdb.c:141
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr ""
-"%s: não pode faxinar uma tabela específica em todos os bancos de dados\n"
+"%s: não pode limpar uma tabela específica em todos os bancos de dados\n"
 
 #: vacuumdb.c:205
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: faxina na tabela \"%s\" no banco de dados \"%s\" falhou: %s"
+msgstr "%s: limpeza na tabela \"%s\" no banco de dados \"%s\" falhou: %s"
 
 #: vacuumdb.c:208
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
-msgstr "%s: faxina no banco de dados \"%s\" falhou: %s"
+msgstr "%s: limpeza no banco de dados \"%s\" falhou: %s"
 
 #: vacuumdb.c:245
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
-msgstr "%s: faxinando banco de dados \"%s\"\n"
+msgstr "%s: limpando banco de dados \"%s\"\n"
 
 #: vacuumdb.c:259
 #, c-format
@@ -637,29 +643,29 @@ msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s faxina e analisa um banco de dados PostgreSQL.\n"
+"%s limpa e analisa um banco de dados PostgreSQL.\n"
 "\n"
 
 #: vacuumdb.c:263
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
-msgstr "  -a, --all                       faxina todos bancos de dados\n"
+msgstr "  -a, --all                       limpa todos bancos de dados\n"
 
 #: vacuumdb.c:264
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
-msgstr "  -d, --dbname=NOMEBD             banco de dados a ser faxinado\n"
+msgstr "  -d, --dbname=NOMEBD             banco de dados a ser limpo\n"
 
 #: vacuumdb.c:265
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr ""
-"  -t, --table='TABELA[(COLUNAS)]' faxina somente uma tabela específica\n"
+"  -t, --table='TABELA[(COLUNAS)]' limpa somente uma tabela específica\n"
 
 #: vacuumdb.c:266
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
-msgstr "  -f, --full                      faz uma faxina completa\n"
+msgstr "  -f, --full                      faz uma limpeza completa\n"
 
 #: vacuumdb.c:267
 #, c-format
@@ -687,14 +693,15 @@ msgstr "  -v, --verbose                   mostra muitas mensagens\n"
 #: vacuumdb.c:271
 #, c-format
 msgid "  --help                          show this help, then exit\n"
-msgstr "  --help                          mostra esta ajuda e sai\n"
+msgstr "  --help                          mostra esta ajuda e termina\n"
 
 #: vacuumdb.c:272
 #, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
 msgstr ""
-"  --version                       mostra informação sobre a versão e sai\n"
+"  --version                       mostra informação sobre a versão e "
+"termina\n"
 
 #: vacuumdb.c:278
 #, c-format
@@ -849,35 +856,22 @@ msgstr "%s: consulta falhou: %s"
 msgid "%s: query was: %s\n"
 msgstr "%s: consulta foi: %s\n"
 
-#. translator: Make sure the (y/n) prompts match the translation of this.
+#. translator: abbreviation for "yes"
 #: common.c:202
 msgid "y"
 msgstr "s"
 
-#. translator: Make sure the (y/n) prompts match the translation of this.
+#. translator: abbreviation for "no"
 #: common.c:204
 msgid "n"
 msgstr "n"
 
-#~ msgid "%s: unsupported language \"%s\"\n"
-#~ msgstr "%s: linguagem \"%s\" não é suportada\n"
-
-#~ msgid ""
-#~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
-#~ "plpythonu.\n"
-#~ msgstr ""
-#~ "Linguagens suportadas são plpgsql, pltcl, pltclu, plperl, plperlu e "
-#~ "plpythonu.\n"
-
-#~ msgid ""
-#~ "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-#~ msgstr ""
-#~ "  -L, --pglib=DIRETÓRIO     encontra arquivo interpretador da linguagem "
-#~ "no DIRETÓRIO\n"
-
-#~ msgid "%s: user ID must be a positive number\n"
-#~ msgstr "%s: ID do usuário deve ser um número positivo\n"
+#: common.c:215
+#, c-format
+msgid "%s (%s/%s) "
+msgstr "%s (%s/%s) "
 
-#~ msgid "  -i, --sysid=SYSID         select sysid for new user\n"
-#~ msgstr ""
-#~ "  -i, --sysid=SYSID         seleciona identificador para novo usuário\n"
+#: common.c:236
+#, c-format
+msgid "Please answer \"%s\" or \"%s\".\n"
+msgstr "Por favor responda \"%s\" ou \"%s\".\n"
diff --git a/src/bin/scripts/po/sv.po b/src/bin/scripts/po/sv.po
index d7b15d4f468..50458edd7f9 100644
--- a/src/bin/scripts/po/sv.po
+++ b/src/bin/scripts/po/sv.po
@@ -1,29 +1,29 @@
 # Swedish message translation file for postgresql
-# Dennis Björklund <db@zigo.dhs.org>, 2003, 2004, 2005.
+# Dennis Björklund <db@zigo.dhs.org>, 2003, 2004, 2005, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.1\n"
-"POT-Creation-Date: 2005-10-20 07:19-0300\n"
-"PO-Revision-Date: 2005-10-20 16:27+0200\n"
+"Project-Id-Version: PostgreSQL 8.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-06 19:14-0400\n"
+"PO-Revision-Date: 2006-11-07 12:08+0100\n"
 "Last-Translator: Dennis Björklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
-#: clusterdb.c:95 clusterdb.c:110 createdb.c:102 createdb.c:121
-#: createlang.c:86 createlang.c:107 createlang.c:153 createuser.c:150
-#: createuser.c:165 dropdb.c:84 dropdb.c:93 dropdb.c:101 droplang.c:96
-#: droplang.c:117 droplang.c:164 dropuser.c:84 dropuser.c:99 reindexdb.c:111
-#: reindexdb.c:125 vacuumdb.c:112 vacuumdb.c:127
+#: createdb.c:102 createdb.c:121 createlang.c:85 createlang.c:106
+#: createlang.c:152 createuser.c:157 createuser.c:172 dropdb.c:84 dropdb.c:93
+#: dropdb.c:101 droplang.c:96 droplang.c:117 droplang.c:164 dropuser.c:84
+#: dropuser.c:99 clusterdb.c:95 clusterdb.c:110 vacuumdb.c:112 vacuumdb.c:127
+#: reindexdb.c:111 reindexdb.c:125
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: clusterdb.c:108 createdb.c:119 createlang.c:105 createuser.c:163
-#: dropdb.c:99 droplang.c:115 dropuser.c:97 reindexdb.c:124 vacuumdb.c:125
+#: createdb.c:119 createlang.c:104 createuser.c:170 dropdb.c:99 droplang.c:115
+#: dropuser.c:97 clusterdb.c:108 vacuumdb.c:125 reindexdb.c:124
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: för många kommandoradsargument (första är \"%s\")\n"
@@ -38,12 +38,12 @@ msgstr "%s: \"%s\" är inte ett giltigt kodningsnamn\n"
 msgid "%s: database creation failed: %s"
 msgstr "%s: skapande av databas misslyckades: %s"
 
-#: createdb.c:197
+#: createdb.c:198
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
 msgstr "%s: skapande av kommentar misslyckades (databasen skapades): %s"
 
-#: createdb.c:218
+#: createdb.c:220
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -52,18 +52,22 @@ msgstr ""
 "%s skapar en PostgreSQL-databas.\n"
 "\n"
 
-#: clusterdb.c:234 createdb.c:219 createlang.c:204 createuser.c:304
-#: dropdb.c:148 droplang.c:321 dropuser.c:147 reindexdb.c:332 vacuumdb.c:260
+#: createdb.c:221 createlang.c:204 createuser.c:313 dropdb.c:146
+#: droplang.c:321 dropuser.c:145 clusterdb.c:234 vacuumdb.c:260
+#: reindexdb.c:332
+#, c-format
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: createdb.c:220
+#: createdb.c:222
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [FLAGGA]... [DBNAMN] [BESKRIVNING]\n"
 
-#: clusterdb.c:236 createdb.c:221 createlang.c:206 createuser.c:306
-#: dropdb.c:150 droplang.c:323 dropuser.c:149 reindexdb.c:334 vacuumdb.c:262
+#: createdb.c:223 createlang.c:206 createuser.c:315 dropdb.c:148
+#: droplang.c:323 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
+#: reindexdb.c:334
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -71,43 +75,54 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: createdb.c:222
+#: createdb.c:224
+#, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr "  -D, --tablespace=TABLESPACE  standardtabellutrymme för databasen\n"
 
-#: createdb.c:223
+#: createdb.c:225
+#, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=ENCODING      teckenkodning för databasen\n"
 
-#: createdb.c:224
+#: createdb.c:226
+#, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
-msgstr "  -O, --owner=ÄGARE            databasanvändare som blir ägare till databasen\n"
+msgstr ""
+"  -O, --owner=ÄGARE            databasanvändare som blir ägare till "
+"databasen\n"
 
-#: createdb.c:225
+#: createdb.c:227
+#, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=MALL          databasmall att kopiera från\n"
 
-#: createdb.c:226
+#: createdb.c:228
+#, c-format
 msgid ""
 "  -e, --echo                   show the commands being sent to the server\n"
 msgstr ""
 "  -e, --echo                   visa kommandon som skickas till servern\n"
 
-#: createdb.c:227
+#: createdb.c:229
+#, c-format
 msgid "  -q, --quiet                  don't write any messages\n"
 msgstr "  -q, --quiet                  skriv inte ut några meddelanden\n"
 
-#: createdb.c:228
+#: createdb.c:230
+#, c-format
 msgid "  --help                       show this help, then exit\n"
 msgstr "  --help                       visa denna hjälp, avsluta sedan\n"
 
-#: createdb.c:229
+#: createdb.c:231
+#, c-format
 msgid "  --version                    output version information, then exit\n"
 msgstr ""
 "  --version                    visa versionsinformation, avsluta sedan\n"
 
-#: clusterdb.c:244 createdb.c:230 createuser.c:326 reindexdb.c:344
-#: vacuumdb.c:273
+#: createdb.c:232 createuser.c:335 clusterdb.c:244 vacuumdb.c:273
+#: reindexdb.c:344
+#, c-format
 msgid ""
 "\n"
 "Connection options:\n"
@@ -115,33 +130,43 @@ msgstr ""
 "\n"
 "Anslutningsflaggor:\n"
 
-#: createdb.c:231
+#: createdb.c:233
+#, c-format
 msgid ""
 "  -h, --host=HOSTNAME          database server host or socket directory\n"
-msgstr "  -h, --host=VÄRDNAMN          databasens värdnamn eller uttag(socket)-katalog\n"
+msgstr ""
+"  -h, --host=VÄRDNAMN          databasens värdnamn eller uttag(socket)-"
+"katalog\n"
 
-#: createdb.c:232
+#: createdb.c:234
+#, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORT              databasens serverport\n"
 
-#: createdb.c:233
+#: createdb.c:235
+#, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=ANVÄNDARE     användarnamn att koppla upp som\n"
 
-#: createdb.c:234
+#: createdb.c:236
+#, c-format
 msgid "  -W, --password               prompt for password\n"
 msgstr "  -W, --password               fråga efter lösenord\n"
 
-#: createdb.c:235
+#: createdb.c:237
+#, c-format
 msgid ""
 "\n"
 "By default, a database with the same name as the current user is created.\n"
 msgstr ""
 "\n"
-"Som standard så skapas en databas med samma namn som det aktuella användarnamnet.\n"
+"Som standard så skapas en databas med samma namn som det aktuella "
+"användarnamnet.\n"
 
-#: clusterdb.c:250 createdb.c:236 createlang.c:216 createuser.c:333
-#: dropdb.c:160 droplang.c:333 dropuser.c:159 reindexdb.c:350 vacuumdb.c:279
+#: createdb.c:238 createlang.c:216 createuser.c:342 dropdb.c:158
+#: droplang.c:333 dropuser.c:157 clusterdb.c:250 vacuumdb.c:279
+#: reindexdb.c:350
+#, c-format
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -149,37 +174,37 @@ msgstr ""
 "\n"
 "Rapportera buggar till <pgsql-bugs@postgresql.org>.\n"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "Name"
 msgstr "Namn"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "yes"
 msgstr "ja"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "no"
 msgstr "nej"
 
-#: createlang.c:136 droplang.c:146
+#: createlang.c:135 droplang.c:146
 msgid "Trusted?"
 msgstr "Litas på?"
 
-#: createlang.c:143 droplang.c:153
+#: createlang.c:142 droplang.c:153
 msgid "Procedural Languages"
 msgstr "Procedurspråk"
 
-#: createlang.c:152 droplang.c:162
+#: createlang.c:151 droplang.c:162
 #, c-format
 msgid "%s: missing required argument language name\n"
 msgstr "%s: saknar språknamnsargument som krävs\n"
 
-#: createlang.c:174
+#: createlang.c:173
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%s: språket \"%s\" är redan installerat i databasen \"%s\"\n"
 
-#: createlang.c:188
+#: createlang.c:187
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: språkinstallation misslyckades: %s"
@@ -199,128 +224,155 @@ msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
 msgstr "  %s [FLAGGA]... SPRÅK [DBNAMN]\n"
 
 #: createlang.c:207
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DBNAMN       databas att installera språk i\n"
 
-#: clusterdb.c:240 createlang.c:208 createuser.c:322 dropdb.c:151
-#: droplang.c:325 dropuser.c:150 reindexdb.c:340
+#: createlang.c:208 createuser.c:331 dropdb.c:149 droplang.c:325
+#: dropuser.c:148 clusterdb.c:240 reindexdb.c:340
+#, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                visa kommandon som skickas till servern\n"
 
 #: createlang.c:209 droplang.c:326
+#, c-format
 msgid ""
 "  -l, --list                show a list of currently installed languages\n"
 msgstr "  -l, --list                lista språk som är installerade nu\n"
 
-#: clusterdb.c:245 createlang.c:210 createuser.c:327 dropdb.c:154
-#: droplang.c:327 dropuser.c:153 reindexdb.c:345 vacuumdb.c:274
+#: createlang.c:210 createuser.c:336 dropdb.c:152 droplang.c:327
+#: dropuser.c:151 clusterdb.c:245 vacuumdb.c:274 reindexdb.c:345
+#, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
-msgstr "  -h, --host=VÄRDNAMN       databasens värdnamn eller uttag(socket)-katalog\n"
+msgstr ""
+"  -h, --host=VÄRDNAMN       databasens värdnamn eller uttag(socket)-katalog\n"
 
-#: clusterdb.c:246 createlang.c:211 createuser.c:328 dropdb.c:155
-#: droplang.c:328 dropuser.c:154 reindexdb.c:346 vacuumdb.c:275
+#: createlang.c:211 createuser.c:337 dropdb.c:153 droplang.c:328
+#: dropuser.c:152 clusterdb.c:246 vacuumdb.c:275 reindexdb.c:346
+#, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT           databasens serverport\n"
 
-#: clusterdb.c:247 createlang.c:212 dropdb.c:156 droplang.c:329
-#: reindexdb.c:347 vacuumdb.c:276
+#: createlang.c:212 dropdb.c:154 droplang.c:329 clusterdb.c:247 vacuumdb.c:276
+#: reindexdb.c:347
+#, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=ANVÄNDARE  användarnamn att koppla upp som\n"
 
-#: clusterdb.c:248 createlang.c:213 dropdb.c:157 droplang.c:330
-#: reindexdb.c:348 vacuumdb.c:277
+#: createlang.c:213 dropdb.c:155 droplang.c:330 clusterdb.c:248 vacuumdb.c:277
+#: reindexdb.c:348
+#, c-format
 msgid "  -W, --password            prompt for password\n"
 msgstr "  -W, --password            fråga efter lösenord\n"
 
-#: clusterdb.c:242 createlang.c:214 createuser.c:324 dropdb.c:158
-#: droplang.c:331 dropuser.c:157 reindexdb.c:342
+#: createlang.c:214 createuser.c:333 dropdb.c:156 droplang.c:331
+#: dropuser.c:155 clusterdb.c:242 reindexdb.c:342
+#, c-format
 msgid "  --help                    show this help, then exit\n"
 msgstr "  --help                    visa denna hjälpen, avsluta sedan\n"
 
-#: clusterdb.c:243 createlang.c:215 createuser.c:325 dropdb.c:159
-#: droplang.c:332 dropuser.c:158 reindexdb.c:343
+#: createlang.c:215 createuser.c:334 dropdb.c:157 droplang.c:332
+#: dropuser.c:156 clusterdb.c:243 reindexdb.c:343
+#, c-format
 msgid "  --version                 output version information, then exit\n"
 msgstr "  --version                 visa versionsinformation, avsluta sedan\n"
 
-#: createuser.c:170
+#: createuser.c:177
 msgid "Enter name of role to add: "
 msgstr "Mata in namn på rollen som skall läggas till: "
 
-#: createuser.c:177
+#: createuser.c:184
 msgid "Enter password for new role: "
 msgstr "Mata in lösenord för den nya rollen: "
 
-#: createuser.c:178
+#: createuser.c:185
 msgid "Enter it again: "
 msgstr "Mata in det igen: "
 
-#: createuser.c:181
+#: createuser.c:188
+#, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Lösenorden matchade inte.\n"
 
-#: createuser.c:192
-msgid "Shall the new role be a superuser? (y/n) "
-msgstr "Skall den nya rollen vara en superanvändare? (j/n) "
+#: createuser.c:197
+msgid "Shall the new role be a superuser?"
+msgstr "Skall den nya rollen vara en superanvändare?"
 
-#: createuser.c:210
-msgid "Shall the new role be allowed to create databases? (y/n) "
-msgstr "Skall den nya rollen tillåtas skapa databaser? (j/n) "
+#: createuser.c:212
+msgid "Shall the new role be allowed to create databases?"
+msgstr "Skall den nya rollen tillåtas skapa databaser?"
 
-#: createuser.c:221
-msgid "Shall the new role be allowed to create more new roles? (y/n) "
-msgstr "Skall den nya rollen tillåtas skapa fler nya roller? (j/n) "
+#: createuser.c:220
+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:253
+#, c-format
+msgid "Password encryption failed.\n"
+msgstr "Lösenordskryptering misslyckades.\n"
 
-#: createuser.c:284
+#: createuser.c:292
 #, c-format
 msgid "%s: creation of new role failed: %s"
 msgstr "%s: skapande av ny roll misslyckades: %s"
 
-#: createuser.c:303
+#: createuser.c:312
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL role.\n"
 "\n"
-msgstr "%s skapar en ny PostgreSQL-roll.\n\n"
+msgstr ""
+"%s skapar en ny PostgreSQL-roll.\n"
+"\n"
 
-#: createuser.c:305 dropuser.c:148
+#: createuser.c:314 dropuser.c:146
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [FLAGGA]... [ROLLNAMN]\n"
 
-#: createuser.c:307
+#: createuser.c:316
+#, c-format
 msgid "  -s, --superuser           role will be superuser\n"
 msgstr "  -s, --superuser           rollen är en superanvändare\n"
 
-#: createuser.c:308
+#: createuser.c:317
+#, c-format
 msgid "  -S, --no-superuser        role will not be superuser\n"
 msgstr "  -S, --no-superuser        rollen är inte en superanvändare\n"
 
-#: createuser.c:309
+#: createuser.c:318
+#, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb            rollen kan skapa nya databaser\n"
 
-#: createuser.c:310
+#: createuser.c:319
+#, c-format
 msgid "  -D, --no-createdb         role cannot create databases\n"
 msgstr "  -D, --no-createdb         rollen kan inte skapa nya databaser\n"
 
-#: createuser.c:311
+#: createuser.c:320
+#, c-format
 msgid "  -r, --createrole          role can create new roles\n"
 msgstr "  -r, --createrole          rollen kan skapa nya roller\n"
 
-#: createuser.c:312
+#: createuser.c:321
+#, c-format
 msgid "  -R, --no-createrole       role cannot create roles\n"
 msgstr "  -R, --no-createrole       rollen kan inte skapa roller\n"
 
-#: createuser.c:313
+#: createuser.c:322
+#, c-format
 msgid "  -l, --login               role can login (default)\n"
 msgstr "  -l, --login               rollen kan logga in (standard)\n"
 
-#: createuser.c:314
+#: createuser.c:323
+#, c-format
 msgid "  -L, --no-login            role cannot login\n"
 msgstr "  -L, --no-login            rollen kan inte logga in\n"
 
-#: createuser.c:315
+#: createuser.c:324
+#, c-format
 msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
 "                            member of (default)\n"
@@ -328,33 +380,42 @@ msgstr ""
 "  -i, --inherit             rollen ärver rättigheter från roller som den är\n"
 "                            en medlem till (standard)\n"
 
-#: createuser.c:317
+#: createuser.c:326
+#, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
 msgstr "  -I, --no-inherit          rollen ärver inte rättigheter\n"
 
-#: createuser.c:318
+#: createuser.c:327
+#, 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"
+msgstr ""
+"  -c, --connection-limit=N  anslutningstak för rollen (standard: ingen "
+"gräns)\n"
 
-#: createuser.c:319
+#: createuser.c:328
+#, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
 msgstr "  -P, --pwprompt            sätt ett lösenord på den nya rollen\n"
 
-#: createuser.c:320
+#: createuser.c:329
+#, c-format
 msgid "  -E, --encrypted           encrypt stored password\n"
 msgstr "  -E, --encrypted           spara lösenordet krypterat\n"
 
-#: createuser.c:321
+#: createuser.c:330
+#, c-format
 msgid "  -N, --unencrypted         do not encrypt stored password\n"
 msgstr "  -N, --unencrypted         spara lösenordet okrypterat\n"
 
-#: clusterdb.c:241 createuser.c:323 dropdb.c:153 dropuser.c:152
+#: createuser.c:332 dropdb.c:151 dropuser.c:150 clusterdb.c:241
 #: reindexdb.c:341
+#, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               skriv inte ut några meddelanden\n"
 
-#: createuser.c:329
+#: createuser.c:338
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr ""
@@ -362,11 +423,13 @@ msgstr ""
 "                            användarnamn att koppla upp som\n"
 "                            (inte den som skall skapas)\n"
 
-#: createuser.c:330 dropuser.c:156
+#: createuser.c:339 dropuser.c:154
+#, c-format
 msgid "  -W, --password            prompt for password to connect\n"
 msgstr "  -W, --password            fråga efter lösenord för att koppla upp\n"
 
-#: createuser.c:331
+#: createuser.c:340
+#, c-format
 msgid ""
 "\n"
 "If one of -s, -S, -d, -D, -r, -R and ROLENAME is not specified, you will\n"
@@ -381,21 +444,21 @@ msgstr ""
 msgid "%s: missing required argument database name\n"
 msgstr "%s: saknar databasnamn vilket krävs\n"
 
-#: dropdb.c:109
+#: dropdb.c:107
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
 msgstr "Databasen \"%s\" kommer att bli permanent borttagen.\n"
 
-#: dropdb.c:110 dropuser.c:111
-msgid "Are you sure? (y/n) "
-msgstr "Är du säker? (j/n) "
+#: dropdb.c:108 dropuser.c:109
+msgid "Are you sure?"
+msgstr "Är du säker?"
 
-#: dropdb.c:128
+#: dropdb.c:125
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: borttagning av databas misslyckades: %s"
 
-#: dropdb.c:147
+#: dropdb.c:145
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -404,27 +467,30 @@ msgstr ""
 "%s tar bort en PostgreSQL-databas.\n"
 "\n"
 
-#: dropdb.c:149
+#: dropdb.c:147
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [FLAGGA]... DBNAMN\n"
 
-#: dropdb.c:152 dropuser.c:151
+#: dropdb.c:150 dropuser.c:149
+#, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         fråga innan något tas bort\n"
 
-#: droplang.c:193
+#: droplang.c:192
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%s: språk \"%s\" är inte installerat i databas \"%s\"\n"
 
-#: droplang.c:213
+#: droplang.c:212
 #, c-format
 msgid ""
 "%s: still %s functions declared in language \"%s\"; language not removed\n"
-msgstr "%s: fortfarande %s funktioner deklarerade i språket \"%s\"; språket inte borttaget\n"
+msgstr ""
+"%s: fortfarande %s funktioner deklarerade i språket \"%s\"; språket inte "
+"borttaget\n"
 
-#: droplang.c:306
+#: droplang.c:305
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: borttagning av språk misslyckades: %s"
@@ -439,32 +505,37 @@ msgstr ""
 "\n"
 
 #: droplang.c:324
+#, c-format
 msgid ""
 "  -d, --dbname=DBNAME       database from which to remove the language\n"
-msgstr "  -d, --dbname=DBNAMN       databasen som vi skall ta bort språket från\n"
+msgstr ""
+"  -d, --dbname=DBNAMN       databasen som vi skall ta bort språket från\n"
 
 #: dropuser.c:104
 msgid "Enter name of role to drop: "
 msgstr "Mata in namn på rollen som skall tas bort: "
 
-#: dropuser.c:110
+#: dropuser.c:108
 #, c-format
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "Rollen \"%s\" kommer ett bli permanent borttagen.\n"
 
-#: dropuser.c:127
+#: dropuser.c:124
 #, c-format
 msgid "%s: removal of role \"%s\" failed: %s"
 msgstr "%s: borttagning av roll \"%s\" misslyckades: %s"
 
-#: dropuser.c:146
+#: dropuser.c:144
 #, c-format
 msgid ""
 "%s removes a PostgreSQL role.\n"
 "\n"
-msgstr "%s tar bort en PostgreSQL-roll.\n\n"
+msgstr ""
+"%s tar bort en PostgreSQL-roll.\n"
+"\n"
 
-#: dropuser.c:155
+#: dropuser.c:153
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr ""
@@ -505,24 +576,28 @@ msgstr ""
 "%s klustrar alla tidigare klustrade tabeller i en database.\n"
 "\n"
 
-#: clusterdb.c:235 reindexdb.c:333 vacuumdb.c:261
+#: clusterdb.c:235 vacuumdb.c:261 reindexdb.c:333
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [FLAGGA]... [DBNAMN]\n"
 
 #: clusterdb.c:237
+#, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 klustra alla databaser\n"
 
 #: clusterdb.c:238
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       databas att klustra\n"
 
 #: clusterdb.c:239
+#, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr "  -t, --table=TABLE         klustra enbart specifik tabell\n"
 
 #: clusterdb.c:249
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command CLUSTER for details.\n"
@@ -565,28 +640,34 @@ msgstr ""
 "\n"
 
 #: vacuumdb.c:263
+#, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       kör vacuum på alla databaser\n"
 
 #: vacuumdb.c:264
+#, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAMN             databas att köra vacuum på\n"
 
 #: vacuumdb.c:265
+#, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr ""
 "  -t, --table='TABELL[(KOLUMNER)]'\n"
 "                                 kör vakum enbart på specifik tabell\n"
 
 #: vacuumdb.c:266
+#, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      kör full vacuum\n"
 
 #: vacuumdb.c:267
+#, c-format
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr "  -z, --analyze                   updatera optimeringsstatistik\n"
 
 #: vacuumdb.c:268
+#, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
@@ -594,24 +675,29 @@ msgstr ""
 "  -e, --echo                      visa kommandon som skickas till servern\n"
 
 #: vacuumdb.c:269
+#, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     skriv inte ut några meddelanden\n"
 
 #: vacuumdb.c:270
+#, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   skriv massor med utdata\n"
 
 #: vacuumdb.c:271
+#, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          visa denna hjälp, avsluta sedan\n"
 
 #: vacuumdb.c:272
+#, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
 msgstr ""
 "  --version                       visa versionsinformation, avsluta sedan\n"
 
 #: vacuumdb.c:278
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command VACUUM for details.\n"
@@ -622,12 +708,14 @@ msgstr ""
 #: reindexdb.c:133
 #, c-format
 msgid "%s: cannot reindex all databases and a specific one at the same time\n"
-msgstr "%s: kan inte omindexera alla databaser och en specifik databas på en gång\n"
+msgstr ""
+"%s: kan inte omindexera alla databaser och en specifik databas på en gång\n"
 
 #: reindexdb.c:138
 #, c-format
 msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
-msgstr "%s: kan inte omindexera alla databaser och systemkatalogerna samtidigt\n"
+msgstr ""
+"%s: kan inte omindexera alla databaser och systemkatalogerna samtidigt\n"
 
 #: reindexdb.c:143
 #, c-format
@@ -643,13 +731,15 @@ msgstr "%s: kan inte omindexera ett specifikt index i alla databaser\n"
 #, c-format
 msgid ""
 "%s: cannot reindex a specific table and system catalogs at the same time\n"
-msgstr "%s: kan inte omindexera en specifik tabell och systemkatalogerna samtidigt\n"
+msgstr ""
+"%s: kan inte omindexera en specifik tabell och systemkatalogerna samtidigt\n"
 
 #: reindexdb.c:164
 #, c-format
 msgid ""
 "%s: cannot reindex a specific index and system catalogs at the same time\n"
-msgstr "%s: kan inte omindexera ett specifikt index och systemkatalogerna samtidigt\n"
+msgstr ""
+"%s: kan inte omindexera ett specifikt index och systemkatalogerna samtidigt\n"
 
 #: reindexdb.c:239
 #, c-format
@@ -681,33 +771,43 @@ msgstr "%s: omindexering av systemkatalogerna misslyckades: %s"
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
 "\n"
-msgstr "%s omindexerar en PostgreSQL-databas.\n\n"
+msgstr ""
+"%s omindexerar en PostgreSQL-databas.\n"
+"\n"
 
 #: reindexdb.c:335
+#, c-format
 msgid "  -a, --all                 reindex all databases\n"
 msgstr "  -a, --all                 omindexera alla databaser\n"
 
 #: reindexdb.c:336
+#, c-format
 msgid "  -s, --system              reindex system catalogs\n"
 msgstr "  -s, --system              omindexera systemkatalogerna\n"
 
 #: reindexdb.c:337
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to reindex\n"
 msgstr "  -d, --dbname=DBNAME       databas att omindexera\n"
 
 #: reindexdb.c:338
+#, c-format
 msgid "  -t, --table=TABLE         reindex specific table only\n"
 msgstr "  -t, --table=TABLE         omindexera enbart specifik tabell\n"
 
 #: reindexdb.c:339
+#, c-format
 msgid "  -i, --index=INDEX         recreate specific index only\n"
 msgstr "  -i, --index=INDEX         omindexera enbart specifikt index\n"
 
 #: reindexdb.c:349
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command REINDEX for details.\n"
-msgstr "\nLäs beskrivningen av SQL-kommandot REINDEX för detaljer.\n"
+msgstr ""
+"\n"
+"Läs beskrivningen av SQL-kommandot REINDEX för detaljer.\n"
 
 #: common.c:39
 #, c-format
@@ -743,13 +843,22 @@ msgstr "%s: fråga misslyckades: %s"
 msgid "%s: query was: %s\n"
 msgstr "%s: fråga var: %s\n"
 
-#. translator: Make sure the (y/n) prompts match the translation of this.
+#. translator: abbreviation for "yes"
 #: common.c:202
 msgid "y"
 msgstr "j"
 
-#. translator: Make sure the (y/n) prompts match the translation of this.
+#. translator: abbreviation for "no"
 #: common.c:204
 msgid "n"
 msgstr "n"
 
+#: common.c:215
+#, c-format
+msgid "%s (%s/%s) "
+msgstr "%s (%s/%s) "
+
+#: common.c:236
+#, c-format
+msgid "Please answer \"%s\" or \"%s\".\n"
+msgstr "Var vänlig och svara \"%s\" eller \"%s\".\n"