diff --git a/src/bin/initdb/po/sv.po b/src/bin/initdb/po/sv.po
index 57e5794df60c66647b55cf906d801193abb98b95..5bfa87b70709d909484af7b03587a021a2540bcc 100644
--- a/src/bin/initdb/po/sv.po
+++ b/src/bin/initdb/po/sv.po
@@ -7,50 +7,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-25 00:18+0200\n"
-"PO-Revision-Date: 2004-06-25 00:20+0200\n"
+"POT-Creation-Date: 2004-06-25 09:38+0200\n"
+"PO-Revision-Date: 2004-06-25 09:42+0200\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"
 
-#: initdb.c:219 initdb.c:233
+#: initdb.c:220 initdb.c:234
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: slut p� minnet\n"
 
-#: initdb.c:339
+#: initdb.c:340 initdb.c:1110
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: kunde inte �ppna filen \"%s\" f�r l�sning: %s\n"
 
-#: initdb.c:397
+#: initdb.c:398
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: kunde inte �ppna filen \"%s\" f�r skrivning: %s\n"
 
-#: initdb.c:525 initdb.c:534 initdb.c:542
+#: initdb.c:526 initdb.c:535 initdb.c:543
 #, c-format
 msgid "%s: failed\n"
 msgstr "%s: misslyckades\n"
 
-#: initdb.c:531
+#: initdb.c:532
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: tar bort datakatalog \"%s\"\n"
 
-#: initdb.c:539
+#: initdb.c:540
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: tar bort inneh�llet i datakatalog \"%s\"\n"
 
-#: initdb.c:550
+#: initdb.c:551
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: datakatalog \"%s\" ej borttagen p� anv�ndarens beg�ran\n"
 
-#: initdb.c:576
+#: initdb.c:577
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -61,12 +61,12 @@ msgstr ""
 "Logga in (dvs. anv�nd \"su\") som den (ickepriviligerade) anv�ndaren som\n"
 "skall �ga serverprocessen.\n"
 
-#: initdb.c:620
+#: initdb.c:621
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" �r inte ett giltigt kodningsnamn f�r servern\n"
 
-#: initdb.c:744
+#: initdb.c:745
 #, c-format
 msgid ""
 "%s: file \"%s\" does not exist\n"
@@ -77,26 +77,26 @@ msgstr ""
 "Det betyder att du har en korrupt installation eller att du angivit\n"
 "fel katalog till flaggan -L\n"
 
-#: initdb.c:809
+#: initdb.c:810
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "v�ljer initialt v�rde f�r max_connections ... "
 
-#: initdb.c:845
+#: initdb.c:846
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "v�ljer initialt v�rde f�r shared_buffers ... "
 
-#: initdb.c:878
+#: initdb.c:879
 msgid "creating configuration files ... "
 msgstr "skapar konfigurationsfiler ..."
 
-#: initdb.c:956
+#: initdb.c:957
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "skapar databasen template1 i %s/base/1 ... "
 
-#: initdb.c:972
+#: initdb.c:973
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -106,91 +106,96 @@ msgstr ""
 "Kontrollera din installation eller ange den korrekta katalogen\n"
 "med hj�lp av flaggan -L.\n"
 
-#: initdb.c:1048
+#: initdb.c:1049
 msgid "initializing pg_shadow ... "
 msgstr "initierar pg_shadow ... "
 
-#: initdb.c:1079
+#: initdb.c:1085
 msgid "Enter new superuser password: "
 msgstr "Mata in ett nytt l�senord f�r superanv�ndaren: "
 
-#: initdb.c:1080
+#: initdb.c:1086
 msgid "Enter it again: "
 msgstr "Mata in det igen: "
 
-#: initdb.c:1083
+#: initdb.c:1089
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "L�senorden st�mde inte �verens.\n"
 
-#: initdb.c:1088
+#: initdb.c:1116
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: kunde inte l�sa l�senordet fr�n filen \"%s\": %s\n"
+
+#: initdb.c:1129
 #, c-format
 msgid "setting password ... "
 msgstr "sparar l�senord ... "
 
-#: initdb.c:1112
+#: initdb.c:1153
 #, c-format
 msgid "%s: The password file was not generated. Please report this problem.\n"
 msgstr ""
 "%s: L�senordsfilen skapades inte. Var v�nlig och rapportera detta felet.\n"
 
-#: initdb.c:1142
+#: initdb.c:1183
 msgid "enabling unlimited row size for system tables ... "
 msgstr "sl�r p� obegr�nsad radstorlek f�r systemtabeller ... "
 
-#: initdb.c:1215
+#: initdb.c:1256
 msgid "initializing pg_depend ... "
 msgstr "initierar pg_depend ... "
 
-#: initdb.c:1243
+#: initdb.c:1284
 msgid "creating system views ... "
 msgstr "skapar systemvyer ... "
 
-#: initdb.c:1280
+#: initdb.c:1321
 msgid "loading pg_description ... "
 msgstr "laddar pg_description ... "
 
-#: initdb.c:1328
+#: initdb.c:1369
 msgid "creating conversions ... "
 msgstr "skapar konverteringar ... "
 
-#: initdb.c:1384
+#: initdb.c:1425
 msgid "setting privileges on built-in objects ... "
 msgstr "s�tter r�ttigheter f�r inbyggda objekt ... "
 
-#: initdb.c:1442
+#: initdb.c:1483
 msgid "creating information schema ... "
 msgstr "skapar informationsschema ... "
 
-#: initdb.c:1504
+#: initdb.c:1545
 msgid "vacuuming database template1 ... "
 msgstr "k�r vacuum p� databasen template1 ... "
 
-#: initdb.c:1560
+#: initdb.c:1601
 msgid "copying template1 to template0 ... "
 msgstr "kopierar template1 till template0 ... "
 
-#: initdb.c:1617
+#: initdb.c:1658
 #, c-format
 msgid "caught signal\n"
 msgstr "f�ngade signal\n"
 
-#: initdb.c:1622
+#: initdb.c:1663
 #, c-format
 msgid "could not write to child process\n"
 msgstr "kunde inte skriva till barnprocess\n"
 
-#: initdb.c:1628
+#: initdb.c:1669
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:1658
+#: initdb.c:1699
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: ok�nt lokalnamn \"%s\"\n"
 
-#: initdb.c:1725
+#: initdb.c:1766
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -199,17 +204,17 @@ msgstr ""
 "%s initierar ett PostgreSQL databaskluster.\n"
 "\n"
 
-#: initdb.c:1726
+#: initdb.c:1767
 #, c-format
 msgid "Usage:\n"
 msgstr "Anv�ndning:\n"
 
-#: initdb.c:1727
+#: initdb.c:1768
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [FLAGGA]... [DATAKATALOG]\n"
 
-#: initdb.c:1728
+#: initdb.c:1769
 #, c-format
 msgid ""
 "\n"
@@ -218,23 +223,23 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: initdb.c:1729
+#: initdb.c:1770
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATAKATALOG plats f�r detta databaskluster\n"
 
-#: initdb.c:1730
+#: initdb.c:1771
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=KODNING    s�tt standardkodning f�r nya databaser\n"
 
-#: initdb.c:1731
+#: initdb.c:1772
 #, c-format
 msgid ""
 "  --locale=LOCALE           initialize database cluster with given locale\n"
 msgstr "  --locale=LOKAL            initiera databasklustret med given lokal\n"
 
-#: initdb.c:1732
+#: initdb.c:1773
 #, c-format
 msgid ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
@@ -249,35 +254,39 @@ msgstr ""
 "                            i respektive kategori (standard tagen fr�n\n"
 "                            omgivningen)\n"
 
-#: initdb.c:1737
+#: initdb.c:1778
 #, c-format
 msgid "  --no-locale               equivalent to --locale=C\n"
 msgstr "  --no-locale               samma som --locale=C\n"
 
-#: initdb.c:1738
+#: initdb.c:1779
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAMN       databasens superanv�ndarnamn\n"
 
-#: initdb.c:1739
+#: initdb.c:1780
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
-msgstr ""
-"  -W, --pwprompt            fr�ga efter l�senord f�r den nya "
-"superanv�ndaren\n"
+msgstr "  -W, --pwprompt            fr�ga efter l�senord f�r den nya superanv�ndaren\n"
 
-#: initdb.c:1740
+#: initdb.c:1781
+#, c-format
+msgid ""
+"  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=filnamn          l�s in l�senord f�r nya superanv�ndaren fr�n fil\n"
+
+#: initdb.c:1782
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                visa den h�r hj�lpen, avsluta sedan\n"
 
-#: initdb.c:1741
+#: initdb.c:1783
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             visa versionsinformation, avsluta sedan\n"
 
-#: initdb.c:1742
+#: initdb.c:1784
 #, c-format
 msgid ""
 "\n"
@@ -286,27 +295,27 @@ msgstr ""
 "\n"
 "Mindre vanliga flaggor:\n"
 
-#: initdb.c:1743
+#: initdb.c:1785
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               generera massor med debugutskrifter\n"
 
-#: initdb.c:1744
+#: initdb.c:1786
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                visa interna inst�llningar\n"
 
-#: initdb.c:1745
+#: initdb.c:1787
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L KATALOG                var indatafilerna kan hittas\n"
 
-#: initdb.c:1746
+#: initdb.c:1788
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             st�da inte upp efter fel\n"
 
-#: initdb.c:1747
+#: initdb.c:1789
 #, c-format
 msgid ""
 "\n"
@@ -316,7 +325,7 @@ msgstr ""
 "\n"
 "On datakatalogen inte anges s� tas den fr�n omgivningsvaribeln PGDATA.\n"
 
-#: initdb.c:1749
+#: initdb.c:1791
 #, c-format
 msgid ""
 "\n"
@@ -325,27 +334,32 @@ msgstr ""
 "\n"
 "Rapportera buggar till<pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:1827
+#: initdb.c:1870
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "K�r i debug-l�ge.\n"
 
-#: initdb.c:1831
+#: initdb.c:1874
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "K�r i noclean-l�ge. Misstag kommer inte st�das upp.\n"
 
-#: initdb.c:1864 initdb.c:1881
+#: initdb.c:1910 initdb.c:1927
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "F�rs�k med \"%s --help\" f�r mer information.\n"
 
-#: initdb.c:1879
+#: initdb.c:1925
 #, 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"
 
-#: initdb.c:1896
+#: initdb.c:1933
+#, c-format
+msgid "%s: you cannot specify both password prompt and password file\n"
+msgstr "%s: du kan inte ange b�de l�senordsfr�ga och l�senordsfil\n"
+
+#: initdb.c:1948
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -358,7 +372,7 @@ msgstr ""
 "lagras. G�r detta antingen med flaggan -D eller genom att s�tta\n"
 "omgivningsvariabeln PGDATA.\n"
 
-#: initdb.c:1922
+#: initdb.c:1974
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the same "
@@ -368,22 +382,23 @@ msgstr ""
 "Programmet \"postgres\" beh�vs av %s men kunde inte hittas i samma\n"
 "katalog som \"%s\". Kontrollera din installation.\n"
 
-#: initdb.c:1928
+#: initdb.c:1980
 #, c-format
 msgid ""
 "The program \"postgres\" was found by %s but was not the same version as \"%s"
 "\".\n"
 "Check your installation.\n"
 msgstr ""
-"Programmet \"postgres\" hittades av %s men hade inte samma version som \"%s\".\n"
+"Programmet \"postgres\" hittades av %s men hade inte samma version som \"%s"
+"\".\n"
 "Kontrollera din installation.\n"
 
-#: initdb.c:1949
+#: initdb.c:2001
 #, c-format
 msgid "%s: could not determine valid short version string\n"
 msgstr "%s: kunde inte fastst�lla en giltig kort versionsstr�ng\n"
 
-#: initdb.c:2001
+#: initdb.c:2053
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -394,7 +409,7 @@ msgstr ""
 "Denna anv�ndare m�ste ocks� k�ra server-processen.\n"
 "\n"
 
-#: initdb.c:2014
+#: initdb.c:2066
 #, c-format
 msgid ""
 "The database cluster will be initialized with locale %s.\n"
@@ -403,7 +418,7 @@ msgstr ""
 "Databasklustret kommer initieras med lokalen %s.\n"
 "\n"
 
-#: initdb.c:2019
+#: initdb.c:2071
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -424,17 +439,17 @@ msgstr ""
 "  TIME:     %s\n"
 "\n"
 
-#: initdb.c:2064
+#: initdb.c:2116
 #, c-format
 msgid "creating directory %s ... "
 msgstr "skapar katalog %s ... "
 
-#: initdb.c:2078
+#: initdb.c:2130
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "s�tter r�ttigheter p� existerande katalog %s ... "
 
-#: initdb.c:2096
+#: initdb.c:2148
 #, c-format
 msgid ""
 "%s: directory \"%s\" exists but is not empty\n"
@@ -448,12 +463,12 @@ msgstr ""
 "�n \"%s\".\n"
 "\n"
 
-#: initdb.c:2113
+#: initdb.c:2165
 #, c-format
 msgid "creating directory %s/%s ... "
 msgstr "skapar katalog %s/%s ... "
 
-#: initdb.c:2171
+#: initdb.c:2223
 #, c-format
 msgid ""
 "\n"