Translation updates

src/bin/pg_controldata/po/fr.po

 # French Translation for pg_controldata messages
-# Loc Hennequin <loic.hennequin@wanadoo.fr>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/fr.po,v 1.2 2003/06/29 10:13:12 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/fr.po,v 1.3 2003/08/04 14:01:30 petere Exp $
+# Loc Hennequin <loic.hennequin@wanadoo.fr>, 2002.
+# Guillaume Lelarge <gleu@wanadoo.fr>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-12-04 04:21-0500\n"
-"PO-Revision-Date: 2002-12-05 18:52+CEST\n"
-"Last-Translator: Loc HENNEQUIN <loic.hennequin@wanadoo.fr>\n"
-"Language-Team: French <fr@li.org>\n"
+"Project-Id-Version: PostgreSQL 7.4\n"
+"POT-Creation-Date: 2003-07-31 04:20-0300\n"
+"PO-Revision-Date: 2003-08-02 18:47+0000\n"
+"Last-Translator: Guillaume Lelarge <gleu@wanadoo.fr>\n"
+"Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.1\n"
 
 #: pg_controldata.c:28
 #, c-format
 msgid ""
-"%s displays PostgreSQL database cluster control information.\n"
+"%s displays control information of a PostgreSQL database cluster.\n"
 "\n"
 msgstr ""
 "%s affiche les informations de contrle du cluster de base de donnes PostgreSQL.\n"
 "\n"
 
-#: pg_controldata.c:29
+#: pg_controldata.c:32
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [DATADIR]\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 ""
 "Usage:\n"
-"  %s [REPDONNEES]\n"
+"  %s [OPTION]\n"
 "\n"
+"Options:\n"
+"  DATADIR        affiche les informations de contrle du cluster pour DATADIR\n"
+"  --help         affiche cette aide, puis quitte\n"
+"  --version      affiche les informations sur la version, puis quitte\n"
 
-#: pg_controldata.c:30
+#: pg_controldata.c:41
 msgid ""
-"If not data directory is specified, the environment variable PGDATA\n"
+"\n"
+"If no data directory is specified, the environment variable PGDATA\n"
 "is used.\n"
 "\n"
 msgstr ""
+"\n"
 "Si aucun rpertoire n'est spcifi, la variable d'environnement PGDATA\n"
 "est utilise.\n"
 "\n"
 
-#: pg_controldata.c:31
+#: pg_controldata.c:42
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Rapporter les bogues  <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_controldata.c:41
+#: pg_controldata.c:52
 msgid "starting up"
 msgstr "dmarrage en cours"
 
-#: pg_controldata.c:43
+#: pg_controldata.c:54
 msgid "shut down"
 msgstr "arrt"
 
-#: pg_controldata.c:45
+#: pg_controldata.c:56
 msgid "shutting down"
 msgstr "arrt en cours"
 
-#: pg_controldata.c:47
+#: pg_controldata.c:58
 msgid "in recovery"
 msgstr "restauration en cours"
 
-#: pg_controldata.c:49
+#: pg_controldata.c:60
 msgid "in production"
 msgstr "en production"
 
-#: pg_controldata.c:51
+#: pg_controldata.c:62
 msgid "unrecognized status code"
 msgstr "code de statut inconnu"
 
-#: pg_controldata.c:99
+#: pg_controldata.c:107
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: aucun rpertoire de donnes n'a t spcifi\n"
 
-#: pg_controldata.c:107
+#: pg_controldata.c:108
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Essayez \"%s --help\" pour plus d'informations.\n"
+
+#: pg_controldata.c:116
 #, c-format
-msgid "%s: could not open file \"%s\" for reading (%s)\n"
-msgstr "%s: ne peut ouvrir le fichier \"%s\" en lecture (%s)\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: ne peut ouvrir le fichier \"%s\" en lecture: %s\n"
 
-#: pg_controldata.c:114
+#: pg_controldata.c:123
 #, c-format
-msgid "%s: could not read file \"%s\" (%s)\n"
-msgstr "%s: ne peut lire le fichier \"%s\" (%s)\n"
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: ne peut lire le fichier \"%s\": %s\n"
 
-#: pg_controldata.c:128
+#: pg_controldata.c:137
 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"
@@ -99,120 +116,130 @@ msgstr ""
 "attend. Les rsultats ci-dessous ne sont pas dignes de confiance.\n"
 "\n"
 
-#: pg_controldata.c:141
+#: pg_controldata.c:150
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Numro de version de pg_control:                           %u\n"
 
-#: pg_controldata.c:142
+#: pg_controldata.c:151
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Numro de version du catalogue:                            %u\n"
 
-#: pg_controldata.c:143
+#: pg_controldata.c:152
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Etat du cluster de base de donnes:                        %s\n"
 
-#: pg_controldata.c:144
+#: pg_controldata.c:153
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "Dernire modification de pg_control:                       %s\n"
 
-#: pg_controldata.c:145
+#: pg_controldata.c:154
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "ID du fichier journal courant:                             %u\n"
 
-#: pg_controldata.c:146
+#: pg_controldata.c:155
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Prochain segment de fichier journal:                       %u\n"
 
-#: pg_controldata.c:147
+#: pg_controldata.c:156
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Dernire localisation du point de contrle:                %X/%X\n"
 
-#: pg_controldata.c:149
+#: pg_controldata.c:158
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "Prcdente localisation du point de contrle:              %X/%X\n"
 
-#: pg_controldata.c:151
+#: pg_controldata.c:160
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "Dernire localisation de reprise du point de contrle:     %X/%X\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:162
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "Dernire localisation d'annulation du point de contrle:   %X/%X\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:164
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
 msgstr "Dernier StartUpID du point de contrle:                    %u\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:165
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "Dernier NextXID du point de contrle:                      %u\n"
 
-#: pg_controldata.c:157
+#: pg_controldata.c:166
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Dernier NextXOID du point de contrle:                     %u\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:167
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Heure du dernier point de contrle:                        %s\n"
 
-#: pg_controldata.c:159
+#: pg_controldata.c:168
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Taille de bloc de la base de donnes:                      %u\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:169
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blocs par segment pour une relation importante:            %u\n"
 
-#: pg_controldata.c:161
+#: pg_controldata.c:170
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Taille maximale des identifiants:                          %u\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:171
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Nombre maximum d'arguments  une fonction:                 %u\n"
 
-#: pg_controldata.c:163
+#: pg_controldata.c:172
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Stockage du type Date/Heure:                               %s\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:173
 msgid "64-bit integers"
 msgstr "entiers 64-bits"
 
-#: pg_controldata.c:164
-msgid "Floating point"
-msgstr "Virgule flottante"
+#: pg_controldata.c:173
+msgid "floating-point numbers"
+msgstr "Nombres  virgule flottante"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:174
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Taille maximum d'un nom local:                             %u\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:175
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                                                %s\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:176
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                                                  %s\n"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DATADIR]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Usage:\n"
+#~ "  %s [REPDONNEES]\n"
+#~ "\n"
+

src/bin/pg_controldata/po/ru.po

 # ru.po
 # PG_CONTROLDATA Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/Attic/ru.po,v 1.3 2003/08/01 16:19:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/Attic/ru.po,v 1.4 2003/08/04 14:01:32 petere Exp $
 #
 # ChangeLog:
-#   - July 24, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24-26, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post 7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
@@ -12,14 +12,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
 "POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-07-24 02:09-0500\n"
+"PO-Revision-Date: 2003-08-01 14:10-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_controldata.c:31
+#: pg_controldata.c:28
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s       PostgreSQL.\n"
+"\n"
+
+#: pg_controldata.c:32
 #, c-format
 msgid ""
 "Usage:\n"
@@ -27,30 +36,26 @@ msgid ""
 "\n"
 "Options:\n"
 "  DATADIR        show cluster control information for DATADIR\n"
-"  -?, --help     display this help and exit\n"
-"  -V, --version  display pg_controldata's version and exit\n"
-"\n"
+"  --help         show this help, then exit\n"
+"  --version      output version information, then exit\n"
 msgstr ""
 ":\n"
 "  %s []\n"
 "\n"
 ":\n"
 "              \n"
-"  -?, --help         \n"
-"  -V, --version    pg_controldata  t\n"
+"  --help             \n"
+"  --version        pg_controldata  t\n"
 "\n"
 
-#: pg_controldata.c:40
-#, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
-msgstr "%s       PostgreSQL.\n"
-
 #: pg_controldata.c:41
 msgid ""
+"\n"
 "If no data directory is specified, the environment variable PGDATA\n"
 "is used.\n"
 "\n"
 msgstr ""
+"\n"
 "    ,    \n"
 " PGDATA.\n"
 "\n"
@@ -90,18 +95,18 @@ msgstr "%s:
 
 #: pg_controldata.c:108
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr " '%s --help'    .\n"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr " \"%s --help\"    .\n"
 
 #: pg_controldata.c:116
 #, c-format
-msgid "%s: could not open file \"%s\" for reading (%s)\n"
-msgstr "%s:     \"%s\"   (%s)\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s:     \"%s\"  : %s\n"
 
 #: pg_controldata.c:123
 #, c-format
-msgid "%s: could not read file \"%s\" (%s)\n"
-msgstr "%s:     \"%s\" (%s)\n"
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
 
 #: pg_controldata.c:137
 msgid ""
@@ -215,8 +220,8 @@ msgid "64-bit integers"
 msgstr "64- "
 
 #: pg_controldata.c:173
-msgid "Floating point"
-msgstr " "
+msgid "floating-point numbers"
+msgstr "   "
 
 #: pg_controldata.c:174
 #, c-format

src/bin/pg_resetxlog/po/ru.po

 # ru.po
 # PG_RESETXLOG Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.3 2003/08/01 16:19:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.4 2003/08/04 14:01:37 petere Exp $
 #
 # ChangeLog:
-#   - July 24, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24-26, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
 "POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-07-24 01:51-0500\n"
+"PO-Revision-Date: 2003-08-01 14:15-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: pg_resetxlog.c:141
 #, c-format
-msgid "%s: invalid argument for -x option\n"
+msgid "%s: invalid argument for option -x\n"
 msgstr "%s:     -x\n"
 
 #: pg_resetxlog.c:142
@@ -32,8 +32,8 @@ msgstr "%s:
 #: pg_resetxlog.c:185
 #: pg_resetxlog.c:193
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr " '%s --help'    .\n"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr " \"%s --help\"    .\n"
 
 #: pg_resetxlog.c:147
 #, c-format
@@ -42,7 +42,7 @@ msgstr "%s: ID
 
 #: pg_resetxlog.c:156
 #, c-format
-msgid "%s: invalid argument for -o option\n"
+msgid "%s: invalid argument for option -o\n"
 msgstr "%s:     -o\n"
 
 #: pg_resetxlog.c:162
@@ -53,7 +53,7 @@ msgstr "%s: OID (-o)
 #: pg_resetxlog.c:171
 #: pg_resetxlog.c:178
 #, c-format
-msgid "%s: invalid argument for -l option\n"
+msgid "%s: invalid argument for option -l\n"
 msgstr "%s:     -l\n"
 
 #: pg_resetxlog.c:192
@@ -64,16 +64,16 @@ msgstr "%s:
 #: pg_resetxlog.c:212
 #: pg_resetxlog.c:308
 #, c-format
-msgid "%s: could not open %s for reading: %s\n"
-msgstr "%s:    %s  : %s\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s:     \"%s\"  : %s\n"
 
 #: pg_resetxlog.c:218
 #, c-format
 msgid ""
-"%s: lock file %s exists\n"
+"%s: lock file \"%s\" exists\n"
 "Is a server running?  If not, delete the lock file and try again.\n"
 msgstr ""
-"%s:  lock- %s\n"
+"%s:  lock- \"%s\"\n"
 "  ?  ,      .\n"
 
 #: pg_resetxlog.c:257
@@ -101,7 +101,7 @@ msgstr "
 #: pg_resetxlog.c:311
 #, c-format
 msgid ""
-"If you are sure the data directory path is correct, do\n"
+"If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
@@ -111,8 +111,8 @@ msgstr ""
 
 #: pg_resetxlog.c:324
 #, c-format
-msgid "%s: could not read %s: %s\n"
-msgstr "%s:    %s: %s\n"
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
 
 #: pg_resetxlog.c:347
 #, c-format
@@ -215,8 +215,8 @@ msgid "64-bit integers"
 msgstr "64- "
 
 #: pg_resetxlog.c:452
-msgid "Floating point"
-msgstr " "
+msgid "floating-point numbers"
+msgstr " "
 
 #: pg_resetxlog.c:453
 #, c-format
@@ -256,29 +256,29 @@ msgstr "%s:
 
 #: pg_resetxlog.c:560
 #, c-format
-msgid "%s: could not open directory %s: %s\n"
-msgstr "%s:     %s: %s\n"
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
 
 #: pg_resetxlog.c:574
 #, c-format
-msgid "%s: could not delete file %s: %s\n"
-msgstr "%s:     %s: %s\n"
+msgid "%s: could not delete file \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
 
 #: pg_resetxlog.c:584
 #, c-format
-msgid "%s: could not read from directory %s: %s\n"
-msgstr "%s:      %s: %s\n"
+msgid "%s: could not read from directory \"%s\": %s\n"
+msgstr "%s:      \"%s\": %s\n"
 
 #: pg_resetxlog.c:647
 #, c-format
-msgid "%s: could not open %s: %s\n"
-msgstr "%s:    %s: %s\n"
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
 
 #: pg_resetxlog.c:658
 #: pg_resetxlog.c:672
 #, c-format
-msgid "%s: could not write %s: %s\n"
-msgstr "%s:    %s: %s\n"
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
 
 #: pg_resetxlog.c:691
 #, c-format
@@ -310,8 +310,7 @@ msgstr "  -f
 
 #: pg_resetxlog.c:695
 msgid "  -l FILEID,SEG   force minimum WAL starting location for new transaction log\n"
-msgstr ""
-"  -l FILEID,SEG    .    WAL    \n"
+msgstr "  -l FILEID,SEG    .    WAL    \n"
 
 #: pg_resetxlog.c:696
 msgid "  -n              no update, just show extracted control values (for testing)\n"

src/interfaces/libpq/po/ru.po

 # ru.po
 # LIBPQ Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.5 2003/08/01 16:19:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.6 2003/08/04 14:01:37 petere Exp $
 #
 # ChangeLog:
-#   - July 24, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24 - August 1, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
 #   - Januray 2, 2002: Completed SSL transaltion, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Post-7.3beta2 fuzzy translation fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
 "POT-Creation-Date: 2003-07-24 11:45+0200\n"
-"PO-Revision-Date: 2003-07-24 08:45-0500\n"
+"PO-Revision-Date: 2003-08-01 14:13-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -77,17 +77,27 @@ msgstr "
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname:   : %d\n"
 
-#: fe-connect.c:717
+#: fe-connect.c:451
+#, c-format
+msgid "unrecognized sslmode: \"%s\"\n"
+msgstr " sslmode: \"%s\"\n"
+
+#: fe-connect.c:469
+#, c-format
+msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "sslmode \"%s\"    SSL  \n"
+
+#: fe-connect.c:781
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "       : %s\n"
 
-#: fe-connect.c:744
+#: fe-connect.c:808
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "      TCP : %s\n"
 
-#: fe-connect.c:775
+#: fe-connect.c:839
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -98,7 +108,7 @@ msgstr ""
 "\t     \n"
 "\t   Unix'  \"%s\"?\n"
 
-#: fe-connect.c:787
+#: fe-connect.c:851
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -109,102 +119,107 @@ msgstr ""
 "\t     \"%s\"   \n"
 "\t  TCP/IP    %s?\n"
 
-#: fe-connect.c:871
+#: fe-connect.c:935
 #, c-format
 msgid "could not translate hostname \"%s\" to address: %s\n"
 msgstr "     \"%s\"  : %s\n"
 
-#: fe-connect.c:875
+#: fe-connect.c:939
 #, c-format
 msgid "could not translate local service to address: %s\n"
 msgstr "      : %s\n"
 
-#: fe-connect.c:1069
+#: fe-connect.c:1141
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "  ,      \n"
 
-#: fe-connect.c:1112
+#: fe-connect.c:1184
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "   : %s\n"
 
-#: fe-connect.c:1218
+#: fe-connect.c:1290
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "     : %s\n"
 
-#: fe-connect.c:1255
+#: fe-connect.c:1327
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "      : %s\n"
 
-#: fe-connect.c:1297
+#: fe-connect.c:1368
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "     SSL: %s\n"
 
-#: fe-connect.c:1319
-#: fe-connect.c:2369
-#: fe-connect.c:2378
-#: fe-connect.c:2945
+#: fe-connect.c:1390
+#: fe-connect.c:2551
+#: fe-connect.c:2560
+#: fe-connect.c:3127
 #: fe-lobj.c:538
 msgid "out of memory\n"
 msgstr " \n"
 
-#: fe-connect.c:1332
+#: fe-connect.c:1403
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "    : %s\n"
 
-#: fe-connect.c:1372
+#: fe-connect.c:1443
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "        SSL: %s\n"
 
-#: fe-connect.c:1391
-#: fe-connect.c:1408
+#: fe-connect.c:1462
+#: fe-connect.c:1488
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "   SSL,   SSL  \n"
 
-#: fe-connect.c:1424
+#: fe-connect.c:1470
+#: fe-connect.c:1496
+msgid "server does not support SSL, and previous non-SSL attempt failed\n"
+msgstr "   SSL,   -SSL   \n"
+
+#: fe-connect.c:1513
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "       SSL: %c\n"
 
-#: fe-connect.c:1480
-#: fe-connect.c:1512
+#: fe-connect.c:1569
+#: fe-connect.c:1601
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "    ,   : %c\n"
 
-#: fe-connect.c:1706
+#: fe-connect.c:1872
 msgid "unexpected message from server during startup\n"
 msgstr "     \n"
 
-#: fe-connect.c:1775
+#: fe-connect.c:1941
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "   %c,      \n"
 
-#: fe-connect.c:2417
+#: fe-connect.c:2599
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr " \"=\"  \"%s\"   \n"
 
-#: fe-connect.c:2466
+#: fe-connect.c:2648
 msgid "unterminated quoted string in connection info string\n"
 msgstr "  (  )   \n"
 
-#: fe-connect.c:2500
+#: fe-connect.c:2682
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "   \"%s\"\n"
 
-#: fe-connect.c:2712
+#: fe-connect.c:2894
 msgid "connection pointer is NULL\n"
 msgstr "   NULL'\n"
 
-#: fe-connect.c:2963
+#: fe-connect.c:3145
 #, c-format
 msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"
 msgstr ":   %s        ;    u=rw (0600)\n"