diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index e5b4d1fc99..6b2b72a785 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.8 2004/07/30 05:28:31 petere Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.9 2004/08/02 15:17:16 petere Exp $
 CATALOG_NAME	:= initdb
-AVAIL_LANGUAGES	:= de fr it pt_BR ru sv zh_TW
+AVAIL_LANGUAGES	:= de fr it pt_BR ru sk sv zh_TW
 GETTEXT_FILES	:= initdb.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/initdb/po/sk.po b/src/bin/initdb/po/sk.po
new file mode 100644
index 0000000000..5ccd814cbf
--- /dev/null
+++ b/src/bin/initdb/po/sk.po
@@ -0,0 +1,535 @@
+# translation of initdb-sk.po to slovak
+# translation of initdb.po to slovak
+# translation of initdb.po to
+# , 2004.
+# , 2004.
+# Zoltan Bartko <bartko.zoltan@pobox.sk>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: initdb-sk\n"
+"POT-Creation-Date: 2004-08-02 07:22-0300\n"
+"PO-Revision-Date: 2004-08-02 15:10+0200\n"
+"Last-Translator: Zoltan Bartko <bartko.zoltan@pobox.sk>\n"
+"Language-Team: slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: initdb.c:233 initdb.c:247
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatok pamäte\n"
+
+#: initdb.c:329 initdb.c:1300
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nebolo možné otvoriť súbor \"%s\" pre čítanie: %s\n"
+
+#: initdb.c:387
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: nebolo možné otvoriť súbor \"%s\" pre zápis: %s\n"
+
+#: initdb.c:515 initdb.c:524 initdb.c:532
+#, c-format
+msgid "%s: failed\n"
+msgstr "%s: neúspešné\n"
+
+#: initdb.c:521
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: odstraňuje sa dátový adresár \"%s\"\n"
+
+#: initdb.c:529
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: odstraňuje sa obsah dátového adresára \"%s\"\n"
+
+#: initdb.c:540
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: obsah dátového adresára \"%s\" neodstránený na požiadanie užívateľa\n"
+
+#: initdb.c:566
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: nie je možné spustiť ako root\n"
+"Prosím, prihláste sa (t.j. použite príkaz \"su\") ako (neprivilegovaný) "
+"užívateľ,\n"
+"ktorý bude vlastníkom procesu servera.\n"
+
+#: initdb.c:617
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" nie je platný názov kódovania servera\n"
+
+#: initdb.c:772
+#, c-format
+msgid "%s: warning: encoding mismatch\n"
+msgstr "%s: varovanie: rozdielne kódovanie\n"
+
+#: initdb.c:774
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the selected\n"
+"locale uses (%s) are not known to match.  This may lead to\n"
+"misbehavior in various character string processing functions.  To fix\n"
+"this situation, rerun %s and either do not specify an encoding\n"
+"explicitly, or choose a matching combination.\n"
+msgstr ""
+"Kódovanie, ktoré ste zvolili (%s) a kódovanie, ktoré sa používa v národných\n"
+"nastaveniach (%s) sú nezlučiteľné. Môže to viesť k neželanému chovaniu \n"
+"v rôznych funkciách pre spracovanie reťazcov. Pre napravenie situácie "
+"treba \n"
+"opätovne spustiť %s a buď nezadať kódovanie explicitne alebo zvoliť "
+"zlúčiteľnú\n"
+"kombináciu.\n"
+
+#: initdb.c:926
+#, c-format
+msgid ""
+"%s: file \"%s\" does not exist\n"
+"This means you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"%s: súbor \"%s\" neexistuje\n"
+"To znamená, že máte porušenú inštaláciu alebo ste označili\n"
+"nesprávny adresár pri voľbe spustenia -L.\n"
+
+#: initdb.c:991
+msgid "selecting default max_connections ... "
+msgstr "nastavuje sa implicitná hodnota max_connections ... "
+
+#: initdb.c:1027
+msgid "selecting default shared_buffers ... "
+msgstr "nastavuje sa implicitná hodnota shared_buffers ... "
+
+#: initdb.c:1060
+msgid "creating configuration files ... "
+msgstr "vytvárajú sa konfiguračné súbory ... "
+
+#: initdb.c:1147
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "vytvára sa databáza template1 v %s/base/1 ... "
+
+#: initdb.c:1163
+#, c-format
+msgid ""
+"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
+"Check your installation or specify the correct path using the option -L.\n"
+msgstr ""
+"%s: vstupný súbor \"%s\" nie je vlastníctvom PostgreSQL %s\n"
+"Prekontrolujte inštaláciu alebo zadajte správnu cestu použitím voľby -L.\n"
+
+#: initdb.c:1239
+msgid "initializing pg_shadow ... "
+msgstr "inicializuje sa pg_shadow ... "
+
+#: initdb.c:1275
+msgid "Enter new superuser password: "
+msgstr "Zadajte nové heslo superužívateľa: "
+
+#: initdb.c:1276
+msgid "Enter it again: "
+msgstr "Zadajte ho ešte raz: "
+
+#: initdb.c:1279
+msgid "Passwords didn't match.\n"
+msgstr "Heslá neboli totožné.\n"
+
+#: initdb.c:1306
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: nebolo možné čítať zo súboru hesiel \"%s\": %s\n"
+
+#: initdb.c:1319
+msgid "setting password ... "
+msgstr "nastavuje sa heslo ... "
+
+#: initdb.c:1343
+#, c-format
+msgid "%s: The password file was not generated. Please report this problem.\n"
+msgstr "%s: Súbor hesiel sa nevygeneroval. Prosím, oznámte tento problém autorom.\n"
+
+#: initdb.c:1373
+msgid "enabling unlimited row size for system tables ... "
+msgstr "Povoľuje sa neobmedzená veľkosť riadkov pre systémové tabuľky ... "
+
+#: initdb.c:1446
+msgid "initializing pg_depend ... "
+msgstr "inicializuje sa pg_depend ... "
+
+#: initdb.c:1474
+msgid "creating system views ... "
+msgstr "vytvárajú sa systémové pohľady ... "
+
+#: initdb.c:1511
+msgid "loading pg_description ... "
+msgstr "načítava sa pg_description ... "
+
+#: initdb.c:1559
+msgid "creating conversions ... "
+msgstr "vytvárajú sa konverzie ... "
+
+#: initdb.c:1615
+msgid "setting privileges on built-in objects ... "
+msgstr "nastavujú sa právomoci pre zabudované objekty ... "
+
+#: initdb.c:1673
+msgid "creating information schema ... "
+msgstr "vytvára sa informačná schéma ... "
+
+#: initdb.c:1735
+msgid "vacuuming database template1 ... "
+msgstr "vysáva sa databáza template1 ... "
+
+#: initdb.c:1791
+msgid "copying template1 to template0 ... "
+msgstr "kopíruje sa template1 do template0 ... "
+
+#: initdb.c:1848
+msgid "caught signal\n"
+msgstr "zachytený signál\n"
+
+#: initdb.c:1853
+msgid "could not write to child process\n"
+msgstr "nebolo možné zapisovať do procesu potomka\n"
+
+#: initdb.c:1859
+msgid "ok\n"
+msgstr "ok\n"
+
+#: initdb.c:1889
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: neplatný názov národného prostredia \"%s\"\n"
+
+#: initdb.c:1956
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s inicializuje zoskupenie databáz PostgreSQL.\n"
+"\n"
+
+#: initdb.c:1957
+msgid "Usage:\n"
+msgstr "Použitie:\n"
+
+#: initdb.c:1958
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [VOĽBA]... [DÁTOVÝ_ADRESÁR]\n"
+
+#: initdb.c:1959
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Voľby:\n"
+
+#: initdb.c:1960
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr ""
+" [-D, --pgdata=]DÁTOVÝ_ADRESÁR                             umiestnenie tohto "
+"zoskupenia databáz\n"
+
+#: initdb.c:1961
+msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
+msgstr ""
+"  -E, --encoding=KÓDOVANIE  nastavenie implicitného kódovania pre nové\n"
+"                            databázy\n"
+
+#: initdb.c:1962
+msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
+msgstr ""
+"  --locale=NÁRODNÉ_PROSTREDIE\n"
+"                  inicializácia zoskupenia databáz na dané národné "
+"prostedie\n"
+
+#: initdb.c:1963
+msgid ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            initialize database cluster with given locale\n"
+"                            in the respective category (default taken from\n"
+"                            environment)\n"
+msgstr ""
+"  --lc-collate, --lc-ctype, --lc-messages=NÁRODNÉ_PROSTREDIE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=NÁRODNÉ_PROSTREDIE\n"
+"                            inicializácia zoskupenia databáz na dané "
+"národné\n"
+"                            prostredie v danej kategórii (implicitná "
+"hodnota\n"
+"                            sa berie z prostredia)\n"
+
+#: initdb.c:1968
+msgid "  --no-locale               equivalent to --locale=C\n"
+msgstr "  --no-locale               ekvivalent --locale=C\n"
+
+#: initdb.c:1969
+msgid ""
+"  -A, --auth=method         default authentication method for local "
+"connections\n"
+msgstr ""
+"  -A, --auth=metóda         implicitná metóda overenia totožnosti pre lokálne\n"
+"                            spojenia\n"
+
+#: initdb.c:1970
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=MENO       meno superužívateľa databázy\n"
+
+#: initdb.c:1971
+msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
+msgstr "  -W, --pwprompt            vyžiadaj si heslo nového superužívateľa\n"
+
+#: initdb.c:1972
+msgid "  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=názov_súboru      načíta heslo nového superužívateľa zo súboru\n"
+
+#: initdb.c:1973
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                zobraz túto nápovedu a ukonči činnosť\n"
+
+#: initdb.c:1974
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             vypýš informácie o verzii, potom ukonči činnosť\n"
+
+#: initdb.c:1975
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"Menej často používané voľby:\n"
+
+#: initdb.c:1976
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               generuj množstvo ladiacich výstupov\n"
+
+#: initdb.c:1977
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                zobraz interné nastavenia\n"
+
+#: initdb.c:1978
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L ADRESÁR                kde sa nachádzajú vstupné súbory\n"
+
+#: initdb.c:1979
+msgid "  -n, --noclean             do not clean up after errors\n"
+msgstr "  -n, --noclean             neupratuj, ak dôjde k chybe\n"
+
+#: initdb.c:1980
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"Ak sa neurčí dátový adresár, použije sa nastavenie z premennej prostredia\n"
+"PGDATA.\n"
+
+#: initdb.c:1982
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Chyby hláste na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2073
+msgid "Running in debug mode.\n"
+msgstr "Beh v ladiacom režime.\n"
+
+#: initdb.c:2077
+msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
+msgstr "Beh v režime \"noclean\". Nevykoná sa upratovanie po chybe.\n"
+
+#: initdb.c:2113 initdb.c:2130 initdb.c:2335
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zadajte \"%s --help\" pre detailnejšie informácie.\n"
+
+#: initdb.c:2128
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: príliš veľa argumentov príkazového riadku (prvý je \"%s\")\n"
+
+#: initdb.c:2136
+#, c-format
+msgid "%s: you cannot specify both password prompt and password file\n"
+msgstr "%s nemôžete zadať prompt hesla a súbor hesiel\n"
+
+#: initdb.c:2142
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections.\n"
+"You can change this by editing pg_hba.conf or using the -A flag the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+"UPOZORNENIE: povoľuje sa metóda overenia totožnosti \"trust\" (dôvera).\n"
+"Môžete to zmeniť úpravou súboru pg_hba.conf alebo použitím príznaku -A\n"
+"pri nasledujúcom spustení programu initdb.\n"
+
+#: initdb.c:2164
+#, c-format
+msgid "%s: unknown authentication method \"%s\".\n"
+msgstr "%s: neznáma metóda overania totožnosti \"%s\".\n"
+
+#: initdb.c:2173
+#, c-format
+msgid ""
+"%s: you need to specify a password for the superuser to enable %s "
+"authentication.\n"
+msgstr ""
+"%s: pre povolenie overenia totožnosti metódou %s musíte zadať heslo \n"
+"superužívateľa.\n"
+
+#: initdb.c:2188
+#, c-format
+msgid ""
+"%s: no data directory specified\n"
+"You must identify the directory where the data for this database system\n"
+"will reside.  Do this with either the invocation option -D or the\n"
+"environment variable PGDATA.\n"
+msgstr ""
+"%s: Nebol určený dátový adresár\n"
+"Musíte zadať adresár, kde sa budú nachádzať dáta tohto databázového systému\n"
+"Môžete tak urobiť buď voľbou spustenia -D alebo cez premennú prostredia\n"
+"PGDATA.\n"
+
+#: initdb.c:2214
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the same "
+"directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postgres\" je vyžadovaný programom %s, avšak sa nenašiel v "
+"rovnakom\n"
+"adresári ako \"%s\".\n"
+"Prekontrolujte inštaláciu.\n"
+
+#: initdb.c:2220
+#, c-format
+msgid ""
+"The program \"postgres\" was found by %s but was not the same version as \"%s"
+"\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postgres\" bol nájdený programom %s, avšak sa nenašiel v rovnakej\n"
+"verzii ako \"%s\".\n"
+"Prekontrolujte inštaláciu.\n"
+
+#: initdb.c:2241
+#, c-format
+msgid "%s: could not determine valid short version string\n"
+msgstr "%s: nebolo možné určiť platný krátky reťazec označenia verzie\n"
+
+#: initdb.c:2294
+#, c-format
+msgid ""
+"The files belonging to this database system will be owned by user \"%s\".\n"
+"This user must also own the server process.\n"
+"\n"
+msgstr ""
+"Súbory patriace tomuto databázovému systému budú vlastnené užívateľom\n"
+"\"%s\". Tento užívateľ musí tiež byť vlastníkom procesu servera.\n"
+"\n"
+
+#: initdb.c:2305
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "Zoskupenie databáz bude inicialozované s národným nastavením %s.\n"
+
+#: initdb.c:2309
+#, c-format
+msgid ""
+"The database cluster will be initialized with locales\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+msgstr ""
+"Zoskupenie databáz bude inicializované s týmito národnými nastaveniami:\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+
+#: initdb.c:2333
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: nebolo možné nájsť vhodné kódovanie pre národné nastavenie \"%s\"\n"
+
+#: initdb.c:2334
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "Opätovne spustite program %s s voľbou -E.\n"
+
+#: initdb.c:2341
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "Implicitné kódovanie databázy bolo v súlade s tým nastavené na %s.\n"
+
+#: initdb.c:2382
+#, c-format
+msgid "creating directory %s ... "
+msgstr "vytvára sa adresár %s ... "
+
+#: initdb.c:2396
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "opravujú sa prístupové práva pre existujúci adresár %s ... "
+
+#: initdb.c:2414
+#, c-format
+msgid ""
+"%s: directory \"%s\" exists but is not empty\n"
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"%s: adresár \"%s\" existuje, ale nie je prázdny\n"
+"Ak chcete vytvoriť nový databázový systém, odstráňte alebo vyprázdnite\n"
+"adresár \"%s\" alebo spustite %s s iným argumentom ako\n"
+"\"%s\".\n"
+
+#: initdb.c:2431
+#, c-format
+msgid "creating directory %s/%s ... "
+msgstr "vytvára sa adresár %s/%s ... "
+
+#: initdb.c:2492
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"or\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"Úspech. Teraz môžete spustiť databázový server príkazom:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"alebo\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l súbor_logu start\n"
+"\n"
+
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index f0e0a2b8b2..a6cc6f41ed 100644
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_controldata/nls.mk,v 1.10 2004/01/05 19:15:48 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_controldata/nls.mk,v 1.11 2004/08/02 15:17:17 petere Exp $
 CATALOG_NAME	:= pg_controldata
-AVAIL_LANGUAGES	:= cs de es fr hu it nb pt_BR ru sl sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr hu it nb pt_BR ru sk sl sv zh_CN zh_TW
 GETTEXT_FILES	:= pg_controldata.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_controldata/po/sk.po b/src/bin/pg_controldata/po/sk.po
new file mode 100644
index 0000000000..35823128df
--- /dev/null
+++ b/src/bin/pg_controldata/po/sk.po
@@ -0,0 +1,246 @@
+# translation of pg_controldata-sk.po to slovak
+# translation of pg_controldata.po to
+# , 2004.
+# , 2004.
+# , 2004.
+# Zoltan Bartko <bartko.zoltan@pobox.sk>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_controldata-sk\n"
+"POT-Creation-Date: 2004-08-02 07:22-0300\n"
+"PO-Revision-Date: 2004-08-02 15:53+0200\n"
+"Last-Translator: Zoltan Bartko <bartko.zoltan@pobox.sk>\n"
+"Language-Team: slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: pg_controldata.c:28
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s zobrazí riadiace informácie o zoskupení databáz PostgreSQL.\n"
+"\n"
+
+#: pg_controldata.c:32
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]\n"
+"\n"
+"Options:\n"
+"  DATADIR        show cluster control information for DATADIR\n"
+"  --help         show this help, then exit\n"
+"  --version      output version information, then exit\n"
+msgstr ""
+"Použitie:\n"
+"  %s [VOĽBA]\n"
+"\n"
+"Voľby:\n"
+"  DÁTOVÝ_ADRESÁR  zobrazí riadiace informácie o adresári DÁTOVÝ_ADRESÁR\n"
+"  --help          zobrazí túto nápovedu, potom ukončí program\n"
+"  --verzia        zobrazí informáciu o verzii programu, potom koniec\n"
+
+#: pg_controldata.c:41
+msgid ""
+"\n"
+"If no data directory is specified, the environment variable PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Ak neurčíte dátový adresár, použije sa premenná prostredia PGDATA\n"
+"\n"
+
+#: pg_controldata.c:42
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby hláste na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_controldata.c:52
+msgid "starting up"
+msgstr "prebieha spúšťanie"
+
+#: pg_controldata.c:54
+msgid "shut down"
+msgstr "koniec činnosti"
+
+#: pg_controldata.c:56
+msgid "shutting down"
+msgstr "prebieha ukončenie činnosti"
+
+#: pg_controldata.c:58
+msgid "in recovery"
+msgstr "prebieha zotavenie"
+
+#: pg_controldata.c:60
+msgid "in production"
+msgstr "prebieha produkcia"
+
+#: pg_controldata.c:62
+msgid "unrecognized status code"
+msgstr "neznámy kód stavu"
+
+#: pg_controldata.c:104
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: nezadali ste dátový adresár\n"
+
+#: pg_controldata.c:105
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Použite \"%s --help\" pre zobrazenie detailnejších informácií.\n"
+
+#: pg_controldata.c:113
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nebolo možné otvoriť súbor \"%s\" pre čítanie: %s\n"
+
+#: pg_controldata.c:120
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: nebolo možné načítať súbor: \"%s\": %s\n"
+
+#: pg_controldata.c:134
+msgid ""
+"WARNING: Calculated CRC checksum does not match value stored in file.\n"
+"Either the file is corrupt, or it has a different layout than this program\n"
+"is expecting.  The results below are untrustworthy.\n"
+"\n"
+msgstr ""
+"UPOZORNENIE: vypočítaný kontrolný súčet CRC sa nezhoduje s hodnotou uloženou\n"
+"v súbore. Buď je súbor poškodený alebo má iný formát ako ten, ktorý tento \n"
+"program očakáva. Výsledky uvedené nižšie nie sú hodnoverné.\n"
+"\n"
+
+#: pg_controldata.c:153
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "číslo verzie programu pg_control:                %u\n"
+
+#: pg_controldata.c:154
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "číslo verzie katalógu:                           %u\n"
+
+#: pg_controldata.c:155
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Systémový identifikátor databázy:                %s\n"
+
+#: pg_controldata.c:156
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "Stav zoskupenia databáz:                         %s\n"
+
+#: pg_controldata.c:157
+#, c-format
+msgid "pg_control last modified:             %s\n"
+msgstr "Posledná zmena v programe pg_control:            %s\n"
+
+#: pg_controldata.c:158
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "ID aktuálneho log súboru:                        %u\n"
+
+#: pg_controldata.c:159
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "Nasledujúci segment log súboru:                  %u\n"
+
+#: pg_controldata.c:160
+#, c-format
+msgid "Latest checkpoint location:           %X/%X\n"
+msgstr "Umiestnenie posledného kontrolného bodu:         %X/%X\n"
+
+#: pg_controldata.c:162
+#, c-format
+msgid "Prior checkpoint location:            %X/%X\n"
+msgstr "Umiestnenie predchádzajúceho kontrolného bodu:   %X/%X\n"
+
+#: pg_controldata.c:164
+#, c-format
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgstr "Umiestnenie REDO posledného kontrolného bodu:    %X / %X\n"
+
+#: pg_controldata.c:166
+#, c-format
+msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+msgstr "Umiestnenie UNDO posledného kontrolného bodu:    %X / %X\n"
+
+#: pg_controldata.c:168
+#, c-format
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "TimeLineID posledného kontrolného bodu:          %u\n"
+
+#: pg_controldata.c:169
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "NextXID posledného kontrolného bodu:             %u\n"
+
+#: pg_controldata.c:170
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "NextOID posledného kontrolného bodu:             %u\n"
+
+#: pg_controldata.c:171
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "Čas posledného kontrolného bodu:                 %s\n"
+
+#: pg_controldata.c:172
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Veľkosť bloku databázy:                         %u\n"
+
+#: pg_controldata.c:173
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Počet blokov v segmente veľkej relácie:          %u\n"
+
+#: pg_controldata.c:174
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "Počet bajtov v segmente WAL:                     %u\n"
+
+#: pg_controldata.c:175
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maximálna dĺžka identifikátorov:                 %u\n"
+
+#: pg_controldata.c:176
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "Maximálny počet argumentov funkcií:              %u\n"
+
+#: pg_controldata.c:177
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Ukladanie typov dátumu a času:                   %s\n"
+
+#: pg_controldata.c:178
+msgid "64-bit integers"
+msgstr "64-bitové celé čísla"
+
+#: pg_controldata.c:178
+msgid "floating-point numbers"
+msgstr "čísla s pohyblivou rádovou čiarkou"
+
+#: pg_controldata.c:179
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "Maximálna dĺžka názvu lokálnych nastavení:     %u\n"
+
+#: pg_controldata.c:180
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                                      %s\n"
+
+#: pg_controldata.c:181
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                                        %s\n"
+
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index e10229ec27..b0aabb321e 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.3 2004/07/30 05:28:42 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.4 2004/08/02 15:17:18 petere Exp $
 CATALOG_NAME	:= pg_ctl
-AVAIL_LANGUAGES	:= ru sv zh_TW
+AVAIL_LANGUAGES	:= ru sk sv zh_TW
 GETTEXT_FILES	:= pg_ctl.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/pg_ctl/po/sk.po b/src/bin/pg_ctl/po/sk.po
new file mode 100644
index 0000000000..5e1db78761
--- /dev/null
+++ b/src/bin/pg_ctl/po/sk.po
@@ -0,0 +1,483 @@
+# translation of pg_ctl-sk.po to slovak
+# translation of pg_ctl.po to
+# translation of pg_ctl.po to
+# , 2004.
+# , 2004.
+# , 2004.
+# , 2004.
+# , 2004.
+# , 2004.
+# Zoltan Bartko <bartko.zoltan@pobox.sk>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_ctl-sk\n"
+"POT-Creation-Date: 2004-08-02 07:22-0300\n"
+"PO-Revision-Date: 2004-08-02 16:00+0200\n"
+"Last-Translator: Zoltan Bartko <bartko.zoltan@pobox.sk>\n"
+"Language-Team: slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: pg_ctl.c:184 pg_ctl.c:200 pg_ctl.c:1230
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatok pamäte\n"
+
+#: pg_ctl.c:431
+#, c-format
+msgid "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+msgstr ""
+"%s: Pravdepodobne beží už iný postmaster. Pokúšam sa spustiť program \n"
+"postmaster napriek tomu.\n"
+
+#: pg_ctl.c:449
+#, c-format
+msgid "%s: cannot read %s\n"
+msgstr "%s: nebolo možné čítať %s\n"
+
+#: pg_ctl.c:455
+#, c-format
+msgid "%s: option file %s must have exactly 1 line\n"
+msgstr "%s: súbor s voľbami %s musí mať práve 1 riadok\n"
+
+#: pg_ctl.c:497
+#, c-format
+msgid ""
+"The program \"postmaster\" is needed by %s but was not found in the same "
+"directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postmaster\" je vyžadovaný programom %s, avšak sa nenašiel \n"
+"v adresári rovnakom ako \"%s\".\n"
+"Prekontrolujte inštaláciu systému.\n"
+
+#: pg_ctl.c:503
+#, c-format
+msgid ""
+"The program \"postmaster\" was found by %s but was not the same version as "
+"\"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postmaster\" bol nájdený programom %s, avšak nie vo verzii\n"
+"totožnej s \"%s\".\n"
+"Prekontrolujte inštaláciu systému.\n"
+
+#: pg_ctl.c:514
+msgid "Unable to run the postmaster binary\n"
+msgstr "Nebolo možné spustiť binárny program postmaster\n"
+
+#: pg_ctl.c:524
+#, c-format
+msgid ""
+"%s: cannot start postmaster\n"
+"Examine the log output\n"
+msgstr ""
+"%s: Nebolo možné spustiť program postmaster\n"
+"Prekontrolujte výpisy denníka (log)\n"
+
+#: pg_ctl.c:535
+msgid "waiting for postmaster to start..."
+msgstr "čakám na spustenie programu postmaster..."
+
+#: pg_ctl.c:540
+msgid "could not start postmaster\n"
+msgstr "nebolo možné spustiť program postmaster\n"
+
+#: pg_ctl.c:542
+msgid ""
+"done\n"
+"postmaster started\n"
+msgstr ""
+"hotovo\n"
+"postmaster beží\n"
+
+#: pg_ctl.c:545
+msgid "postmaster starting\n"
+msgstr "spúšťanie programu postmaster\n"
+
+#: pg_ctl.c:560 pg_ctl.c:639 pg_ctl.c:709
+#, c-format
+msgid "%s: could not find %s\n"
+msgstr "%s: nebolo možné nájsť %s\n"
+
+#: pg_ctl.c:561 pg_ctl.c:710
+msgid "Is postmaster running?\n"
+msgstr "Beží postmaster?\n"
+
+#: pg_ctl.c:567
+#, c-format
+msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nie je možné zastaviť postmaster - postgres beží (PID: %ld)\n"
+
+#: pg_ctl.c:575 pg_ctl.c:656
+#, c-format
+msgid "stop signal failed (PID: %ld): %s\n"
+msgstr "signál stop bol neúspešný (PID: %ld): %s\n"
+
+#: pg_ctl.c:583
+msgid "postmaster shutting down\n"
+msgstr "postmaster sa vypína\n"
+
+#: pg_ctl.c:590 pg_ctl.c:663
+msgid "waiting for postmaster to shut down..."
+msgstr "čakám na vypnutie postmastera..."
+
+#: pg_ctl.c:612 pg_ctl.c:687
+msgid " failed\n"
+msgstr " neúspešné\n"
+
+#: pg_ctl.c:614 pg_ctl.c:689
+#, c-format
+msgid "%s: postmaster does not shut down\n"
+msgstr "%s: postmaster neukončil svoju činnosť\n"
+
+#: pg_ctl.c:618 pg_ctl.c:694
+msgid "done\n"
+msgstr "hotovo\n"
+
+#: pg_ctl.c:620 pg_ctl.c:696
+msgid "postmaster stopped\n"
+msgstr "postmaster vypnutý\n"
+
+#: pg_ctl.c:640
+msgid ""
+"Is postmaster running?\n"
+"starting postmaster anyway\n"
+msgstr ""
+"Beží ešte postmaster?\n"
+"spúšťam posmaster bez ohľadu na to\n"
+
+#: pg_ctl.c:647
+#, c-format
+msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nebolo možné reštartovať program postmaster, postgres beží (PID: %ld)\n"
+
+#: pg_ctl.c:650 pg_ctl.c:719
+msgid "Please terminate postgres and try again.\n"
+msgstr "Prosím, ukončite postgres a skúste znovu.\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nebolo možné opätovne spustiť program postmaster, postgres beží (PID: %ld)\n"
+
+#: pg_ctl.c:725
+#, c-format
+msgid "reload signal failed (PID: %ld): %s\n"
+msgstr "signál reload (načítaj znova) zlyhal (PID: %ld): %s\n"
+
+#: pg_ctl.c:731
+msgid "postmaster signaled\n"
+msgstr "postmaster vydal signál\n"
+
+#: pg_ctl.c:746
+#, c-format
+msgid "%s: postmaster or postgres not running\n"
+msgstr "%s: postmaster alebo postgres nebeží\n"
+
+#: pg_ctl.c:752
+#, c-format
+msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+msgstr "%s: beží samostatný backend \"postgres\" (PID: %ld)\n"
+
+#: pg_ctl.c:758
+#, c-format
+msgid "%s: postmaster is running (PID: %ld)\n"
+msgstr "%s: postmaster beží (PID: %ld)\n"
+
+#: pg_ctl.c:774
+#, c-format
+msgid "signal %d failed (PID: %ld): %s\n"
+msgstr "signál %d bol neúspešný (PID: %ld): %s\n"
+
+#: pg_ctl.c:801
+msgid "Unable to find exe"
+msgstr "Nebolo možné nájsť spustiteľný súbor"
+
+#: pg_ctl.c:844 pg_ctl.c:875
+msgid "Unable to open service manager\n"
+msgstr "Nebolo možné otvoriť správcu služieb\n"
+
+#: pg_ctl.c:850
+#, c-format
+msgid "Service \"%s\" already registered\n"
+msgstr "Služba \"%s\" je už zaregistrovaná\n"
+
+#: pg_ctl.c:861
+#, c-format
+msgid "Unable to register service \"%s\" [%d]\n"
+msgstr "Nebolo možné zaregistrovať službu \"%s\" [%d]\n"
+
+#: pg_ctl.c:881
+#, c-format
+msgid "Service \"%s\" not registered\n"
+msgstr "Služba \"%s\" nie je registrovaná\n"
+
+#: pg_ctl.c:888
+#, c-format
+msgid "Unable to open service \"%s\" [%d]\n"
+msgstr "Nebolo možné otvoriť službu \"%s\" [%d]\n"
+
+#: pg_ctl.c:894
+#, c-format
+msgid "Unable to unregister service \"%s\" [%d]\n"
+msgstr "Nebolo možné zmazať registráciu služby \"%s\" [%d]\n"
+
+#: pg_ctl.c:1012
+#, c-format
+msgid ""
+"\n"
+"Try \"%s --help\" for more information.\n"
+msgstr ""
+"\n"
+"Použite príkaz \"%s --help\" pre získanie detailnejších informácií.\n"
+
+#: pg_ctl.c:1020
+#, c-format
+msgid ""
+"%s is a utility to start, stop, restart, reload configuration files,\n"
+"report the status of a PostgreSQL server, or kill a PostgreSQL process\n"
+"\n"
+msgstr ""
+"%s je program pre spustenie, zastavenie, opätovné spustenie, opätovné \n"
+"načítanie konfiguračných súborov, hlásenie stavu servera PostgreSQL alebo\n"
+"pre ukončenie procesu PostgreSQL\n"
+"\n"
+
+#: pg_ctl.c:1022
+msgid "Usage:\n"
+msgstr "Použitie:\n"
+
+#: pg_ctl.c:1023
+#, c-format
+msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
+msgstr "  %s start   [-w] [-D DÁTOVÝ_ADRESÁR] [-s] [-l SÚBOR] [-o \"VOĽBY\"]\n"
+
+#: pg_ctl.c:1024
+#, c-format
+msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr "  %s stop    [-W] [-D DÁTOVÝ_ADRESÁR] [-s] [-m REŽIM_VYPNUTIA]\n"
+
+#: pg_ctl.c:1025
+#, c-format
+msgid "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
+msgstr ""
+"  %s restart [-w] [-D DÁTOVÝ_ADRESÁR] [-s] [-m REŽIM_VYPNUTIA] [-o \"VOĽBY"
+"\"]\n"
+
+#: pg_ctl.c:1026
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D DÁTOVÝ_ADRESÁR] [-s]\n"
+
+#: pg_ctl.c:1027
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D DÁTOVÝ_ADRESÁR]\n"
+
+#: pg_ctl.c:1028
+#, c-format
+msgid "  %s kill    SIGNALNAME PROCESSID\n"
+msgstr "  %s kill    SIGNÁL ID_PROCESU\n"
+
+#: pg_ctl.c:1030
+#, c-format
+msgid ""
+"  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-"
+"o \"OPTIONS\"]\n"
+msgstr ""
+"  %s register   [-N názov_služby] [-U meno_užívateľa] [-P heslo] [-D "
+"DÁTOVÝ_ADRESÁR] [-o \"VOĽBY\"]\n"
+
+#: pg_ctl.c:1031
+#, c-format
+msgid "  %s unregister [-N servicename]\n"
+msgstr "  %s unregister [-N názov_služby]\n"
+
+#: pg_ctl.c:1033
+msgid "Common options:\n"
+msgstr "Často používané voľby:\n"
+
+#: pg_ctl.c:1034
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr "  -D, --pgdata DÁTOVÝ_ADRESÁR   umiestnenie úložného priestoru databázy\n"
+
+#: pg_ctl.c:1035
+msgid "  -s, --silent only print errors, no informational messages\n"
+msgstr "  -s, --silent                  vypíš iba chyby, žiadne informatívne správy\n"
+
+#: pg_ctl.c:1037
+msgid "  -N       service name with which to register PostgreSQL server\n"
+msgstr ""
+"  -N                            názov služby, pod ktorým sa má server \n"
+"                                PostgreSQL registrovať\n"
+
+#: pg_ctl.c:1038
+msgid "  -P       password of account to register PostgreSQL server\n"
+msgstr ""
+"  -P                            heslo účtu, pod ktorým sa server PostgreSQL\n"
+"                                registruje\n"
+
+#: pg_ctl.c:1039
+msgid "  -U       user name of account to register PostgreSQL server\n"
+msgstr ""
+"  -U                            meno užívateľa účtu, pod ktorým sa server\n"
+"                                PostgreSQL registruje\n"
+
+#: pg_ctl.c:1041
+msgid "  -w           wait until operation completes\n"
+msgstr "  -w                            počkaj, kým operácia neskončí\n"
+
+#: pg_ctl.c:1042
+msgid "  -W           do not wait until operation completes\n"
+msgstr "  -W                            nepočkaj do ukončenia operácie\n"
+
+#: pg_ctl.c:1043
+msgid "  --help       show this help, then exit\n"
+msgstr "  --help                        vypíš túto nápovedu, potom ukonč činnosť\n"
+
+#: pg_ctl.c:1044
+msgid "  --version    output version information, then exit\n"
+msgstr "  --version                     vypíš informácie o verzii, potom koniec\n"
+
+#: pg_ctl.c:1045
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(Implicitne sa čaká v prípade vypnutia, ale nie v prípade spustenia alebo \n"
+"opätovného spustenia)\n"
+"\n"
+
+#: pg_ctl.c:1046
+msgid ""
+"If the -D option is omitted, the environment variable PGDATA is used.\n"
+"\n"
+msgstr "Ak sa vynechá voľba -D, použije sa premenná prostredia PGDATA.\n"
+
+#: pg_ctl.c:1047
+msgid "Options for start or restart:\n"
+msgstr "Voľby pre spustenie alebo opätovné spustenie:\n"
+
+#: pg_ctl.c:1048
+msgid ""
+"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
+"                          use of this option is highly recommended.\n"
+msgstr ""
+"  -l, --log SÚBOR               zapíš (alebo pripíš na koniec) log servera \n"
+"                                do SÚBORu. Použitie tejto voľby sa veľmi \n"
+"                                odporúča.\n"
+
+#: pg_ctl.c:1050
+msgid ""
+"  -o OPTIONS              command line options to pass to the postmaster\n"
+"                          (PostgreSQL server executable)\n"
+msgstr ""
+"  -o VOĽBY                      voľby príkazového riadku, ktoré majú byť \n"
+"                                odovzdané programu postmaster (spustiteľný\n"
+"                                súbor servera PostgreSQL)\n"
+
+#: pg_ctl.c:1052
+msgid ""
+"  -p PATH-TO-POSTMASTER   normally not necessary\n"
+"\n"
+msgstr ""
+"  -p CESTA_K_POSTMASTERU        obyčajne nepotrebné\n"
+"\n"
+
+#: pg_ctl.c:1053
+msgid "Options for stop or restart:\n"
+msgstr "Voľby pre zastavenie alebo opätovné spustenie:\n"
+
+#: pg_ctl.c:1054
+msgid ""
+"  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
+"\n"
+msgstr ""
+"  -m REŽIM_VYPNUTIA  môže byť 'smart' (múdro), 'fast' (rýchlo), alebo "
+"'immediate' (ihneď)\n"
+"\n"
+
+#: pg_ctl.c:1055
+msgid "Allowed signal names for kill:\n"
+msgstr "Povolené názvy signálov pre príkaz kill (ukončenie):\n"
+
+#: pg_ctl.c:1056
+msgid ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+msgstr ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+
+#: pg_ctl.c:1057
+msgid "Shutdown modes are:\n"
+msgstr "Režimy vypnutia sú:\n"
+
+#: pg_ctl.c:1058
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       ukončenie po odpojení všetkých klientov\n"
+
+#: pg_ctl.c:1059
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        priame ukončenie, s riadnym vypnutím\n"
+
+#: pg_ctl.c:1060
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on "
+"restart\n"
+"\n"
+msgstr ""
+"  immediate   koniec bez kompletného vypnutia. Spôsobí obnovu pri opätovnom \n"
+"              spustení\n"
+"\n"
+
+#: pg_ctl.c:1061
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby hláste na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_ctl.c:1086
+#, c-format
+msgid "%s: invalid shutdown mode %s\n"
+msgstr "%s: neplatný režim vypnutia %s\n"
+
+#: pg_ctl.c:1119
+#, c-format
+msgid "%s: invalid signal \"%s\"\n"
+msgstr "%s: neplatný signál \"%s\"\n"
+
+#: pg_ctl.c:1246
+#, c-format
+msgid "%s: invalid option %s\n"
+msgstr "%s: neplatná voľba \"%s\"\n"
+
+#: pg_ctl.c:1257
+#, c-format
+msgid "%s: extra operation mode %s\n"
+msgstr "%s: nadbytočný režim operácie %s\n"
+
+#: pg_ctl.c:1276
+#, c-format
+msgid "%s: invalid kill syntax\n"
+msgstr "%s: neplatná syntax príkazu kill\n"
+
+#: pg_ctl.c:1294
+#, c-format
+msgid "%s: invalid operation mode %s\n"
+msgstr "%s: neplatný režim činnosti %s\n"
+
+#: pg_ctl.c:1304
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: nebola určená operácia\n"
+
+#: pg_ctl.c:1320
+#, c-format
+msgid "%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr ""
+"%s: nebol určený adresár databázy a premenná prostredia PGDATA nie je \n"
+"nastavená\n"
+
diff --git a/src/bin/psql/po/sk.po b/src/bin/psql/po/sk.po
index fcda250a52..5687b43404 100644
--- a/src/bin/psql/po/sk.po
+++ b/src/bin/psql/po/sk.po
@@ -1,9 +1,16 @@
+# translation of psql-sk.po to slovak
+# translation of psql-sk-2.po to slovak
+# translation of psql-sk-2.po to
+# translation of psql-sk-2.po to
+# , 2004.
+# , 2004.
+# , 2004.
 # Zoltan Bartko <bartko.zoltan@pobox.sk>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: psql-sk-2\n"
-"POT-Creation-Date: 2004-07-15 19:11-0300\n"
-"PO-Revision-Date: 2004-07-31 08:55+0200\n"
+"Project-Id-Version: psql-sk\n"
+"POT-Creation-Date: 2004-08-02 07:23-0300\n"
+"PO-Revision-Date: 2004-08-02 15:31+0200\n"
 "Last-Translator: Zoltan Bartko <bartko.zoltan@pobox.sk>\n"
 "Language-Team: slovak\n"
 "MIME-Version: 1.0\n"
@@ -379,8 +386,8 @@ msgstr "V
 #, c-format
 msgid "  -d DBNAME       specify database name to connect to (default: \"%s\")\n"
 msgstr ""
-"  -d DATAB�ZA         n�zov datab�zy, ku ktorej m� by� vytvoren� pripojenie "
-"                      (implicitne: %s)\n"
+"  -d DATAB�ZA         n�zov datab�zy, ku ktorej m� by� vytvoren� "
+"pripojenie                       (implicitne: %s)\n"
 
 #: help.c:94
 msgid "  -c COMMAND      run only single command (SQL or internal) and exit"
@@ -399,8 +406,8 @@ msgstr " -l                   vyp
 #: help.c:97
 msgid "  -v NAME=VALUE   set psql variable NAME to VALUE"
 msgstr ""
-"  -v N�ZOV=HODNOTA    nastav� premenn� programu psql 'MENO' na hodnotu "
-"                      'HODNOTA'"
+"  -v N�ZOV=HODNOTA    nastav� premenn� programu psql 'MENO' na "
+"hodnotu                       'HODNOTA'"
 
 #: help.c:98
 msgid "  -X              do not read startup file (~/.psqlrc)"
@@ -481,7 +488,8 @@ msgid ""
 "  -T TEXT         set HTML table tag attributes (width, border) (-P "
 "tableattr=)"
 msgstr ""
-"  -T TEXT             nastavenie atrib�tov HTML tabu�ky (��rka, ohrani�enie)\n"
+"  -T TEXT             nastavenie atrib�tov HTML tabu�ky (��rka, "
+"ohrani�enie)\n"
 "                      (-P tableattr=)"
 
 #: help.c:117
@@ -491,8 +499,8 @@ msgstr "  -x                  re
 #: help.c:118
 msgid "  -P VAR[=ARG]    set printing option VAR to ARG (see \\pset command)"
 msgstr ""
-"  -P VAR[=ARG]        nastav� zobrazovac� parameter 'VAR' na 'ARG' (pozri "
-"                      pr�kaz \\pset)"
+"  -P VAR[=ARG]        nastav� zobrazovac� parameter 'VAR' na "
+"'ARG' (pozri                       pr�kaz \\pset)"
 
 #: help.c:119
 #, c-format
@@ -502,7 +510,8 @@ msgstr "  -F RE
 #: help.c:121
 msgid "  -R STRING       set record separator (default: newline) (-P recordsep=)"
 msgstr ""
-"  -R RE�AZEC          odde�ova� z�znamov (implicitne: nov� riadok (newline))\n"
+"  -R RE�AZEC          odde�ova� z�znamov (implicitne: nov� riadok "
+"(newline))\n"
 "                      (-P recordsep=)"
 
 #: help.c:123
@@ -532,7 +541,9 @@ msgstr " -p PORT              ur
 #: help.c:136
 #, c-format
 msgid "  -U NAME         database user name (default: \"%s\")\n"
-msgstr "  -U MENO             �pecifikuje meno pou��vate�a datab�zy (implicitne: %s)\n"
+msgstr ""
+"  -U MENO             �pecifikuje meno pou��vate�a datab�zy (implicitne: %"
+"s)\n"
 
 #: help.c:137
 msgid "  -W              prompt for password (should happen automatically)"
@@ -600,8 +611,8 @@ msgid ""
 "  \\set [NAME [VALUE]]\n"
 "                 set internal variable, or list all if no parameters\n"
 msgstr ""
-" \\set [MENO [HODNOTA]] "
-"                      nastavi� intern� premenn� alebo bez parameterov zobraz�\n"
+" \\set [MENO [HODNOTA]]                       nastavi� intern� premenn� "
+"alebo bez parameterov zobraz�\n"
 "                      zoznam v�etk�ch premenn�ch\n"
 
 #: help.c:186
@@ -626,7 +637,8 @@ msgstr "Pam
 #: help.c:193
 msgid "  \\e [FILE]      edit the query buffer (or file) with external editor\n"
 msgstr ""
-" \\e [S�BOR]          �prava pam�te dotazov (alebo s�boru) pomocou extern�ho\n"
+" \\e [S�BOR]          �prava pam�te dotazov (alebo s�boru) pomocou "
+"extern�ho\n"
 "                      editora\n"
 
 #: help.c:194
@@ -634,7 +646,8 @@ msgid ""
 "  \\g [FILE]      send query buffer to server (and results to file or |"
 "pipe)\n"
 msgstr ""
-" \\g [S�BOR]          po�le dotaz SQL na server (a zap��e v�sledok do s�boru\n"
+" \\g [S�BOR]          po�le dotaz SQL na server (a zap��e v�sledok do "
+"s�boru\n"
 "                      alebo do |r�ry)\n"
 
 #: help.c:195
@@ -691,7 +704,8 @@ msgid ""
 "                 list tables/indexes/sequences/views/system tables\n"
 msgstr ""
 "  \\d{t|i|s|v|S} [VZOR] (pridajte \"+\" pre detailnej�ie zobrazenie)\n"
-"                      zoznam tabuliek/indexov/sekvenci�/poh�adov/syst�mov�ch \n"
+"                      zoznam tabuliek/indexov/sekvenci�/poh�adov/"
+"syst�mov�ch \n"
 "                      tabulek\n"
 
 #: help.c:213
@@ -773,7 +787,8 @@ msgid ""
 "  \\z [PATTERN]   list table, view and sequence access privileges (same as "
 "\\dp)\n"
 msgstr ""
-"  \\z [VZOR]          zoznam pr�stupov�ch pr�v tabuliek, poh�adov a sekvenci�\n"
+"  \\z [VZOR]          zoznam pr�stupov�ch pr�v tabuliek, poh�adov a "
+"sekvenci�\n"
 "                      (ako \\dp)\n"
 
 #: help.c:231
@@ -810,8 +825,8 @@ msgid ""
 "                 (NAME := {format|border|expanded|fieldsep|footer|null|\n"
 "                 recordsep|tuples_only|title|tableattr|pager})\n"
 msgstr ""
-"  \\pset MENO[HODNOTA]  "
-"                      nastavenie parametrov v�stupnej tabu�ky\n"
+"  \\pset MENO[HODNOTA]                        nastavenie parametrov "
+"v�stupnej tabu�ky\n"
 "                      (MENO := {format|border|expanded|fieldsep|null| \n"
 "                                recordsep|tuples_only|title|tableattr| \n"
 "                                pager})\n"
@@ -1426,7 +1441,7 @@ msgstr "Zoznam pretypovan
 msgid "List of schemas"
 msgstr "Zoznam sch�m"
 
-#: sql_help.h:25 sql_help.h:365
+#: sql_help.h:25 sql_help.h:369
 msgid "abort the current transaction"
 msgstr "zru�i� aktu�lnu transakciu"
 
@@ -1721,7 +1736,7 @@ msgstr "zber 
 msgid "ANALYZE [ VERBOSE ] [ table [ (column [, ...] ) ] ]"
 msgstr "ANALYZE [ VERBOSE ] [ tabu�ka [ (st�pec [, ...] ) ] ]"
 
-#: sql_help.h:97 sql_help.h:397
+#: sql_help.h:97 sql_help.h:409
 msgid "start a transaction block"
 msgstr "za�iatok bloku transakcie"
 
@@ -1873,8 +1888,8 @@ msgstr ""
 "          [ BINARY ] \n"
 "          [ OIDS ]\n"
 "          [ DELIMITER [ AS ] 'odde�ovac�_znak' ]\n"
-"          [ NULL [ AS ] 're�azec_null' ] ] "
-"          [ CSV [ QUOTE [ AS ] '�vodzovka' ] \n"
+"          [ NULL [ AS ] 're�azec_null' ] ]           [ CSV [ QUOTE [ AS ] "
+"'�vodzovka' ] \n"
 "                [ ESCAPE [ AS ] '�nikov�_znak' ]\n"
 "                [ FORCE QUOTE st�pec [, ...] ]"
 
@@ -2054,8 +2069,7 @@ msgid ""
 msgstr ""
 "CREATE [ UNIQUE ] INDEX n�zov ON tabu�ka [ USING met�da ]\n"
 "    ( { st�pec | ( v�raz ) } [ trieda_oper�torov ] [, ...] )\n"
-"    [ TABLESPACE tabu�kov�_priestor]"
-"    [ WHERE predik�t ]"
+"    [ TABLESPACE tabu�kov�_priestor]    [ WHERE predik�t ]"
 
 #: sql_help.h:161
 msgid "define a new procedural language"
@@ -2142,10 +2156,10 @@ msgid ""
 "CREATE SCHEMA AUTHORIZATION username [ TABLESPACE tablespace ] "
 "[ schema_element [ ... ] ]"
 msgstr ""
-"CREATE SCHEMA n�zov_sch�my [ AUTHORIZATION meno_pou��vate�a ] "
-"[ TABLESPACE tabu�kov� priestor ] [ element_sch�my [ ... ] ]\n"
-"CREATE SCHEMA AUTHORIZATION meno_pou��vate�a [ TABLESPACE tabu�kov� priestor ]"
-"[ element_sch�my [ ... ] ]"
+"CREATE SCHEMA n�zov_sch�my [ AUTHORIZATION meno_pou��vate�a ] [ TABLESPACE "
+"tabu�kov� priestor ] [ element_sch�my [ ... ] ]\n"
+"CREATE SCHEMA AUTHORIZATION meno_pou��vate�a [ TABLESPACE tabu�kov� "
+"priestor ][ element_sch�my [ ... ] ]"
 
 #: sql_help.h:181
 msgid "define a new sequence generator"
@@ -2182,7 +2196,10 @@ msgid ""
 "where column_constraint is:\n"
 "\n"
 "[ CONSTRAINT constraint_name ]\n"
-"{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |\n"
+"{ NOT NULL | \n"
+"  NULL | \n"
+"  UNIQUE [ USING INDEX TABLESPACE tablespace ] |\n"
+"  PRIMARY KEY [ USING INDEX TABLESPACE tablespace ] |\n"
 "  CHECK (expression) |\n"
 "  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | MATCH "
 "SIMPLE ]\n"
@@ -2193,8 +2210,9 @@ msgid ""
 "and table_constraint is:\n"
 "\n"
 "[ CONSTRAINT constraint_name ]\n"
-"{ UNIQUE ( column_name [, ... ] ) |\n"
-"  PRIMARY KEY ( column_name [, ... ] ) |\n"
+"{ UNIQUE ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] |\n"
+"  PRIMARY KEY ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] "
+"|\n"
 "  CHECK ( expression ) |\n"
 "  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "
 "[, ... ] ) ]\n"
@@ -2217,7 +2235,10 @@ msgstr ""
 "kde obmedzenie_st�pca je:\n"
 "\n"
 "[ CONSTRAINT n�zov_obmedzenia ]\n"
-"{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |\n"
+"{ NOT NULL |\n"
+"  NULL | \n"
+"  UNIQUE [ USING INDEX TABLESPACE tabu�kov�_priestor ] |\n"
+"  PRIMARY KEY [ USING INDEX TABLESPACE tabu�kov�_priestor ] |\n"
 "  CHECK (v�raz) |\n"
 "  REFERENCES ref_tabu�ka [ ( ref_st�pec ) ] [ MATCH FULL | MATCH PARTIAL | "
 "MATCH SIMPLE ]\n"
@@ -2228,8 +2249,8 @@ msgstr ""
 "a obmedzenie_tabu�ky je:\n"
 "\n"
 "[ CONSTRAINT n�zov_obmedzenia ]\n"
-"{ UNIQUE ( n�zov_st�pca [, ... ] ) |\n"
-"  PRIMARY KEY ( n�zov_st�pca [, ... ] ) |\n"
+"{ UNIQUE ( n�zov_st�pca [, ... ] ) [ USING INDEX TABLESPACE tabu�kov�_priestor ] |\n"
+"  PRIMARY KEY ( n�zov_st�pca [, ... ] ) [ USING INDEX TABLESPACE tabu�kov�_priestor ] |\n"
 "  CHECK ( v�raz ) |\n"
 "  FOREIGN KEY ( n�zov_st�pca [, ... ] ) REFERENCES ref_tabu�ka "
 "[ ( ref_st�pec [, ... ] ) ]\n"
@@ -2237,7 +2258,7 @@ msgstr ""
 "UPDATE �innos� ] }\n"
 "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]"
 
-#: sql_help.h:189 sql_help.h:373
+#: sql_help.h:189 sql_help.h:385
 msgid "create a new table from the results of a query"
 msgstr "vytvori� nov� tabu�ku na z�klade v�sledkov dotazu"
 
@@ -2257,7 +2278,9 @@ msgstr "definova
 
 #: sql_help.h:194
 msgid "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
-msgstr "CREATE TABLESPACE n�zov_tabu�kov�ho_priestoru [ OWNER meno_pou��vate�a ] LOCATION 'adres�r'"
+msgstr ""
+"CREATE TABLESPACE n�zov_tabu�kov�ho_priestoru [ OWNER meno_pou��vate�a ] "
+"LOCATION 'adres�r'"
 
 #: sql_help.h:197
 msgid "define a new trigger"
@@ -2757,10 +2780,18 @@ msgid "REINDEX { DATABASE | TABLE | INDEX } name [ FORCE ]"
 msgstr "REINDEX { DATABASE | TABLE | INDEX } n�zov [ FORCE ]"
 
 #: sql_help.h:357
+msgid "destroy a previously defined savepoint"
+msgstr "vyma� predt�m vytvoren� bod ulo�enia (savepoint)"
+
+#: sql_help.h:358
+msgid "RELEASE savepoint_name"
+msgstr "RELEASE n�zov_bodu_ulo�enia"
+
+#: sql_help.h:361
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "obnovi� hodnotu parametra behu syst�mu na p�vodn� hodnotu"
 
-#: sql_help.h:358
+#: sql_help.h:362
 msgid ""
 "RESET name\n"
 "RESET ALL"
@@ -2768,11 +2799,11 @@ msgstr ""
 "RESET n�zov\n"
 "RESET ALL"
 
-#: sql_help.h:361
+#: sql_help.h:365
 msgid "remove access privileges"
 msgstr "Odobra� pr�stupov� pr�va"
 
-#: sql_help.h:362
+#: sql_help.h:366
 msgid ""
 "REVOKE [ GRANT OPTION FOR ]\n"
 "    { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"
@@ -2848,15 +2879,31 @@ msgstr ""
 "    FROM { meno_pou��vate�a | GROUP n�zov_skupiny | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:366
+#: sql_help.h:370
 msgid "ROLLBACK [ WORK | TRANSACTION ]"
 msgstr "ROLLBACK [ WORK | TRANSACTION ]"
 
-#: sql_help.h:369
+#: sql_help.h:373
+msgid "roll back to a savepoint"
+msgstr "obnovi� stav k bodu ulo�enia"
+
+#: sql_help.h:374
+msgid "ROLLBACK TO savepoint_name"
+msgstr "ROLLBACK TO n�zov_bodu_ulo�enia"
+
+#: sql_help.h:377
+msgid "define a new savepoint within the current transaction"
+msgstr "definova� nov� bod ulo�enia v aktu�lnej transkacii"
+
+#: sql_help.h:378
+msgid "SAVEPOINT savepoint_name"
+msgstr "SAVEPOINT n�zov_bodu_ulo�enia"
+
+#: sql_help.h:381
 msgid "retrieve rows from a table or view"
 msgstr "z�ska� riadky z tabu�ky alebo poh�adu"
 
-#: sql_help.h:370
+#: sql_help.h:382
 msgid ""
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
 "    * | expression [ AS output_name ] [, ...]\n"
@@ -2903,7 +2950,7 @@ msgstr ""
 "    zdrojov�_prvok [ NATURAL ] typ_spojenia zdrojov�_prvok [ ON "
 "podmienka_spojenia | USING ( st�pec_spojenia [, ...] ) ]"
 
-#: sql_help.h:374
+#: sql_help.h:386
 msgid ""
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
 "    * | expression [ AS output_name ] [, ...]\n"
@@ -2931,11 +2978,11 @@ msgstr ""
 "    [ OFFSET po�iatok ]\n"
 "    [ FOR UPDATE [ OF n�zov_tabu�ky [, ...] ] ]"
 
-#: sql_help.h:377
+#: sql_help.h:389
 msgid "change a run-time parameter"
 msgstr "zmeni� parameter behu syst�mu"
 
-#: sql_help.h:378
+#: sql_help.h:390
 msgid ""
 "SET [ SESSION | LOCAL ] name { TO | = } { value | 'value' | DEFAULT }\n"
 "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
@@ -2943,15 +2990,15 @@ msgstr ""
 "SET [ SESSION | LOCAL ] n�zov { TO | = } { hodnota | 'hodnota' | DEFAULT }\n"
 "SET [ SESSION | LOCAL ] TIME ZONE { �asov�_z�na | LOCAL | DEFAULT }"
 
-#: sql_help.h:381
+#: sql_help.h:393
 msgid "set the constraint mode of the current transaction"
 msgstr "nastavi� re�im obmedzenia aktu�lnej transkacie"
 
-#: sql_help.h:382
+#: sql_help.h:394
 msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
 msgstr "SET CONSTRAINTS { ALL | n�zov [, ...] } { DEFERRED | IMMEDIATE }"
 
-#: sql_help.h:385
+#: sql_help.h:397
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
@@ -2959,7 +3006,7 @@ msgstr ""
 "nastavi� identifik�tor pou��vate�a pre sedenie a aktu�lny identifik�tor "
 "pou��vate�a pre aktu�lne sedenie"
 
-#: sql_help.h:386
+#: sql_help.h:398
 msgid ""
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
@@ -2969,11 +3016,11 @@ msgstr ""
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
 "RESET SESSION AUTHORIZATION"
 
-#: sql_help.h:389
+#: sql_help.h:401
 msgid "set the characteristics of the current transaction"
 msgstr "nastavenie charakterist�k aktu�lnej transakcie"
 
-#: sql_help.h:390
+#: sql_help.h:402
 msgid ""
 "SET TRANSACTION\n"
 "    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
@@ -2995,11 +3042,11 @@ msgstr ""
 "| SERIALIZABLE } ]\n"
 "    [ READ WRITE | READ ONLY ]"
 
-#: sql_help.h:393
+#: sql_help.h:405
 msgid "show the value of a run-time parameter"
 msgstr "zobrazi� hodnotu parametra behu syst�mu"
 
-#: sql_help.h:394
+#: sql_help.h:406
 msgid ""
 "SHOW name\n"
 "SHOW ALL"
@@ -3007,7 +3054,7 @@ msgstr ""
 "SHOW n�zov\n"
 "SHOW ALL"
 
-#: sql_help.h:398
+#: sql_help.h:410
 msgid ""
 "START TRANSACTION\n"
 "    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
@@ -3019,27 +3066,27 @@ msgstr ""
 "| SERIALIZABLE } ]\n"
 "    [ READ WRITE | READ ONLY ]"
 
-#: sql_help.h:401
+#: sql_help.h:413
 msgid "empty a table"
 msgstr "vypr�zdni� tabu�ku"
 
-#: sql_help.h:402
+#: sql_help.h:414
 msgid "TRUNCATE [ TABLE ] name"
 msgstr "TRUNCATE [ TABLE ] n�zov"
 
-#: sql_help.h:405
+#: sql_help.h:417
 msgid "stop listening for a notification"
 msgstr "ukon�i� �akanie na notifik�ciu"
 
-#: sql_help.h:406
+#: sql_help.h:418
 msgid "UNLISTEN { name | * }"
 msgstr "UNLISTEN { n�zov | * }"
 
-#: sql_help.h:409
+#: sql_help.h:421
 msgid "update rows of a table"
 msgstr "aktualizova� riadky tabu�ky"
 
-#: sql_help.h:410
+#: sql_help.h:422
 msgid ""
 "UPDATE [ ONLY ] table SET column = { expression | DEFAULT } [, ...]\n"
 "    [ FROM fromlist ]\n"
@@ -3049,11 +3096,11 @@ msgstr ""
 "    [ FROM zoznam_zdrojov ]\n"
 "    [ WHERE podmienka ]"
 
-#: sql_help.h:413
+#: sql_help.h:425
 msgid "garbage-collect and optionally analyze a database"
 msgstr "zozbiera� odpadky a pr�padne analyzova� datab�zu"
 
-#: sql_help.h:414
+#: sql_help.h:426
 msgid ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index af8919a0f8..2feddc2502 100644
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.15 2004/02/15 19:38:28 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.16 2004/08/02 15:17:21 petere Exp $
 CATALOG_NAME	:= libpq
-AVAIL_LANGUAGES	:= af cs de es fr hr it nb pt_BR ru sl sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= af cs de es fr hr it nb pt_BR ru sk sl sv zh_CN zh_TW
 GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c
 GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
diff --git a/src/interfaces/libpq/po/sk.po b/src/interfaces/libpq/po/sk.po
new file mode 100644
index 0000000000..ee9c1356cf
--- /dev/null
+++ b/src/interfaces/libpq/po/sk.po
@@ -0,0 +1,509 @@
+# translation of libpq-sk.po to slovak
+# translation of libpq-sk-2.po to
+# translation of libpq-sk.po to
+# translation of libpq-cs.po to
+# Czech translation of libpq messages
+#
+# $Id: sk.po,v 1.1 2004/08/02 15:17:21 petere Exp $
+# Karel Zak <zakkr@zf.jcu.cz>, 2001-2003, 2004.
+# Zoltan Bartko <bartko.zoltan@pobox.sk>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libpq-sk\n"
+"POT-Creation-Date: 2004-08-02 07:25-0300\n"
+"PO-Revision-Date: 2004-08-02 15:45+0200\n"
+"Last-Translator: Zoltan Bartko <bartko.zoltan@pobox.sk>\n"
+"Language-Team: slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: fe-auth.c:232
+#, c-format
+msgid "Kerberos 4 error: %s\n"
+msgstr "Chyba Kerberos 4: %s\n"
+
+#: fe-auth.c:394
+#, c-format
+msgid "could not set socket to blocking mode: %s\n"
+msgstr "Nebolo mo�n� nastavi� soket na blokovac� re�im: %s\n"
+
+#: fe-auth.c:411 fe-auth.c:415
+#, c-format
+msgid "Kerberos 5 authentication rejected: %*s\n"
+msgstr "Autentifik�cia Kerberos 5 odmietnut�: %*s\n"
+
+#: fe-auth.c:441
+#, c-format
+msgid "could not restore non-blocking mode on socket: %s\n"
+msgstr "Nebolo mo�n� obnovi� neblokovac� re�im na sokete: %s\n"
+
+#: fe-auth.c:508
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "Autentifika�n� met�da SCM_CRED nie je podporovan�\n"
+
+#: fe-auth.c:600
+msgid "Kerberos 4 authentication failed\n"
+msgstr "Autentifik�cia Kerberos 4 bola ne�spe�n�\n"
+
+#: fe-auth.c:608
+msgid "Kerberos 4 authentication not supported\n"
+msgstr "Autentifik�cia Kerberos 4 nie je podporovan�\n"
+
+#: fe-auth.c:619
+msgid "Kerberos 5 authentication failed\n"
+msgstr "Autentifik�cia Kerberos 5 bola ne��pe�n�\n"
+
+#: fe-auth.c:627
+msgid "Kerberos 5 authentication not supported\n"
+msgstr "Autentifik�cia Kerberos 5 nie je podporovan�\n"
+
+#: fe-auth.c:655
+#, c-format
+msgid "authentication method %u not supported\n"
+msgstr "autentifika�n� met�da %u nie je podporovan�\n"
+
+#: fe-auth.c:692
+#, c-format
+msgid "invalid authentication service name \"%s\", ignored\n"
+msgstr "neplatn� n�zov autentifika�nej slu�by \"%s\" ignorovan�\n"
+
+#: fe-auth.c:764
+#, c-format
+msgid "fe_getauthname: invalid authentication system: %d\n"
+msgstr "fe_getauthname: neplatn� autentifika�n� syst�m: %d\n"
+
+#: fe-connect.c:452
+#, c-format
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "neplatn� hodnota sslmode: \"%s\"\n"
+
+#: fe-connect.c:472
+#, c-format
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr ""
+"hodnota sslvalue \"%s\" neplatn�, ak nie je podpora SSL zabudovan� do "
+"syst�mu\n"
+
+#: fe-connect.c:783
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "nebolo mo�n� prepn�� soket do neblokovacieho re�imu: %s\n"
+
+#: fe-connect.c:810
+#, c-format
+msgid "could not set socket to TCP no delay mode: %s\n"
+msgstr "nebolo mo�n� nastavi� re�im \"no delay\" (bez odkladu) TCP soketu: %s\n"
+
+#: fe-connect.c:841
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running locally and accepting\n"
+"\tconnections on Unix domain socket \"%s\"?\n"
+msgstr ""
+"nebolo mo�n� nadviaza� spojenie so serverom: %s\n"
+"\tJe server spusten� lok�lne a akceptuje\n"
+"\tspojenia prostredn�ctvom soketu \"%s\" syst�mu Unix ?\n"
+
+#: fe-connect.c:853
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"nebolo mo�n� nadviaza� spojenie so serverom: %s\n"
+"\tJe server spusten� na serveri \"%s\" a akceptuje\n"
+"\tspojenia TCP/IP na porte %s?\n"
+
+#: fe-connect.c:945
+#, c-format
+msgid "could not translate host name \"%s\" to address: %s\n"
+msgstr "nebolo mo�n� previes� n�zov po��ta�a \"%s\" na adresu: %s\n"
+
+#: fe-connect.c:949
+#, c-format
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr "nebolo mo�n� previes� cestu soketu syst�mu Unix \"%s\" na adresu: %s\n"
+
+#: fe-connect.c:1153
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "neplatn� stav spojenia, pravdepodobne nastalo poru�enie pam�ti\n"
+
+#: fe-connect.c:1196
+#, c-format
+msgid "could not create socket: %s\n"
+msgstr "nebolo mo�n� vytvori� soket: %s\n"
+
+#: fe-connect.c:1307
+#, c-format
+msgid "could not get socket error status: %s\n"
+msgstr "nebolo mo�n� zisti� chybov� stav soketu: %s\n"
+
+#: fe-connect.c:1346
+#, c-format
+msgid "could not get client address from socket: %s\n"
+msgstr "nebolo mo�n� z�skat adresu klienta zo soketu: %s\n"
+
+#: fe-connect.c:1391
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "nebolo mo�n� posla� vyjedn�vac� paket SSL (negotiation packet): %s\n"
+
+#: fe-connect.c:1413 fe-connect.c:2536 fe-connect.c:2545 fe-connect.c:3112
+#: fe-lobj.c:548
+msgid "out of memory\n"
+msgstr "nedostatok pam�ti\n"
+
+#: fe-connect.c:1426
+#, c-format
+msgid "could not send startup packet: %s\n"
+msgstr "nebolo mo�n� posla� po�iato�n� paket: %s\n"
+
+#: fe-connect.c:1466
+#, c-format
+msgid "could not receive server response to SSL negotiation packet: %s\n"
+msgstr ""
+"nebolo mo�n� z�ska� odpove� serveru na vyjedn�vac� paket SSL (negotiation "
+"packet): %s\n"
+
+#: fe-connect.c:1485 fe-connect.c:1502
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "server nepodporuje SSL, av�ak sa po�aduje pr�tomnos� SSL\n"
+
+#: fe-connect.c:1518
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "bola prijat� neplatn� odpove� na vyjedn�vanie SSL: %c\n"
+
+#: fe-connect.c:1575 fe-connect.c:1607
+#, c-format
+msgid "expected authentication request from server, but received %c\n"
+msgstr "o�ak�val sa autentifika�n� dotaz zo serveru, bolo v�ak prijat� %c\n"
+
+#: fe-connect.c:1843
+msgid "unexpected message from server during startup\n"
+msgstr "neo�ak�van� spr�va zo serveru po�as spustenia\n"
+
+#: fe-connect.c:1913
+#, c-format
+msgid "invalid connection state %c, probably indicative of memory corruption\n"
+msgstr "neplatn� stav spojenia %c, pravdepodobne do�lo k poru�eniu pam�ti\n"
+
+#: fe-connect.c:2584
+#, c-format
+msgid "missing \"=\" after \"%s\" in connection info string\n"
+msgstr "ch�baj�ce \"=\" po \"%s\" v informa�nom re�azci spojenia\n"
+
+#: fe-connect.c:2633
+msgid "unterminated quoted string in connection info string\n"
+msgstr "neukon�en� re�azec v �vodzovk�ch v informa�nom re�azci spojenia\n"
+
+#: fe-connect.c:2667
+#, c-format
+msgid "invalid connection option \"%s\"\n"
+msgstr "neplatn� parameter spojenia \"%s\"\n"
+
+#: fe-connect.c:2879
+msgid "connection pointer is NULL\n"
+msgstr "smern�k spojenia je NULL\n"
+
+#: fe-connect.c:3130
+#, c-format
+msgid ""
+"WARNING: Password file %s has world or group read access; permission should "
+"be u=rw (0600)\n"
+msgstr ""
+"UPOZORNENIE: s�bor s heslami %s m� pr�stupov� pr�va pre ��tanie pre skupinu "
+"alebo v�etk�ch pou�ivate�ov; pr�va by mali by� u=rw (0600)\n"
+
+#: fe-exec.c:484
+msgid "NOTICE"
+msgstr "POZN�MKA"
+
+#: fe-exec.c:653 fe-exec.c:705
+msgid "command string is a null pointer\n"
+msgstr "re�azec pr�kazu je NULL\n"
+
+#: fe-exec.c:740
+msgid "statement name is a null pointer\n"
+msgstr "n�zov pr�kazu je NULL\n"
+
+#: fe-exec.c:771
+msgid "no connection to the server\n"
+msgstr "neexistuje spojenie so serverom\n"
+
+#: fe-exec.c:778
+msgid "another command is already in progress\n"
+msgstr "spracov�va sa u� in� pr�kaz\n"
+
+#: fe-exec.c:814 fe-exec.c:1465
+msgid "function requires at least protocol version 3.0\n"
+msgstr "funkcia vy�aduje aspo� protokol verzie 3.0\n"
+
+#: fe-exec.c:1116
+#, c-format
+msgid "unexpected asyncStatus: %d\n"
+msgstr "neo�ak�van� asyncStatus: %d\n"
+
+#: fe-exec.c:1221
+msgid "COPY terminated by new PQexec"
+msgstr "COPY bolo ukon�en� nov�m PQexec"
+
+#: fe-exec.c:1229
+msgid "COPY IN state must be terminated first\n"
+msgstr "stav COPY IN sa mus� najprv ukon�i�\n"
+
+#: fe-exec.c:1249
+msgid "COPY OUT state must be terminated first\n"
+msgstr "stav COPY OUT sa mus� najprv ukon�i�\n"
+
+#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1507
+msgid "no COPY in progress\n"
+msgstr "COPY sa nevykon�va\n"
+
+#: fe-exec.c:1699
+msgid "connection in wrong state\n"
+msgstr "spojenie je v nevhodnom stave\n"
+
+#: fe-exec.c:1730
+msgid "invalid ExecStatusType code"
+msgstr "neplatn� k�d ExecStatusType"
+
+#: fe-exec.c:1794 fe-exec.c:1817
+#, c-format
+msgid "column number %d is out of range 0..%d"
+msgstr "��slo st�pca %d je mimo rozsah 0..%d"
+
+#: fe-exec.c:1810
+#, c-format
+msgid "row number %d is out of range 0..%d"
+msgstr "��slo riadku %d je mimo rozsah 0..%d"
+
+#: fe-exec.c:2094
+#, c-format
+msgid "could not interpret result from server: %s"
+msgstr "nebolo mo�n� interpretova� v�sledok zo serveru: %s"
+
+#: fe-lobj.c:402 fe-lobj.c:487
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "nebolo mo�n� otvori� s�bor \"%s\": %s\n"
+
+#: fe-lobj.c:414
+#, c-format
+msgid "could not create large object for file \"%s\"\n"
+msgstr "nebolo mo�n� vytvori� ve�k� objekt pre s�bor \"%s\"\n"
+
+#: fe-lobj.c:424 fe-lobj.c:474
+#, c-format
+msgid "could not open large object %u\n"
+msgstr "nebolo mo�n� otvori� ve�k� objekt %u\n"
+
+#: fe-lobj.c:439
+#, c-format
+msgid "error while reading file \"%s\"\n"
+msgstr "chyba po�as ��tania s�boru \"%s\"\n"
+
+#: fe-lobj.c:502 fe-lobj.c:515
+#, c-format
+msgid "error while writing to file \"%s\"\n"
+msgstr "chyba po�as z�pisu do s�boru \"%s\"\n"
+
+#: fe-lobj.c:593
+msgid "query to initialize large object functions did not return data\n"
+msgstr "dotaz inicializuj�ci funkcie ve�k�ch objektov nevr�til d�ta\n"
+
+#: fe-lobj.c:631
+msgid "cannot determine OID of function lo_open\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie lo_open\n"
+
+#: fe-lobj.c:638
+msgid "cannot determine OID of function lo_close\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie lo_close\n"
+
+#: fe-lobj.c:645
+msgid "cannot determine OID of function lo_creat\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie lo_creat\n"
+
+#: fe-lobj.c:652
+msgid "cannot determine OID of function lo_unlink\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie lo_unlink\n"
+
+#: fe-lobj.c:659
+msgid "cannot determine OID of function lo_lseek\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie lo_lseek\n"
+
+#: fe-lobj.c:666
+msgid "cannot determine OID of function lo_tell\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie lo_tell\n"
+
+#: fe-lobj.c:673
+msgid "cannot determine OID of function loread\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie loread\n"
+
+#: fe-lobj.c:680
+msgid "cannot determine OID of function lowrite\n"
+msgstr "nebolo mo�n� ur�i� OID funkcie lowrite\n"
+
+#: fe-misc.c:228
+#, c-format
+msgid "integer of size %lu not supported by pqGetInt"
+msgstr "pqGetInt nepodporuje cel� ��sla (integer) ve�kosti %lu"
+
+#: fe-misc.c:264
+#, c-format
+msgid "integer of size %lu not supported by pqPutInt"
+msgstr "pqPutInt nepodporuje cel� ��sla (integer) ve�kosti %lu"
+
+#: fe-misc.c:544 fe-misc.c:748
+msgid "connection not open\n"
+msgstr "spojenie nie je vytvoren�\n"
+
+#: fe-misc.c:610 fe-misc.c:701
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "nebolo mo�n� prija� d�ta zo serveru: %s\n"
+
+#: fe-misc.c:718 fe-misc.c:786
+msgid ""
+"server closed the connection unexpectedly\n"
+"\tThis probably means the server terminated abnormally\n"
+"\tbefore or while processing the request.\n"
+msgstr ""
+"server neo�ek�vane ukon�il spojenie\n"
+"\tPravdepodobne to znamen�, �e bol ukon�en� ne�tandardn�m sp�sobom\n"
+"\tpred alebo po�as spracovania po�iadavky.\n"
+
+#: fe-misc.c:803
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "nebolo mo�n� posla� d�ta serveru: %s\n"
+
+#: fe-misc.c:922
+msgid "timeout expired\n"
+msgstr "�as vypr�al\n"
+
+#: fe-misc.c:967
+msgid "socket not open\n"
+msgstr "soket nie je otvoren�\n"
+
+#: fe-misc.c:990
+#, c-format
+msgid "select() failed: %s\n"
+msgstr "pr�kaz select() bol ne�spe�n�: %s\n"
+
+#: fe-secure.c:260
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "nebolo mo�n� vytvori� spojenie SSL: %s\n"
+
+#: fe-secure.c:323 fe-secure.c:403 fe-secure.c:1022
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "Chyba SSL SYSCALL: %s\n"
+
+#: fe-secure.c:328 fe-secure.c:408 fe-secure.c:1026
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "Chyba SSL SYSCALL: bol zisten� znak konca s�boru (EOF)\n"
+
+#: fe-secure.c:339 fe-secure.c:418 fe-secure.c:1034
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "Chyba SSL: %s\n"
+
+#: fe-secure.c:349 fe-secure.c:428 fe-secure.c:1042
+msgid "unrecognized SSL error code\n"
+msgstr "Nezn�my chybov� k�d SSL\n"
+
+#: fe-secure.c:490
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "chyba dotazovania soketu: %s\n"
+
+#: fe-secure.c:518
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "nebolo mo�n� z�ska� inform�cie o po��ta�i (%s): %s\n"
+
+#: fe-secure.c:537
+msgid "unsupported protocol\n"
+msgstr "nepodporovan� protokol\n"
+
+#: fe-secure.c:559
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr "N�zov serveru \"%s\" nebolo mo�n� prelo�i� na %ld.%ld.%ld.%ld\n"
+
+#: fe-secure.c:566
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr "N�zov serveru \"%s\" nebolo mo�n� prelo�i� na peer adresu\n"
+
+#: fe-secure.c:749
+msgid "could not get user information\n"
+msgstr "nebolo mo�n� z�ska� inform�cie o pou�ivate�ovi\n"
+
+#: fe-secure.c:761
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "nebolo mo�n� otvori� certifik�t (%s): %s\n"
+
+#: fe-secure.c:769
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "nebolo mo�n� na��ta� certifik�t (%s): %s\n"
+
+#: fe-secure.c:783
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr "certifik�t je pr�tomn�, ale s�kromn� k��� nie je(%s)\n"
+
+#: fe-secure.c:792
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr "s�kromn� k��� (%s) m� nespr�vne nastaven� pr�stupov� pr�vomoci\n"
+
+#: fe-secure.c:799
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr "nebolo mo�n� otvori� s�bor so s�kromn�m k���om (%s): %s\n"
+
+#: fe-secure.c:808
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr "S�kromn� k��� (%s) bol zmenen� po�as behu syst�mu\n"
+
+#: fe-secure.c:816
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr "nebolo mo�n� na�ita� s�kromn� k��� (%s): %s\n"
+
+#: fe-secure.c:830
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr "certifik�t/s�kromn� k��� s� rozdielne (%s): %s\n"
+
+#: fe-secure.c:909
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "nebolo mo�n� vytvori� kontext SSL: %s\n"
+
+#: fe-secure.c:953 fe-secure.c:962
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "nebolo mo�n� na��ta� kore�ov� zoznam certifik�tov (%s): %s\n"
+
+#: fe-secure.c:1061
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "nebolo mo�n� validova� certifik�t: %s\n"
+
+#: fe-secure.c:1074
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "nebolo mo�n� z�ska� certifik�t: %s\n"
+