Translation updates

2 files changed, 568 insertions, 586 deletions

diff --git a/src/interfaces/libpq/po/fr.po b/src/interfaces/libpq/po/fr.po
index 52f2bcc78c5..e538d0fadf4 100644
--- a/src/interfaces/libpq/po/fr.po
+++ b/src/interfaces/libpq/po/fr.po
@@ -1,6 +1,6 @@
 # French message translation file for libpq
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.4 2003/08/20 21:10:01 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.5 2003/09/15 20:42:40 petere Exp $
 #
 # Use these quotes: «%s»
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
@@ -10,10 +10,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-08-15 04:17-0300\n"
+"POT-Creation-Date: 2003-09-15 14:56+0200\n"
 "PO-Revision-Date: 2003-08-15 15:28+0000\n"
 "Last-Translator: Guillaume Lelarge <gleu@wanadoo.fr>\n"
-"Language-Team: FR_fr <fr@li.org>\n"
+"Language-Team: FR_fr <traduction@pgsql-fr.tuxfamily.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: fe-auth.c:232
 #, c-format
 msgid "Kerberos 4 error: %s\n"
-msgstr "erreur de Kerberos 4: %s\n"
+msgstr "erreur Kerberos 4: %s\n"
 
 #: fe-auth.c:394
 #, c-format
@@ -82,7 +82,7 @@ msgstr "sslmode inconnu: «%s»\n"
 #: fe-connect.c:472
 #, c-format
 msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
-msgstr "sslmode «%s» invalide quand le support de SSL n'a pas été compilé\n"
+msgstr "sslmode «%s» non valable quand le support SSL n'a pas été compilé\n"
 
 #: fe-connect.c:783
 #, c-format
@@ -92,7 +92,7 @@ msgstr "n'a pas pu activer le mode non-bloquant pour le socket: %s\n"
 #: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "n'a pas pu activer le mode non-bloquant de TCP pour le socket: %s\n"
+msgstr "n'a pas pu activer le mode sans délai de TCP pour le socket: %s\n"
 
 #: fe-connect.c:841
 #, c-format
@@ -102,7 +102,7 @@ msgid ""
 "\tconnections on Unix domain socket \"%s\"?\n"
 msgstr ""
 "n'a pas pu connecter au serveur: %s\n"
-"\tEst-ce que le serveur est en éxecution à l'hôte local\n"
+"\tEst-ce que le serveur tourne sur l'hôte local\n"
 "\tet accepte des connexions au socket Unix «%s»?\n"
 
 #: fe-connect.c:853
@@ -113,7 +113,7 @@ msgid ""
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "n'a pas pu se connecter au serveur: %s\n"
-"\tEst-ce que le serveur est en exécution sur l'hôte «%s»\n"
+"\tEst-ce que le serveur tourne sur l'hôte «%s»\n"
 "\tet accepte des connexions TCP/IP sur le port %s?\n"
 
 #: fe-connect.c:937
@@ -128,7 +128,7 @@ msgstr "n'a pas pu traduire le service local en adresse: %s\n"
 
 #: fe-connect.c:1144
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "état invalide de connexion, probablement une indication de mémoire corrompue\n"
+msgstr "état non valable de connexion, probablement une indication de mémoire corrompue\n"
 
 #: fe-connect.c:1187
 #, c-format
@@ -138,7 +138,7 @@ msgstr "n'a pas pu créer le socket: %s\n"
 #: fe-connect.c:1298
 #, c-format
 msgid "could not get socket error status: %s\n"
-msgstr "n'a pas pu déterminer l'erreur du socket: %s\n"
+msgstr "n'a pas pu déterminer le statut d'erreur du socket: %s\n"
 
 #: fe-connect.c:1337
 #, c-format
@@ -172,12 +172,12 @@ msgstr "le serveur ne supporte pas SSL, mais SSL était exigé\n"
 #: fe-connect.c:1509
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "réponse invalide au négociation SSL était reçue: %c\n"
+msgstr "réponse non valable au négociation SSL a été reçue: %c\n"
 
 #: fe-connect.c:1566 fe-connect.c:1598
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
-msgstr "requête d'authentification attendue, mais %c était reçu\n"
+msgstr "requête d'authentification attendue du serveur, mais %c a été reçu\n"
 
 #: fe-connect.c:1834
 msgid "unexpected message from server during startup\n"
@@ -186,7 +186,7 @@ msgstr "message inattendu du serveur lors de démarrage\n"
 #: fe-connect.c:1904
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "état invalide de connexion (%c), probablement une indication de mémoire corrompue\n"
+msgstr "état non valable de connexion (%c), probablement une indication de mémoire corrompue\n"
 
 #: fe-connect.c:2559
 #, c-format
@@ -195,12 +195,12 @@ msgstr "«=» manquant après «%s» dans la chaîne de paramètres de connexion\n"
 
 #: fe-connect.c:2608
 msgid "unterminated quoted string in connection info string\n"
-msgstr "chaîne incomplète entre guillemets dans la chaîne de paramètres de connexion\n"
+msgstr "guillemets non refermés dans la chaîne de paramètres de connexion\n"
 
 #: fe-connect.c:2642
 #, c-format
 msgid "invalid connection option \"%s\"\n"
-msgstr "option invalide de connexion «%s»\n"
+msgstr "option de connexion non valable «%s»\n"
 
 #: fe-connect.c:2854
 msgid "connection pointer is NULL\n"
@@ -211,7 +211,7 @@ msgstr "le pointeur de connexion vaut NULL\n"
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
 "be u=rw (0600)\n"
-msgstr "ATTENTION: Le fichier des mots de passe %s a des permission de groupe et pour tous en lecture; les permissions doivent être u=rw (0600)\n"
+msgstr "ATTENTION: Le fichier des mots de passe %s a des droits de groupe et pour tous en lecture; les droits devraient être u=rw (0600)\n"
 
 #: fe-exec.c:484
 msgid "NOTICE"
@@ -284,17 +284,17 @@ msgstr "n'a pas pu interpréter la réponse du serveur: %s"
 #: fe-lobj.c:402 fe-lobj.c:487
 #, c-format
 msgid "could not open file \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir «%s»: %s\n"
+msgstr "n'a pas pu ouvrir le fichier «%s»: %s\n"
 
 #: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
-msgstr "ne peut pas créer l'objet large pour le fichier \"%s\"\n"
+msgstr "ne peut pas créer le gros objet pour le fichier \"%s\"\n"
 
 #: fe-lobj.c:424 fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
-msgstr "ne peut pas ouvrir l'objet large %u\n"
+msgstr "ne peut pas ouvrir le gros objet %u\n"
 
 #: fe-lobj.c:439
 #, c-format
@@ -308,7 +308,7 @@ msgstr "erreur d'écriture du fichier «%s»\n"
 
 #: fe-lobj.c:568
 msgid "query to initialize large object functions did not return data\n"
-msgstr "la requête d'initialisation des fonctions des objets larges ne retourne pas de données\n"
+msgstr "la requête d'initialisation des fonctions de gros objets ne renvoie pas de données\n"
 
 #: fe-lobj.c:606
 msgid "cannot determine OID of function lo_open\n"
@@ -367,14 +367,14 @@ msgid ""
 "\tThis probably means the server terminated abnormally\n"
 "\tbefore or while processing the request.\n"
 msgstr ""
-"la connexion était terminée à l'improviste par le serveur\n"
-"\tPeut-être c'est à dire que le serveur a terminé anormalement\n"
+"la connexion a été terminée à l'improviste par le serveur\n"
+"\tCela signifie probablement que le serveur a terminé anormalement\n"
 "\tavant ou lors du traitement de la requête.\n"
 
 #: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
-msgstr "n'a pas pu transmettre des données au serveur: %s\n"
+msgstr "n'a pas pu transmettre les données au serveur: %s\n"
 
 #: fe-misc.c:905
 msgid "timeout expired\n"
@@ -394,23 +394,23 @@ msgstr "échec de select(): %s\n"
 msgid "could not establish SSL connection: %s\n"
 msgstr "n'a pas pu établir la connexion SSL: %s\n"
 
-#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:894
+#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:907
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "erreur SYSCALL SSL: %s\n"
 
-#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:898
+#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:911
 msgid "SSL SYSCALL error: EOF detected\n"
-msgstr "erreur SYSCALL SSL: EOF a été trouvé\n"
+msgstr "erreur SYSCALL SSL: EOF détecté\n"
 
-#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:904
+#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:917
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "erreur de SSL: %s\n"
 
-#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:910
+#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:923
 msgid "Unknown SSL error code\n"
-msgstr "code d'erreur SSL inconnue\n"
+msgstr "code d'erreur SSL inconnu\n"
 
 #: fe-secure.c:459
 #, c-format
@@ -436,66 +436,66 @@ msgstr "le nom courant du serveur \"%s\" n'a pas pu être résolu en %ld.%ld.%ld.%
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "le nom courant du serveur \"%s\" n'a pas pu être résolu en une adresse d'un pair\n"
 
-#: fe-secure.c:704
+#: fe-secure.c:712
 msgid "could not get user information\n"
 msgstr "n'a pas pu obtenir les informations utilisateur\n"
 
-#: fe-secure.c:716
+#: fe-secure.c:724
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "n'a pas pu ouvrir le certificat (%s): %s\n"
 
-#: fe-secure.c:723
+#: fe-secure.c:731
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "n'a pas pu lire le certificat (%s): %s\n"
 
-#: fe-secure.c:736
+#: fe-secure.c:744
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "le certificat est présent, mais pas la clé privée (%s)\n"
 
-#: fe-secure.c:745
+#: fe-secure.c:753
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
-msgstr "la clé privée (%s) n'a pas les bonnes permissions\n"
+msgstr "la clé privée (%s) n'a pas les bons droits\n"
 
-#: fe-secure.c:752
+#: fe-secure.c:760
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "n'a pas pu ouvrir le fichier de clé privée (%s): %s\n"
 
-#: fe-secure.c:761
+#: fe-secure.c:769
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "la clé privée (%s) a changé pendant l'exécution\n"
 
-#: fe-secure.c:768
+#: fe-secure.c:776
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "n'a pas pu lire la clé privée (%s): %s\n"
 
-#: fe-secure.c:780
+#: fe-secure.c:788
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "le certificat et la clé privée ne correspondent pas (%s): %s\n"
 
-#: fe-secure.c:810
+#: fe-secure.c:821
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "n'a pas pu créer le contexte SSL: %s\n"
 
-#: fe-secure.c:828 fe-secure.c:836
+#: fe-secure.c:840 fe-secure.c:848
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "n'a pas pu lire la liste de certificat racine (%s): %s\n"
 
-#: fe-secure.c:929
+#: fe-secure.c:942
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "le certificat n'a pas pu être validé: %s\n"
 
-#: fe-secure.c:941
+#: fe-secure.c:954
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "le certificat n'a pas pu être obtenu: %s\n"
@@ -504,22 +504,22 @@ msgstr "le certificat n'a pas pu être obtenu: %s\n"
 #~ msgstr "le serveur ne supporte pas SSL, et l'essai précédent sans SSL a échoué\n"
 
 #~ msgid "could not determine the PostgreSQL user name to use\n"
-#~ msgstr "n'a pas pu déterminer le nom d'utilisateur à utiliser\n"
+#~ msgstr "n'a pas pu déterminer le nom d'utilisateur PostgreSQL à utiliser\n"
 
 #~ msgid "invalid host address: %s\n"
-#~ msgstr "adresse invalide de l'hôte: %s\n"
+#~ msgstr "adresse non valable de l'hôte: %s\n"
 
 #~ msgid "unknown host name: %s\n"
 #~ msgstr "nom inconnu de l'hôte: %s\n"
 
 #~ msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-#~ msgstr "état invalide de setenv (%c), probablement une indication de mémoire corrompue\n"
+#~ msgstr "état non valable de setenv (%c), probablement une indication de mémoire corrompue\n"
 
 #~ msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
-#~ msgstr "nom invalide d'encodage en PGCLIENTENCODING: %s\n"
+#~ msgstr "nom d'encodage non valable dans PGCLIENTENCODING: %s\n"
 
 #~ msgid "invalid state %c, probably indicative of memory corruption\n"
-#~ msgstr "état invalide (%c), probablement une indication de mémoire corrompue\n"
+#~ msgstr "état non valable (%c), probablement une indication de mémoire corrompue\n"
 
 #~ msgid "message type 0x%02x arrived from server while idle\n"
 #~ msgstr "type de message 0x%02x est arrivé du serveur pendant qu'il était inactif\n"
@@ -531,23 +531,22 @@ msgstr "le certificat n'a pas pu être obtenu: %s\n"
 #~ msgid ""
 #~ "server sent data (\"D\" message) without prior row description (\"T\" "
 #~ "message)\n"
-#~ msgstr "le serveur a envoyé des données (message \"D\") sans description de ligne préalable (message \"T\")\n"
+#~ msgstr "le serveur a envoyé des données (message \"D\") sans description préalable de ligne (message \"T\")\n"
 
 #~ msgid ""
 #~ "server sent binary data (\"B\" message) without prior row description (\"T"
 #~ "\" message)\n"
-#~ msgstr "le serveur a envoyé des données binaires (message \"B\") sans description antérieure de la ligne (message \"T\" )\n"
+#~ msgstr "le serveur a envoyé des données binaires (message \"B\") sans description préalable de la ligne (message \"T\" )\n"
 
 #~ msgid ""
 #~ "unexpected response from server; first received character was \"%c\"\n"
-#~ msgstr "réponse inattendue du serveur; le premier caractère reçu a été «%c»\n"
+#~ msgstr "réponse inattendue du serveur; le premier caractère reçu était «%c»\n"
 
 #~ msgid "lost synchronization with server, resetting connection\n"
-#~ msgstr "synchronisation avec le serveur était perdue, la connexion sera réinitialisée\n"
+#~ msgstr "synchronisation avec le serveur perdue, la connexion va être réinitialisée\n"
 
 #~ msgid "protocol error: id=0x%x\n"
 #~ msgstr "erreur de protocole: id=0x%x\n"
 
 #~ msgid "no row count available\n"
 #~ msgstr "le nombre de lignes n'est pas disponible\n"
-
diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index 862f6d218ee..7f6e1ef0775 100644
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,603 +1,586 @@
 # simplified Chinese translation file for libpq

 # Bao Wei <weibao@forevertek.com>, 2002

-# 

-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.2 2002/10/14 19:04:28 petere Exp $

-# 

-msgid ""

-msgstr ""

-"Project-Id-Version: PostgreSQL 7.2\n"

-"POT-Creation-Date: 2002-09-26 15:37+0800\n"

-"PO-Revision-Date: 2002-19-14 20:22:06+0800\n"

-"Last-Translator: Bao Wei <weibao@forevertek.com>\n"

-"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"

-"MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=GB2312\n"

-"Content-Transfer-Encoding: 8bit\n"

-

+#
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.3 2003/09/15 20:41:59 petere Exp $

+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-26 10:45+0000\n"
+"PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
+"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 # fe-auth.c:232

-#: fe-auth.c:232

-#, c-format

-msgid "Kerberos 4 error: %s\n"

-msgstr "Kerberos 4 ´íÎó: %s\n"

-

+#: fe-auth.c:232
+#, c-format
+msgid "Kerberos 4 error: %s\n"
+msgstr "Kerberos 4 ´íÎó: %s\n"
+
 # fe-auth.c:395

-#: fe-auth.c:395

-#, c-format

-msgid "could not set socket to blocking mode: %s\n"

-msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ×èÈûģʽ: %s\n"

-

+#: fe-auth.c:394
+#, c-format
+msgid "could not set socket to blocking mode: %s\n"
+msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ×èÈûģʽ: %s\n"
+
 # fe-auth.c:412 fe-auth.c:416

-#: fe-auth.c:412 fe-auth.c:416

-#, c-format

-msgid "Kerberos 5 authentication rejected: %*s\n"

-msgstr "kerberos 5 ÈÏÖ¤¾Ü¾ø: %*s\n"

-

+#: fe-auth.c:411 fe-auth.c:415
+#, c-format
+msgid "Kerberos 5 authentication rejected: %*s\n"
+msgstr "kerberos 5 ÈÏÖ¤¾Ü¾ø: %*s\n"
+
 # fe-auth.c:440

-#: fe-auth.c:440

-#, c-format

-msgid "could not restore non-blocking mode on socket: %s\n"

-msgstr "ÎÞ·¨ÔÚÌ×½Ó×Ö: %s Éϻָ´·Ç×èÈûģʽ\n"

-

+#: fe-auth.c:441
+#, c-format
+msgid "could not restore non-blocking mode on socket: %s\n"
+msgstr "ÎÞ·¨ÔÚÌ×½Ó×Ö: %s Éϻָ´·Ç×èÈûģʽ\n"
+
 # fe-auth.c:503

-#: fe-auth.c:503

-msgid "SCM_CRED authentication method not supported\n"

-msgstr "²»Ö§³Ö SCM_CRED ÈÏÖ¤·½Ê½\n"

-

+#: fe-auth.c:509
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "²»Ö§³Ö SCM_CRED ÈÏÖ¤·½Ê½\n"
+
 # fe-auth.c:589

-#: fe-auth.c:589

-msgid "Kerberos 4 authentication failed\n"

-msgstr "Kerberos 4 ÈÏ֤ʧ°Ü\n"

-

+#: fe-auth.c:600
+msgid "Kerberos 4 authentication failed\n"
+msgstr "Kerberos 4 ÈÏ֤ʧ°Ü\n"
+
 # fe-auth.c:595

-#: fe-auth.c:595

-msgid "Kerberos 4 authentication not supported\n"

-msgstr "²»Ö§³Ö Kerberos 4 ÈÏÖ¤\n"

-

+#: fe-auth.c:606
+msgid "Kerberos 4 authentication not supported\n"
+msgstr "²»Ö§³Ö Kerberos 4 ÈÏÖ¤\n"
+
 # fe-auth.c:606

-#: fe-auth.c:606

-msgid "Kerberos 5 authentication failed\n"

-msgstr "Kerberos 5 ÈÏ֤ʧ°Ü\n"

-

+#: fe-auth.c:616
+msgid "Kerberos 5 authentication failed\n"
+msgstr "Kerberos 5 ÈÏ֤ʧ°Ü\n"
+
 # fe-auth.c:612

-#: fe-auth.c:612

-msgid "Kerberos 5 authentication not supported\n"

-msgstr "²»Ö§³Ö Kerberos 5 ÈÏÖ¤\n"

-

+#: fe-auth.c:622
+msgid "Kerberos 5 authentication not supported\n"
+msgstr "²»Ö§³Ö Kerberos 5 ÈÏÖ¤\n"
+
 # fe-auth.c:640

-#: fe-auth.c:640

-#, c-format

-msgid "authentication method %u not supported\n"

-msgstr "²»Ö§³Ö %u ÈÏÖ¤·½Ê½\n"

-

+#: fe-auth.c:650
+#, c-format
+msgid "authentication method %u not supported\n"
+msgstr "²»Ö§³Ö %u ÈÏÖ¤·½Ê½\n"
+
 # fe-auth.c:677

-#: fe-auth.c:677

-#, c-format

-msgid "invalid authentication service name \"%s\", ignored\n"

-msgstr "ºöÂÔ·Ç·¨ÈÏÖ¤·þÎñÃû \"%s\"\n"

-

+#: fe-auth.c:687
+#, c-format
+msgid "invalid authentication service name \"%s\", ignored\n"
+msgstr "ºöÂÔ·Ç·¨ÈÏÖ¤·þÎñÃû \"%s\"\n"
+
 # fe-auth.c:734

-#: fe-auth.c:734

-#, c-format

-msgid "fe_getauthname: invalid authentication system: %d\n"

-msgstr "fe_getauthname: ÎÞЧµÄÈÏ֤ϵͳ: %d\n"

-

-# fe-connect.c:484

-#: fe-connect.c:484

-msgid "could not determine the PostgreSQL user name to use\n"

-msgstr "ÎÞ·¨ÅжÏҪʹÓÃµÄ PostgreSQL Óû§Ãû\n"

-

+#: fe-auth.c:758
+#, c-format
+msgid "fe_getauthname: invalid authentication system: %d\n"
+msgstr "fe_getauthname: ÎÞЧµÄÈÏ֤ϵͳ: %d\n"
+
+#: fe-connect.c:452
+#, c-format
+msgid "unrecognized sslmode: \"%s\"\n"
+msgstr "²»±»ÈÏ¿ÉµÄ sslmode: \"%s\"\n"
+
+#: fe-connect.c:472
+#, c-format
+msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "ÎÞЧµÄ sslmode \"%s\", µ±Ã»ÓÐ°Ñ SSL Ö§³Ö±àÒë½øÀ´Ê±\n"
+
 # fe-connect.c:708

-#: fe-connect.c:708

-#, c-format

-msgid "could not set socket to non-blocking mode: %s\n"

-msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ·Ç×èÈûģʽ: %s\n"

-

+#: fe-connect.c:783
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ·Ç×èÈûģʽ: %s\n"
+
 # fe-connect.c:732

-#: fe-connect.c:732

-#, c-format

-msgid "could not set socket to TCP no delay mode: %s\n"

-msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ TCP ÎÞÑÓ³Ùģʽ: %s\n"

-

+#: fe-connect.c:810
+#, c-format
+msgid "could not set socket to TCP no delay mode: %s\n"
+msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ TCP ÎÞÑÓ³Ùģʽ: %s\n"
+
 # fe-connect.c:752

-#: fe-connect.c:752

-#, 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 ""

-"ÎÞ·¨Áª½Óµ½·þÎñÆ÷: %s\n"

-"\t·þÎñÆ÷ÊÇ·ñÔÚ±¾µØÔËÐв¢ÇÒÔÚ Unix ÓòÌ×½Ó×Ö\n"

-"\t\"%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 ""
+"ÎÞ·¨Áª½Óµ½·þÎñÆ÷: %s\n"
+"\t·þÎñÆ÷ÊÇ·ñÔÚ±¾µØÔËÐв¢ÇÒÔÚ Unix ÓòÌ×½Ó×Ö\n"
+"\t\"%s\"ÉÏ×¼±¸½ÓÊÜÁª½Ó?\n"
+
 # fe-connect.c:761

-#: fe-connect.c:761

-#, 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 ""

-"ÎÞ·¨Áª½Óµ½·þÎñÆ÷: %s\n"

-"\t·þÎñÆ÷ÊÇ·ñÔÚÖ÷»ú %s ÉÏÔËÐв¢ÇÒ×¼±¸½ÓÊÜÔڶ˿Ú\n"

-"%s É쵀 TCP/IP Áª½Ó?\n"

-

-# fe-connect.c:825

-#: fe-connect.c:825

-#, c-format

-msgid "invalid host address: %s\n"

-msgstr "ÎÞЧµÄÖ÷»úµØÖ·: %s\n"

-

-# fe-connect.c:844

-#: fe-connect.c:844

-#, c-format

-msgid "unknown host name: %s\n"

-msgstr "δ֪Ö÷»úÃû: %s\n"

-

-# fe-connect.c:891

-#: fe-connect.c:891

-#, c-format

-msgid "could not create socket: %s\n"

-msgstr "ÎÞ·¨´´½¨Ì×½Ó×Ö: %s\n"

-

-# fe-connect.c:959

-#: fe-connect.c:959

-#, c-format

-msgid "could not send SSL negotiation packet: %s\n"

-msgstr "ÎÞ·¨·¢ËÍ SSL ÎÕÊÖ°ü: %s\n"

-

-# fe-connect.c:972

-#: fe-connect.c:972

-#, c-format

-msgid "could not receive server response to SSL negotiation packet: %s\n"

-msgstr "ÎÞ·¨ÊÕµ½·þÎñÆ÷¶Ô SSL ÎÕÊÖ°üµÄÏìÓ¦: %s\n"

-

-# fe-connect.c:1001

-#: fe-connect.c:1001

-#, c-format

-msgid "received invalid response to SSL negotiation: %c\n"

-msgstr "ÊÕµ½¶Ô SSL ÎÕÊÖµÄÎÞЧÏìÓ¦: %c\n"

-

-# fe-connect.c:1010

-#: fe-connect.c:1010

-msgid "server does not support SSL, but SSL was required\n"

-msgstr "·þÎñÆ÷²»Ö§³Ö SSL, µ«ÊÇÒªÇóʹÓà SSL\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 ""
+"ÎÞ·¨Áª½Óµ½·þÎñÆ÷: %s\n"
+"\t·þÎñÆ÷ÊÇ·ñÔÚÖ÷»ú \"%s\" ÉÏÔËÐв¢ÇÒ×¼±¸½ÓÊÜÔڶ˿Ú\n"
+"%s É쵀 TCP/IP Áª½Ó?\n"
+
+# fe-misc.c:702

+#: fe-connect.c:937
+#, c-format
+msgid "could not translate hostname \"%s\" to address: %s\n"
+msgstr "ÎÞ·¨½âÊÍÖ÷»úÃû \"%s\" µ½µØÖ·: %s\n"
+
+# fe-misc.c:702

+#: fe-connect.c:941
+#, c-format
+msgid "could not translate local service to address: %s\n"
+msgstr "ÎÞ·¨½âÊͱ¾µØ·þÎñµ½µØÖ·: %s\n"
+
 # fe-connect.c:1232

-#: fe-connect.c:1232

-msgid "invalid connection state, probably indicative of memory corruption\n"

-msgstr "ÎÞЧµÄÁª½Ó״̬, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"

-

+#: fe-connect.c:1144
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "ÎÞЧµÄÁª½Ó״̬, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
+
+# fe-connect.c:891

+#: fe-connect.c:1187
+#, c-format
+msgid "could not create socket: %s\n"
+msgstr "ÎÞ·¨´´½¨Ì×½Ó×Ö: %s\n"
+
 # fe-connect.c:1263

-#: fe-connect.c:1263

-#, c-format

-msgid "could not get socket error status: %s\n"

-msgstr "ÎÞ·¨»ñÈ¡Ì×½Ó×Ö´íÎó״̬: %s\n"

-

+#: fe-connect.c:1298
+#, c-format
+msgid "could not get socket error status: %s\n"
+msgstr "ÎÞ·¨»ñÈ¡Ì×½Ó×Ö´íÎó״̬: %s\n"
+
 # fe-connect.c:1283

-#: fe-connect.c:1283

-#, c-format

-msgid "could not get client address from socket: %s\n"

-msgstr "ÎÞ·¨´ÓÌ×½Ó×Ö»ñÈ¡¿Í»§¶ËµØÖ·: %s\n"

-

+#: fe-connect.c:1337
+#, c-format
+msgid "could not get client address from socket: %s\n"
+msgstr "ÎÞ·¨´ÓÌ×½Ó×Ö»ñÈ¡¿Í»§¶ËµØÖ·: %s\n"
+
+# fe-connect.c:959

+#: fe-connect.c:1382
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "ÎÞ·¨·¢ËÍ SSL ÎÕÊÖ°ü: %s\n"
+
+# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284

+# fe-lobj.c:536

+#: fe-connect.c:1404 fe-connect.c:2511 fe-connect.c:2520 fe-connect.c:3087
+#: fe-lobj.c:540
+msgid "out of memory\n"
+msgstr "ÄÚ´æÓþ¡\n"
+
 # fe-connect.c:1322

-#: fe-connect.c:1322

-#, c-format

-msgid "could not send startup packet: %s\n"

-msgstr "ÎÞ·¨·¢ËÍÆô¶¯°ü: %s\n"

-

+#: fe-connect.c:1417
+#, c-format
+msgid "could not send startup packet: %s\n"
+msgstr "ÎÞ·¨·¢ËÍÆô¶¯°ü: %s\n"
+
+# fe-connect.c:972

+#: fe-connect.c:1457
+#, c-format
+msgid "could not receive server response to SSL negotiation packet: %s\n"
+msgstr "ÎÞ·¨ÊÕµ½·þÎñÆ÷¶Ô SSL ÎÕÊÖ°üµÄÏìÓ¦: %s\n"
+
+# fe-connect.c:1010

+#: fe-connect.c:1476 fe-connect.c:1493
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "·þÎñÆ÷²»Ö§³Ö SSL, µ«ÊÇÒªÇóʹÓà SSL\n"
+
+# fe-connect.c:1001

+#: fe-connect.c:1509
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "ÊÕµ½¶Ô SSL ÎÕÊÖµÄÎÞЧÏìÓ¦: %c\n"
+
 # fe-connect.c:1378

-#: fe-connect.c:1378

-#, c-format

-msgid "expected authentication request from server, but received %c\n"

-msgstr "ÆÚ´ýÀ´×Ô·þÎñÆ÷µÄÈÏÖ¤ÇëÇó, È´ÊÕµ½ %c\n"

-

+#: fe-connect.c:1566 fe-connect.c:1598
+#, c-format
+msgid "expected authentication request from server, but received %c\n"
+msgstr "ÆÚ´ýÀ´×Ô·þÎñÆ÷µÄÈÏÖ¤ÇëÇó, È´ÊÕµ½ %c\n"
+
 # fe-connect.c:1490

-#: fe-connect.c:1490

-msgid "unexpected message from server during startup\n"

-msgstr "Æô¶¯¹ý³ÌÖÐÊÕµ½À´×Ô·þÎñÆ÷µÄ·ÇÔ¤ÆÚÐÅÏ¢\n"

-

+#: fe-connect.c:1834
+msgid "unexpected message from server during startup\n"
+msgstr "Æô¶¯¹ý³ÌÖÐÊÕµ½À´×Ô·þÎñÆ÷µÄ·ÇÔ¤ÆÚÐÅÏ¢\n"
+
 # fe-connect.c:1549

-#: fe-connect.c:1549

-#, c-format

-msgid "invalid connection state %c, probably indicative of memory corruption\n"

-msgstr "ÎÞЧµÄÁª½Ó״̬ %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"

-

-# fe-connect.c:1637

-#: fe-connect.c:1637

-#, c-format

-msgid "invalid setenv state %c, probably indicative of memory corruption\n"

-msgstr "ÎÞЧµÄ setenv ״̬  %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"

-

-# fe-connect.c:1676

-#: fe-connect.c:1676

-#, c-format

-msgid "invalid encoding name in PGCLIENTENCODING: %s\n"

-msgstr "ÔÚ PGCLIENTENCODING ÖеķǷ¨±àÂëÃû: %s\n"

-

-# fe-connect.c:1800

-#: fe-connect.c:1800

-#, c-format

-msgid "invalid state %c, probably indicative of memory corruption\n"

-msgstr "ÎÞЧ״̬ %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"

-

-# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284

-# fe-lobj.c:536

-#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284

-#: fe-lobj.c:536

-msgid "out of memory\n"

-msgstr "ÄÚ´æÓþ¡\n"

-

+#: fe-connect.c:1904
+#, c-format
+msgid "invalid connection state %c, probably indicative of memory corruption\n"
+msgstr "ÎÞЧµÄÁª½Ó״̬ %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
+
 # fe-connect.c:2475

-#: fe-connect.c:2475

-#, c-format

-msgid "missing \"=\" after \"%s\" in connection info string\n"

-msgstr "ÔÚÁª½ÓÐÅÏ¢×Ö´®ÀïµÄ \"%s\" ºóÃæȱÉÙ \"=\"\n"

-

+#: fe-connect.c:2559
+#, c-format
+msgid "missing \"=\" after \"%s\" in connection info string\n"
+msgstr "ÔÚÁª½ÓÐÅÏ¢×Ö´®ÀïµÄ \"%s\" ºóÃæȱÉÙ \"=\"\n"
+
 # fe-connect.c:2524

-#: fe-connect.c:2524

-msgid "unterminated quoted string in connection info string\n"

-msgstr "Áª½ÓÐÅÏ¢×Ö´®ÖÐδ½áÊøµÄÒýºÅ×Ö´®\n"

-

+#: fe-connect.c:2608
+msgid "unterminated quoted string in connection info string\n"
+msgstr "Áª½ÓÐÅÏ¢×Ö´®ÖÐδ½áÊøµÄÒýºÅ×Ö´®\n"
+
 # fe-connect.c:2558

-#: fe-connect.c:2558

-#, c-format

-msgid "invalid connection option \"%s\"\n"

-msgstr "·Ç·¨Áª½ÓÑ¡Ïî \"%s\"\n"

-

+#: fe-connect.c:2642
+#, c-format
+msgid "invalid connection option \"%s\"\n"
+msgstr "·Ç·¨Áª½ÓÑ¡Ïî \"%s\"\n"
+
 # fe-connect.c:2744

-#: fe-connect.c:2744

-msgid "connection pointer is NULL\n"

-msgstr "Áª½ÓÖ¸ÕëÊÇ NULL\n"

-

+#: fe-connect.c:2854
+msgid "connection pointer is NULL\n"
+msgstr "Áª½ÓÖ¸ÕëÊÇ NULL\n"
+
 # fe-connect.c:2953

-#: fe-connect.c:2953

-#, 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"

-

+#: fe-connect.c:3105
+#, 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"
+
+#: fe-exec.c:484
+msgid "NOTICE"
+msgstr "×¢Òâ"
+
+# fe-exec.c:737

+#: fe-exec.c:637 fe-exec.c:689
+msgid "command string is a null pointer\n"
+msgstr "ÃüÁî×Ö´®ÊÇÒ»¸ö¿ÕÖ¸Õë\n"
+
 # fe-exec.c:737

-#: fe-exec.c:737

-msgid "command string is a null pointer\n"

-msgstr "ÃüÁî×Ö´®ÊÇÒ»¸ö¿ÕÖ¸Õë\n"

-

+#: fe-exec.c:724
+msgid "statement name is a null pointer\n"
+msgstr "ÉùÃ÷Ãû×ÖÊÇÒ»¸ö¿ÕÖ¸Õë\n"
+
 # fe-exec.c:745

-#: fe-exec.c:745

-msgid "no connection to the server\n"

-msgstr "ûÓе½·þÎñÆ÷µÄÁª½Ó\n"

-

+#: fe-exec.c:755
+msgid "no connection to the server\n"
+msgstr "ûÓе½·þÎñÆ÷µÄÁª½Ó\n"
+
 # fe-exec.c:752

-#: fe-exec.c:752

-msgid "another command is already in progress\n"

-msgstr "ÒѾ­ÓÐÁíÍâÒ»ÌõÃüÁîÔÚ´¦Àí\n"

-

-# fe-exec.c:950

-#: fe-exec.c:950

-#, c-format

-msgid "message type 0x%02x arrived from server while idle\n"

-msgstr "¿ÕÏÐʱ´Ó·þÎñÆ÷·µ»ØÁËÀàÐÍΪ 0x%02x µÄÏûÏ¢\n"

-

-# fe-exec.c:992

-#: fe-exec.c:992

-#, c-format

-msgid ""

-"unexpected character %c following empty query response (\"I\" message)\n"

-msgstr "ÔڿյIJéѯÏìÓ¦ºóÃæ¸ú×Å·ÇÔ¤ÆÚµÄ×Ö·û %c (\"I\" ÏûÏ¢)\n"

-

-# fe-exec.c:1049

-#: fe-exec.c:1049

-msgid ""

-"server sent data (\"D\" message) without prior row description (\"T\" "

-"message)\n"

-msgstr "·þÎñÆ÷ÔÚûÓз¢ËÍÐÐÃèÊöµÄÇ°ÌáÏ·¢ËÍÊý¾Ý (\"D\" ÏûÏ¢) (\"T\" ÏûÏ¢)\n"

-

-# fe-exec.c:1066

-#: fe-exec.c:1066

-msgid ""

-"server sent binary data (\"B\" message) without prior row description (\"T\" "

-"message)\n"

-msgstr "·þÎñÆ÷ÔÚûÓз¢ËÍÐÐÃèÊöµÄÇ°ÌáÏ·¢ËÍÊý¾Ý (\"B\" ÏûÏ¢) (\"T\" ÏûÏ¢)\n"

-

-# fe-exec.c:1082

-#: fe-exec.c:1082

-#, c-format

-msgid "unexpected response from server; first received character was \"%c\"\n"

-msgstr "À´×Ô·þÎñÆ÷µÄÒâÍâÏìÓ¦; ÊÕµ½µÄµÚÒ»¸ö×Ö·ûÊÇ \"%c\"\n"

-

+#: fe-exec.c:762
+msgid "another command is already in progress\n"
+msgstr "ÒѾ­ÓÐÁíÍâÒ»ÌõÃüÁîÔÚ´¦Àí\n"
+
+#: fe-exec.c:798 fe-exec.c:1432
+msgid "function requires at least 3.0 protocol\n"
+msgstr "º¯ÊýÖÁÉÙÐèÒª 3.0 °æ±¾µÄЭÒé\n"
+
 # fe-exec.c:1371

-#: fe-exec.c:1371

-#, c-format

-msgid "unexpected asyncStatus: %d\n"

-msgstr "ÒâÍâµÄ asyncStatus(Ò첽״̬): %d\n"

-

+#: fe-exec.c:1100
+#, c-format
+msgid "unexpected asyncStatus: %d\n"
+msgstr "ÒâÍâµÄ asyncStatus(Ò첽״̬): %d\n"
+
+#: fe-exec.c:1205
+msgid "COPY terminated by new PQexec"
+msgstr "COPY ±»Ò»¸öÐ嵀 PQexec ÖÕÖ¹"
+
+# fe-exec.c:1421

+#: fe-exec.c:1213
+msgid "COPY IN state must be terminated first\n"
+msgstr "COPY IN ״̬±ØÐëÏȽáÊø\n"
+
 # fe-exec.c:1421

-#: fe-exec.c:1421

-msgid "COPY state must be terminated first\n"

-msgstr "COPY ״̬±ØÐëÏȽáÊø\n"

-

+#: fe-exec.c:1233
+msgid "COPY OUT state must be terminated first\n"
+msgstr "COPY OUT ״̬±ØÐëÏȽáÊø\n"
+
 # fe-exec.c:1780

-#: fe-exec.c:1780

-msgid "no COPY in progress\n"

-msgstr "ûÓÐÕýÔÚ´¦ÀíµÄ COPY\n"

-

-# fe-exec.c:1819

-#: fe-exec.c:1819

-msgid "lost synchronization with server, resetting connection\n"

-msgstr "ʧȥÓë·þÎñÆ÷µÄͬ²½, ÖØÖÃÁª½Ó\n"

-

+#: fe-exec.c:1336 fe-exec.c:1390 fe-exec.c:1474
+msgid "no COPY in progress\n"
+msgstr "ûÓÐÕýÔÚ´¦ÀíµÄ COPY\n"
+
 # fe-exec.c:1884

-#: fe-exec.c:1884

-msgid "connection in wrong state\n"

-msgstr "Áª½Ó´¦ÓÚ´íÎó״̬\n"

-

-# fe-exec.c:1986 fe-exec.c:2020

-#: fe-exec.c:1986 fe-exec.c:2020

-#, c-format

-msgid "protocol error: id=0x%x\n"

-msgstr "ЭÒé´íÎó: id=0x%x\n"

-

+#: fe-exec.c:1666
+msgid "connection in wrong state\n"
+msgstr "Áª½Ó´¦ÓÚ´íÎó״̬\n"
+
 # fe-exec.c:2055

-#: fe-exec.c:2055

-msgid "invalid ExecStatusType code"

-msgstr "·Ç·¨ ExecStatusType ´úÂë"

-

+#: fe-exec.c:1697
+msgid "invalid ExecStatusType code"
+msgstr "·Ç·¨ ExecStatusType ´úÂë"
+
 # fe-exec.c:2108 fe-exec.c:2141

-#: fe-exec.c:2108 fe-exec.c:2141

-#, c-format

-msgid "column number %d is out of range 0..%d\n"

-msgstr "ÁкÅÂë %d ³¬³öÁË·¶Î§ 0..%d\n"

-

+#: fe-exec.c:1761 fe-exec.c:1784
+#, c-format
+msgid "column number %d is out of range 0..%d"
+msgstr "ÁкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
+
 # fe-exec.c:2130

-#: fe-exec.c:2130

-#, c-format

-msgid "row number %d is out of range 0..%d\n"

-msgstr "ÐкÅÂë %d ³¬³öÁË·¶Î§ 0..%d\n"

-

+#: fe-exec.c:1777
+#, c-format
+msgid "row number %d is out of range 0..%d"
+msgstr "ÐкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
+
 # fe-exec.c:2325

-#: fe-exec.c:2325

-#, c-format

-msgid "could not interpret result from server: %s\n"

-msgstr "ÎÞ·¨½âÊÍÀ´×Ô·þÎñÆ÷µÄ½á¹û: %s\n"

-

-# fe-exec.c:2341

-#: fe-exec.c:2341

-msgid "no row count available\n"

-msgstr "ûÓпɻñµÃµÄÐÐÊý\n"

-

+#: fe-exec.c:2014
+#, c-format
+msgid "could not interpret result from server: %s"
+msgstr "ÎÞ·¨½âÊÍÀ´×Ô·þÎñÆ÷µÄ½á¹û: %s"
+
 # fe-lobj.c:400 fe-lobj.c:483

-#: fe-lobj.c:400 fe-lobj.c:483

-#, c-format

-msgid "could not open file \"%s\": %s\n"

-msgstr "ÎÞ·¨´ò¿ªÎļþ \"%s\": %s\n"

-

+#: fe-lobj.c:402 fe-lobj.c:487
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "ÎÞ·¨´ò¿ªÎļþ \"%s\": %s\n"
+
 # fe-lobj.c:412

-#: fe-lobj.c:412

-#, c-format

-msgid "could not create large object for file \"%s\"\n"

-msgstr "ÎÞ·¨ÎªÎļþ \"%s\" ´´½¨´ó¶ÔÏó\n"

-

+#: fe-lobj.c:414
+#, c-format
+msgid "could not create large object for file \"%s\"\n"
+msgstr "ÎÞ·¨ÎªÎļþ \"%s\" ´´½¨´ó¶ÔÏó\n"
+
 # fe-lobj.c:422 fe-lobj.c:472

-#: fe-lobj.c:422 fe-lobj.c:472

-#, c-format

-msgid "could not open large object %u\n"

-msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏó %u\n"

-

+#: fe-lobj.c:424 fe-lobj.c:474
+#, c-format
+msgid "could not open large object %u\n"
+msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏó %u\n"
+
 # fe-lobj.c:437

-#: fe-lobj.c:437

-#, c-format

-msgid "error while reading file \"%s\"\n"

-msgstr "¶ÁÈ¡Îļþ \"%s\" ʱ³ö´í\n"

-

+#: fe-lobj.c:439
+#, c-format
+msgid "error while reading file \"%s\"\n"
+msgstr "¶ÁÈ¡Îļþ \"%s\" ʱ³ö´í\n"
+
 # fe-lobj.c:498

-#: fe-lobj.c:498

-#, c-format

-msgid "error while writing to file \"%s\"\n"

-msgstr "дÈëÎļþ \"%s\" ʱ³ö´í\n"

-

+#: fe-lobj.c:502
+#, c-format
+msgid "error while writing to file \"%s\"\n"
+msgstr "дÈëÎļþ \"%s\" ʱ³ö´í\n"
+
 # fe-lobj.c:564

-#: fe-lobj.c:564

-msgid "query to initialize large object functions did not return data\n"

-msgstr "³õʼ»¯´ó¶ÔÏóº¯ÊýµÄ²éѯûÓзµ»ØÊý¾Ý\n"

-

+#: fe-lobj.c:568
+msgid "query to initialize large object functions did not return data\n"
+msgstr "³õʼ»¯´ó¶ÔÏóº¯ÊýµÄ²éѯûÓзµ»ØÊý¾Ý\n"
+
 # fe-lobj.c:602

-#: fe-lobj.c:602

-msgid "cannot determine OID of function lo_open\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý lo_open µÄ OID\n"

-

+#: fe-lobj.c:606
+msgid "cannot determine OID of function lo_open\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý lo_open µÄ OID\n"
+
 # fe-lobj.c:609

-#: fe-lobj.c:609

-msgid "cannot determine OID of function lo_close\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý lo_close µÄ OID\n"

-

+#: fe-lobj.c:613
+msgid "cannot determine OID of function lo_close\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý lo_close µÄ OID\n"
+
 # fe-lobj.c:616

-#: fe-lobj.c:616

-msgid "cannot determine OID of function lo_creat\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý lo_creat µÄ OID\n"

-

+#: fe-lobj.c:620
+msgid "cannot determine OID of function lo_creat\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý lo_creat µÄ OID\n"
+
 # fe-lobj.c:623

-#: fe-lobj.c:623

-msgid "cannot determine OID of function lo_unlink\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý lo_unlink µÄ OID\n"

-

+#: fe-lobj.c:627
+msgid "cannot determine OID of function lo_unlink\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý lo_unlink µÄ OID\n"
+
 # fe-lobj.c:630

-#: fe-lobj.c:630

-msgid "cannot determine OID of function lo_lseek\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý lo_lseek µÄ OID\n"

-

+#: fe-lobj.c:634
+msgid "cannot determine OID of function lo_lseek\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý lo_lseek µÄ OID\n"
+
 # fe-lobj.c:637

-#: fe-lobj.c:637

-msgid "cannot determine OID of function lo_tell\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý lo_tell µÄ OID\n"

-

+#: fe-lobj.c:641
+msgid "cannot determine OID of function lo_tell\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý lo_tell µÄ OID\n"
+
 # fe-lobj.c:644

-#: fe-lobj.c:644

-msgid "cannot determine OID of function loread\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý loread µÄ OID\n"

-

+#: fe-lobj.c:648
+msgid "cannot determine OID of function loread\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý loread µÄ OID\n"
+
 # fe-lobj.c:651

-#: fe-lobj.c:651

-msgid "cannot determine OID of function lowrite\n"

-msgstr "ÎÞ·¨ÅжϺ¯Êý lowrite µÄ OID\n"

-

+#: fe-lobj.c:655
+msgid "cannot determine OID of function lowrite\n"
+msgstr "ÎÞ·¨ÅжϺ¯Êý lowrite µÄ OID\n"
+
 # fe-misc.c:303

-#: fe-misc.c:303

-#, c-format

-msgid "integer of size %lu not supported by pqGetInt\n"

-msgstr "pgGetInt ²»Ö§³Ö´óСΪ %lu µÄÕûÊý\n"

-

+#: fe-misc.c:228
+#, c-format
+msgid "integer of size %lu not supported by pqGetInt"
+msgstr "pgGetInt ²»Ö§³Ö´óСΪ %lu µÄÕûÊý"
+
 # fe-misc.c:341

-#: fe-misc.c:341

-#, c-format

-msgid "integer of size %lu not supported by pqPutInt\n"

-msgstr "pgPutInt ²»Ö§³Ö´óСΪ %lu µÄÕûÊý\n"

-

-# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838

-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838

-#, c-format

-msgid "select() failed: %s\n"

-msgstr "select() ʧ°Ü: %s\n"

-

+#: fe-misc.c:264
+#, c-format
+msgid "integer of size %lu not supported by pqPutInt"
+msgstr "pgPutInt ²»Ö§³Ö´óСΪ %lu µÄÕûÊý"
+
 # fe-misc.c:450 fe-misc.c:642 fe-misc.c:798

-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:798

-msgid "connection not open\n"

-msgstr "Áª½Óδ´ò¿ª\n"

-

+#: fe-misc.c:544 fe-misc.c:748
+msgid "connection not open\n"
+msgstr "Áª½Óδ´ò¿ª\n"
+
 # fe-misc.c:515 fe-misc.c:595

-#: fe-misc.c:515 fe-misc.c:595

-#, c-format

-msgid "could not receive data from server: %s\n"

-msgstr "ÎÞ·¨´Ó·þÎñÆ÷½ÓÊÕÊý¾Ý: %s\n"

-

+#: fe-misc.c:610 fe-misc.c:701
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "ÎÞ·¨´Ó·þÎñÆ÷½ÓÊÕÊý¾Ý: %s\n"
+
 # fe-misc.c:612 fe-misc.c:686

-#: fe-misc.c:612 fe-misc.c:686

-msgid ""

-"server closed the connection unexpectedly\n"

-"\tThis probably means the server terminated abnormally\n"

-"\tbefore or while processing the request.\n"

-msgstr ""

-"·þÎñÆ÷ÒâÍâµØ¹Ø±ÕÁËÁª½Ó\n"

-"\tÕâÖÖÏÖÏóͨ³£Òâζ×Å·þÎñÆ÷ÔÚ´¦ÀíÇëÇó֮ǰ\n"

-"»òÕßÕýÔÚ´¦ÀíÇëÇóµÄʱºòÒâÍâÖÐÖ¹\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 ""
+"·þÎñÆ÷ÒâÍâµØ¹Ø±ÕÁËÁª½Ó\n"
+"\tÕâÖÖÏÖÏóͨ³£Òâζ×Å·þÎñÆ÷ÔÚ´¦ÀíÇëÇó֮ǰ\n"
+"»òÕßÕýÔÚ´¦ÀíÇëÇóµÄʱºòÒâÍâÖÐÖ¹\n"
+
 # fe-misc.c:702

-#: fe-misc.c:702

-#, c-format

-msgid "could not send data to server: %s\n"

-msgstr "ÎÞ·¨Ïò·þÎñÆ÷·¢ËÍÊý¾Ý: %s\n"

-

-#: fe-secure.c:275 fe-secure.c:321

-#, c-format

-msgid "SSL SYSCALL error: %s\n"

-msgstr "SSL SYSCALL ´íÎó: %s\n"

-

+#: fe-misc.c:803
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "ÎÞ·¨Ïò·þÎñÆ÷·¢ËÍÊý¾Ý: %s\n"
+
+#: fe-misc.c:905
+msgid "timeout expired\n"
+msgstr "³¬Ê±Âú\n"
+
+# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798

+#: fe-misc.c:950
+msgid "socket not open\n"
+msgstr "Ì×½Ó×Öδ´ò¿ª\n"
+
+# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838

+#: fe-misc.c:973
+#, c-format
+msgid "select() failed: %s\n"
+msgstr "select() ʧ°Ü: %s\n"
+
+#: fe-secure.c:246
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "ÎÞ·¨½¨Á¢ SSL Áª½Ó: %s\n"
+
+#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:894
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "SSL SYSCALL ´íÎó: %s\n"
+
+#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:898
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "SSL SYSCALL ´íÎó: ·¢ÏÖ½áÊø·û\n"
+
 # fe-auth.c:232

-#: fe-secure.c:280 fe-secure.c:326

-#, c-format

-msgid "SSL error: %s\n"

-msgstr "SSL ´íÎó: %s\n"

-

+#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:904
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "SSL ´íÎó: %s\n"
+
+#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:910
+msgid "Unknown SSL error code\n"
+msgstr "δ֪µÄ SSL ´íÎóÂë\n"
+
 # fe-lobj.c:498

-#: fe-secure.c:387

-#, c-format

-msgid "error querying socket: %s\n"

-msgstr "²éѯÌ×½Ó×Ö´íÎó: %s\n"

-

+#: fe-secure.c:459
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "²éѯÌ×½Ó×Ö´íÎó: %s\n"
+
 # fe-connect.c:1263

-#: fe-secure.c:400

-#, c-format

-msgid "could not get information about host (%s): %s\n"

-msgstr "ÎÞ·¨»ñÈ¡¹ØÓÚÖ÷»ú (%s) µÄÐÅÏ¢: %s\n"

-

-#: fe-secure.c:419

-msgid "unsupported protocol\n"

-msgstr "²»Ö§³ÖµÄЭÒé\n"

-

-#: fe-secure.c:441

-#, c-format

-msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"

-msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½ %ld.%ld.%ld.%ld\n"

-

-#: fe-secure.c:448

-#, c-format

-msgid "server common name \"%s\" does not resolve to peer address\n"

-msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½¶Ô¶ËµØÖ·\n"

-

+#: fe-secure.c:481
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "ÎÞ·¨»ñÈ¡¹ØÓÚÖ÷»ú (%s) µÄÐÅÏ¢: %s\n"
+
+#: fe-secure.c:500
+msgid "unsupported protocol\n"
+msgstr "²»Ö§³ÖµÄЭÒé\n"
+
+#: fe-secure.c:522
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½ %ld.%ld.%ld.%ld\n"
+
+#: fe-secure.c:529
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½¶Ô¶ËµØÖ·\n"
+
 # fe-connect.c:1263

-#: fe-secure.c:617

-msgid "could not get user information\n"

-msgstr "ÎÞ·¨»ñÈ¡Óû§ÐÅÏ¢\n"

-

+#: fe-secure.c:704
+msgid "could not get user information\n"
+msgstr "ÎÞ·¨»ñÈ¡Óû§ÐÅÏ¢\n"
+
 # fe-lobj.c:400 fe-lobj.c:483

-#: fe-secure.c:629

-#, c-format

-msgid "could not open certificate (%s): %s\n"

-msgstr "ÎÞ·¨´ò¿ªÖ¤Êé (%s): %s\n"

-

+#: fe-secure.c:716
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "ÎÞ·¨´ò¿ªÖ¤Êé (%s): %s\n"
+
 # fe-lobj.c:400 fe-lobj.c:483

-#: fe-secure.c:636

-#, c-format

-msgid "could not read certificate (%s): %s\n"

-msgstr "ÎÞ·¨¶ÁÈ¡Ö¤Êé (%s): %s\n"

-

-#: fe-secure.c:649

-#, c-format

-msgid "certificate present, but not private key (%s)\n"

-msgstr "ÓÐÖ¤Êé, µ«²»ÊÇ˽Կ (%s)\n"

-

-#: fe-secure.c:658

-#, c-format

-msgid "private key (%s) has wrong permissions\n"

-msgstr "˽Կ (%s) ÓдíÎóµÄÐí¿É\n"

-

+#: fe-secure.c:723
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "ÎÞ·¨¶ÁÈ¡Ö¤Êé (%s): %s\n"
+
+#: fe-secure.c:736
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr "ÓÐÖ¤Êé, µ«²»ÊÇ˽Կ (%s)\n"
+
+#: fe-secure.c:745
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr "˽Կ (%s) ÓдíÎóµÄÐí¿É\n"
+
 # fe-lobj.c:400 fe-lobj.c:483

-#: fe-secure.c:665

-#, c-format

-msgid "could not open private key file (%s): %s\n"

-msgstr "ÎÞ·¨´ò¿ªË½Ô¿Îļþ (%s): %s\n"

-

-#: fe-secure.c:674

-#, c-format

-msgid "private key (%s) changed during execution\n"

-msgstr "ÔÚÖ´Ðйý³ÌÖÐ˽Կ (%s) ¸Ä±äÁË\n"

-

+#: fe-secure.c:752
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr "ÎÞ·¨´ò¿ªË½Ô¿Îļþ (%s): %s\n"
+
+#: fe-secure.c:761
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr "ÔÚÖ´Ðйý³ÌÖÐ˽Կ (%s) ¸Ä±äÁË\n"
+
 # fe-connect.c:891

-#: fe-secure.c:681

-#, c-format

-msgid "could not read private key (%s): %s\n"

-msgstr "ÎÞ·¨¶Áȡ˽Կ (%s): %s\n"

-

-#: fe-secure.c:693

-#, c-format

-msgid "certificate/private key mismatch (%s): %s\n"

-msgstr "Ö¤Êé/˽Կ²»Æ¥Åä (%s): %s\n"

-

-#: fe-secure.c:721

-#, c-format

-msgid "could not create SSL context: %s\n"

-msgstr "ÎÞ·¨´´½¨ SSL »·¾³: %s\n"

-

+#: fe-secure.c:768
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr "ÎÞ·¨¶Áȡ˽Կ (%s): %s\n"
+
+#: fe-secure.c:780
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr "Ö¤Êé/˽Կ²»Æ¥Åä (%s): %s\n"
+
+#: fe-secure.c:810
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "ÎÞ·¨´´½¨ SSL »·¾³: %s\n"
+
 # fe-connect.c:891

-#: fe-secure.c:737 fe-secure.c:745

-#, c-format

-msgid "could not read root certificate list (%s): %s\n"

-msgstr "ÎÞ·¨¶ÁÈ¡¸ùÖ¤ÊéÁбí (%s): %s\n"

-

-#: fe-secure.c:794

-#, c-format

-msgid "could not establish SSL connection: %s\n"

-msgstr "ÎÞ·¨½¨Á¢ SSL Áª½Ó: %s\n"

-

-#: fe-secure.c:812

-#, c-format

-msgid "certificate could not be validated: %s\n"

-msgstr "ÎÞ·¨ÑéÖ¤Ö¤Êé: %s\n"

-

-#: fe-secure.c:824

-#, c-format

-msgid "certificate could not be obtained: %s\n"

-msgstr "ÎÞ·¨»ñµÃÖ¤Êé: %s\n"

-

-#~ msgid "could not flush enough data (space available: %d, space needed %d)\n"

-#~ msgstr "ÎÞ·¨³åË¢×ã¹»µÄÊý¾Ý (¿ÉÓÿռä: %d, ÐèÒª¿Õ¼ä %d)\n"

+#: fe-secure.c:828 fe-secure.c:836
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "ÎÞ·¨¶ÁÈ¡¸ùÖ¤ÊéÁбí (%s): %s\n"
+
+#: fe-secure.c:929
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "ÎÞ·¨ÑéÖ¤Ö¤Êé: %s\n"
+
+#: fe-secure.c:941
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "ÎÞ·¨»ñµÃÖ¤Êé: %s\n"
+
+# fe-connect.c:1010

+#~ msgid "server does not support SSL, and previous non-SSL attempt failed\n"
+#~ msgstr "·þÎñÆ÷²»Ö§³Ö SSL, ²¢ÇÒÏÈÇ°·Ç SSL ³¢ÊÔʧ°Ü\n"
+
+# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838

+#~ msgid "getaddrinfo() failed: %s\n"
+#~ msgstr "getaddrinfo() ʧ°Ü: %s\n"