Translation updates

4 files changed, 926 insertions, 591 deletions

diff --git a/src/bin/pg_basebackup/po/de.po b/src/bin/pg_basebackup/po/de.po
index 94ad96294ad..6ba750d59ca 100644
--- a/src/bin/pg_basebackup/po/de.po
+++ b/src/bin/pg_basebackup/po/de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: PostgreSQL 9.3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2013-06-05 20:18+0000\n"
-"PO-Revision-Date: 2013-06-05 22:04-0400\n"
+"PO-Revision-Date: 2013-08-07 21:43-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -495,7 +495,7 @@ msgstr "%s: ungültiges Checkpoint-Argument „%s“, muss „fast“ oder „sp
 #: pg_basebackup.c:1806 pg_receivexlog.c:392
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
-msgstr "%s: ungültiges Statusinterval „%s“\n"
+msgstr "%s: ungültiges Statusintervall „%s“\n"
 
 #: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
 #: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
diff --git a/src/bin/pg_basebackup/po/fr.po b/src/bin/pg_basebackup/po/fr.po
index 8c348b19af9..cc204690da9 100644
--- a/src/bin/pg_basebackup/po/fr.po
+++ b/src/bin/pg_basebackup/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2012-09-03 19:46+0000\n"
-"PO-Revision-Date: 2012-09-03 22:57+0100\n"
+"POT-Creation-Date: 2013-08-18 08:19+0000\n"
+"PO-Revision-Date: 2013-08-18 10:46+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -16,29 +16,40 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: pg_basebackup.c:103
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
+#, c-format
+msgid "out of memory\n"
+msgstr "m�moire �puis�e\n"
+
+#: ../../common/fe_memutils.c:77
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
+
+#: pg_basebackup.c:106
 #, c-format
 msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s prend une sauvegarde binaire d'un serveur PostgreSQL en cours d'ex�cution.\n"
+"%s prend une sauvegarde binaire d'un serveur PostgreSQL en cours "
+"d'ex�cution.\n"
 "\n"
 
-#: pg_basebackup.c:105
-#: pg_receivexlog.c:59
+#: pg_basebackup.c:108 pg_receivexlog.c:53
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_basebackup.c:106
-#: pg_receivexlog.c:60
+#: pg_basebackup.c:109 pg_receivexlog.c:54
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_basebackup.c:107
+#: pg_basebackup.c:110
 #, c-format
 msgid ""
 "\n"
@@ -47,46 +58,64 @@ msgstr ""
 "\n"
 "Options contr�lant la sortie :\n"
 
-#: pg_basebackup.c:108
+#: pg_basebackup.c:111
 #, c-format
 msgid "  -D, --pgdata=DIRECTORY receive base backup into directory\n"
-msgstr "  -D, --pgdata=R�PERTOIRE      re�oit la sauvegarde de base dans ce r�pertoire\n"
+msgstr ""
+"  -D, --pgdata=R�PERTOIRE      re�oit la sauvegarde de base dans ce "
+"r�pertoire\n"
 
-#: pg_basebackup.c:109
+#: pg_basebackup.c:112
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
-msgstr "  -F, --format=p|t             format en sortie (plain (par d�faut), tar)\n"
+msgstr ""
+"  -F, --format=p|t             format en sortie (plain (par d�faut), tar)\n"
 
-#: pg_basebackup.c:110
+#: pg_basebackup.c:113
+#, c-format
+#| msgid ""
+#| "  -0, --record-separator-zero\n"
+#| "                           set record separator to zero byte\n"
+msgid ""
+"  -R, --write-recovery-conf\n"
+"                         write recovery.conf after backup\n"
+msgstr ""
+"  -R, --write-recovery-conf    �crit le recovery.conf apr�s la sauvegarde\n"
+
+#: pg_basebackup.c:115
 #, c-format
-msgid "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
+msgid ""
+"  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr ""
-"  -x, --xlog                   inclut les journaux de transactions n�cessaires\n"
+"  -x, --xlog                   inclut les journaux de transactions "
+"n�cessaires\n"
 "                               dans la sauvegarde (mode fetch)\n"
 
-#: pg_basebackup.c:111
+#: pg_basebackup.c:116
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
 "                         include required WAL files with specified method\n"
 msgstr ""
 "  -X, --xlog-method=fetch|stream\n"
-"                               inclut les journaux de transactions requis avec\n"
+"                               inclut les journaux de transactions requis "
+"avec\n"
 "                               la m�thode sp�cifi�e\n"
 
-#: pg_basebackup.c:113
+#: pg_basebackup.c:118
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip                   compresse la sortie tar\n"
 
-#: pg_basebackup.c:114
+#: pg_basebackup.c:119
 #, c-format
-msgid "  -Z, --compress=0-9     compress tar output with given compression level\n"
+msgid ""
+"  -Z, --compress=0-9     compress tar output with given compression level\n"
 msgstr ""
 "  -Z, --compress=0-9           compresse la sortie tar avec le niveau de\n"
 "                               compression indiqu�\n"
 
-#: pg_basebackup.c:115
+#: pg_basebackup.c:120
 #, c-format
 msgid ""
 "\n"
@@ -95,43 +124,41 @@ msgstr ""
 "\n"
 "Options g�n�rales :\n"
 
-#: pg_basebackup.c:116
+#: pg_basebackup.c:121
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
 "                         set fast or spread checkpointing\n"
-msgstr "  -c, --checkpoint=fast|spread ex�cute un CHECKPOINT rapide ou r�parti\n"
+msgstr ""
+"  -c, --checkpoint=fast|spread ex�cute un CHECKPOINT rapide ou r�parti\n"
 
-#: pg_basebackup.c:118
+#: pg_basebackup.c:123
 #, c-format
 msgid "  -l, --label=LABEL      set backup label\n"
 msgstr "  -l, --label=LABEL            configure le label de sauvegarde\n"
 
-#: pg_basebackup.c:119
+#: pg_basebackup.c:124
 #, c-format
 msgid "  -P, --progress         show progress information\n"
-msgstr "  -P, --progress               affiche la progression de la sauvegarde\n"
+msgstr ""
+"  -P, --progress               affiche la progression de la sauvegarde\n"
 
-#: pg_basebackup.c:120
-#: pg_receivexlog.c:64
+#: pg_basebackup.c:125 pg_receivexlog.c:58
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose                affiche des messages verbeux\n"
 
-#: pg_basebackup.c:121
-#: pg_receivexlog.c:65
+#: pg_basebackup.c:126 pg_receivexlog.c:59
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#: pg_basebackup.c:122
-#: pg_receivexlog.c:66
+#: pg_basebackup.c:127 pg_receivexlog.c:60
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#: pg_basebackup.c:123
-#: pg_receivexlog.c:67
+#: pg_basebackup.c:128 pg_receivexlog.c:61
 #, c-format
 msgid ""
 "\n"
@@ -140,54 +167,58 @@ msgstr ""
 "\n"
 "Options de connexion :\n"
 
-#: pg_basebackup.c:124
-#: pg_receivexlog.c:68
+#: pg_basebackup.c:129 pg_receivexlog.c:62
+#, c-format
+#| msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
+msgid "  -d, --dbname=CONNSTR   connection string\n"
+msgstr "  -d, --dbname=CONNSTR         cha�ne de connexion\n"
+
+#: pg_basebackup.c:130 pg_receivexlog.c:63
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr ""
 "  -h, --host=NOMH�TE           h�te du serveur de bases de donn�es ou\n"
 "                               r�pertoire des sockets\n"
 
-#: pg_basebackup.c:125
-#: pg_receivexlog.c:69
+#: pg_basebackup.c:131 pg_receivexlog.c:64
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr ""
 "  -p, --port=PORT              num�ro de port du serveur de bases de\n"
 "                               donn�es\n"
 
-#: pg_basebackup.c:126
-#: pg_receivexlog.c:70
+#: pg_basebackup.c:132 pg_receivexlog.c:65
 #, c-format
 msgid ""
 "  -s, --status-interval=INTERVAL\n"
-"                         time between status packets sent to server (in seconds)\n"
+"                         time between status packets sent to server (in "
+"seconds)\n"
 msgstr ""
-"  -s, --status-interval=INTERVAL dur�e entre l'envoi de paquets de statut au\n"
+"  -s, --status-interval=INTERVAL dur�e entre l'envoi de paquets de statut "
+"au\n"
 "                                 serveur (en secondes)\n"
 
-#: pg_basebackup.c:128
-#: pg_receivexlog.c:72
+#: pg_basebackup.c:134 pg_receivexlog.c:67
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NOM           se connecte avec cet utilisateur\n"
 
-#: pg_basebackup.c:129
-#: pg_receivexlog.c:73
+#: pg_basebackup.c:135 pg_receivexlog.c:68
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password            ne demande jamais le mot de passe\n"
 
-#: pg_basebackup.c:130
-#: pg_receivexlog.c:74
+#: pg_basebackup.c:136 pg_receivexlog.c:69
 #, c-format
-msgid "  -W, --password         force password prompt (should happen automatically)\n"
+msgid ""
+"  -W, --password         force password prompt (should happen "
+"automatically)\n"
 msgstr ""
-"  -W, --password               force la demande du mot de passe (devrait arriver\n"
+"  -W, --password               force la demande du mot de passe (devrait "
+"arriver\n"
 "                               automatiquement)\n"
 
-#: pg_basebackup.c:131
-#: pg_receivexlog.c:75
+#: pg_basebackup.c:137 pg_receivexlog.c:70
 #, c-format
 msgid ""
 "\n"
@@ -196,354 +227,375 @@ msgstr ""
 "\n"
 "Rapporter les bogues � <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:172
+#: pg_basebackup.c:180
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s : n'a pas pu lire � partir du tube : %s\n"
 
-#: pg_basebackup.c:180
-#: pg_basebackup.c:271
-#: pg_basebackup.c:1187
-#: pg_receivexlog.c:256
+#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
+#: pg_receivexlog.c:266
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
-msgstr "%s : n'a pas pu analyser l'emplacement du journal des transactions � %s �\n"
+msgstr ""
+"%s : n'a pas pu analyser l'emplacement du journal des transactions � %s �\n"
 
-#: pg_basebackup.c:283
+#: pg_basebackup.c:293
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
-msgstr "%s : n'a pas pu cr�er un tube pour le processus en t�che de fond : %s\n"
+msgstr ""
+"%s : n'a pas pu cr�er un tube pour le processus en t�che de fond : %s\n"
 
-#: pg_basebackup.c:316
+#: pg_basebackup.c:326
 #, c-format
 msgid "%s: could not create background process: %s\n"
 msgstr "%s : n'a pas pu cr�er un processus en t�che de fond : %s\n"
 
-#: pg_basebackup.c:328
+#: pg_basebackup.c:338
 #, c-format
 msgid "%s: could not create background thread: %s\n"
 msgstr "%s : n'a pas pu cr�er un thread en t�che de fond : %s\n"
 
-#: pg_basebackup.c:353
-#: pg_basebackup.c:821
+#: pg_basebackup.c:363 pg_basebackup.c:989
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s : n'a pas pu cr�er le r�pertoire � %s � : %s\n"
 
-#: pg_basebackup.c:370
+#: pg_basebackup.c:382
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s : le r�pertoire � %s � existe mais n'est pas vide\n"
 
-#: pg_basebackup.c:378
+#: pg_basebackup.c:390
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s : n'a pas pu acc�der au r�pertoire � %s � : %s\n"
 
-#: pg_basebackup.c:425
+#: pg_basebackup.c:438
 #, c-format
-msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
-msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
-msgstr[0] "%s/%s Ko (100%%), %d/%d tablespace %35s"
-msgstr[1] "%s/%s Ko (100%%), %d/%d tablespaces %35s"
+#| msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+#| msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
+msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
+msgstr[0] "%*s/%s Ko (100%%), %d/%d tablespace %*s"
+msgstr[1] "%*s/%s Ko (100%%), %d/%d tablespaces %*s"
 
-#: pg_basebackup.c:432
+#: pg_basebackup.c:450
 #, c-format
-msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
-msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
-msgstr[0] "%s/%s Ko (%d%%), %d/%d tablespace (%-30.30s)"
-msgstr[1] "%s/%s Ko (%d%%), %d/%d tablespaces (%-30.30s)"
+#| msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+#| msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
+msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
+msgstr[0] "%*s/%s Ko (%d%%), %d/%d tablespace (%s%-*.*s)"
+msgstr[1] "%*s/%s Ko (%d%%), %d/%d tablespaces (%s%-*.*s)"
 
-#: pg_basebackup.c:440
+#: pg_basebackup.c:466
 #, c-format
-msgid "%s/%s kB (%d%%), %d/%d tablespace"
-msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
-msgstr[0] "%s/%s Ko (%d%%), %d/%d tablespace"
-msgstr[1] "%s/%s Ko (%d%%), %d/%d tablespaces"
+#| msgid "%s/%s kB (%d%%), %d/%d tablespace"
+#| msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgid "%*s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%*s/%s Ko (%d%%), %d/%d tablespace"
+msgstr[1] "%*s/%s Ko (%d%%), %d/%d tablespaces"
+
+#: pg_basebackup.c:493
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s : n'a pas pu �crire dans le fichier compress� � %s � : %s\n"
 
-#: pg_basebackup.c:486
-#: pg_basebackup.c:506
-#: pg_basebackup.c:534
+#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s : n'a pas pu �crire dans le fichier � %s � : %s\n"
+
+#: pg_basebackup.c:558 pg_basebackup.c:578 pg_basebackup.c:606
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s : n'a pas pu configurer le niveau de compression %d : %s\n"
 
-#: pg_basebackup.c:555
+#: pg_basebackup.c:627
 #, c-format
 msgid "%s: could not create compressed file \"%s\": %s\n"
 msgstr "%s : n'a pas pu cr�er le fichier compress� � %s � : %s\n"
 
-#: pg_basebackup.c:566
-#: pg_basebackup.c:863
+#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
 msgstr "%s : n'a pas pu cr�er le fichier � %s � : %s\n"
 
-#: pg_basebackup.c:578
-#: pg_basebackup.c:725
+#: pg_basebackup.c:650 pg_basebackup.c:893
 #, c-format
 msgid "%s: could not get COPY data stream: %s"
 msgstr "%s : n'a pas pu obtenir le flux de donn�es de COPY : %s"
 
-#: pg_basebackup.c:612
-#: pg_basebackup.c:670
-#, c-format
-msgid "%s: could not write to compressed file \"%s\": %s\n"
-msgstr "%s : n'a pas pu �crire dans le fichier compress� � %s � : %s\n"
-
-#: pg_basebackup.c:623
-#: pg_basebackup.c:680
-#: pg_basebackup.c:903
-#, c-format
-msgid "%s: could not write to file \"%s\": %s\n"
-msgstr "%s : n'a pas pu �crire dans le fichier � %s � : %s\n"
-
-#: pg_basebackup.c:635
+#: pg_basebackup.c:707
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
 msgstr "%s : n'a pas pu fermer le fichier compress� � %s � : %s\n"
 
-#: pg_basebackup.c:648
-#: receivelog.c:157
-#: receivelog.c:625
-#: receivelog.c:634
+#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:351 receivelog.c:725
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
 msgstr "%s : n'a pas pu fermer le fichier � %s � : %s\n"
 
-#: pg_basebackup.c:659
-#: pg_basebackup.c:754
-#: receivelog.c:468
+#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:938
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s : n'a pas pu lire les donn�es du COPY : %s"
 
-#: pg_basebackup.c:768
+#: pg_basebackup.c:936
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
 msgstr "%s : taille invalide de l'en-t�te de bloc du fichier tar : %d\n"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:944
 #, c-format
 msgid "%s: could not parse file size\n"
 msgstr "%s : n'a pas pu analyser la taille du fichier\n"
 
-#: pg_basebackup.c:784
+#: pg_basebackup.c:952
 #, c-format
 msgid "%s: could not parse file mode\n"
 msgstr "%s : n'a pas pu analyser le mode du fichier\n"
 
-#: pg_basebackup.c:829
+#: pg_basebackup.c:997
 #, c-format
 msgid "%s: could not set permissions on directory \"%s\": %s\n"
 msgstr "%s : n'a pas configurer les droits sur le r�pertoire � %s � : %s\n"
 
-#: pg_basebackup.c:842
+#: pg_basebackup.c:1010
 #, c-format
 msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
 msgstr "%s : n'a pas pu cr�er le lien symbolique de � %s � vers � %s � : %s\n"
 
-#: pg_basebackup.c:850
+#: pg_basebackup.c:1018
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s : indicateur de lien � %c � non reconnu\n"
 
-#: pg_basebackup.c:870
+#: pg_basebackup.c:1038
 #, c-format
 msgid "%s: could not set permissions on file \"%s\": %s\n"
 msgstr "%s : n'a pas pu configurer les droits sur le fichier � %s � : %s\n"
 
-#: pg_basebackup.c:929
+#: pg_basebackup.c:1097
 #, c-format
 msgid "%s: COPY stream ended before last file was finished\n"
-msgstr "%s : le flux COPY s'est termin� avant que le dernier fichier soit termin�\n"
+msgstr ""
+"%s : le flux COPY s'est termin� avant que le dernier fichier soit termin�\n"
 
-#: pg_basebackup.c:965
-#: pg_basebackup.c:994
-#: pg_receivexlog.c:239
-#: receivelog.c:303
-#: receivelog.c:340
+#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
+#: pg_basebackup.c:1257
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s : m�moire �puis�e\n"
+
+#: pg_basebackup.c:1333
+#, c-format
+#| msgid "%s: could not parse server version \"%s\"\n"
+msgid "%s: incompatible server version %s\n"
+msgstr "%s : version � %s � du serveur incompatible\n"
+
+#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:251
+#: receivelog.c:532 receivelog.c:577 receivelog.c:616
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
 msgstr "%s : n'a pas pu envoyer la commande de r�plication � %s � : %s"
 
-#: pg_basebackup.c:972
-#: pg_receivexlog.c:247
-#: receivelog.c:311
+#: pg_basebackup.c:1367 pg_receivexlog.c:258 receivelog.c:540
 #, c-format
-msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
+msgid ""
+"%s: could not identify system: got %d rows and %d fields, expected %d rows "
+"and %d fields\n"
 msgstr ""
 "%s : n'a pas pu identifier le syst�me, a r�cup�r� %d lignes et %d champs,\n"
 "attendait %d lignes et %d champs\n"
 
-#: pg_basebackup.c:1005
+#: pg_basebackup.c:1400
 #, c-format
 msgid "%s: could not initiate base backup: %s"
 msgstr "%s : n'a pas pu initier la sauvegarde de base : %s"
 
-#: pg_basebackup.c:1011
+#: pg_basebackup.c:1407
 #, c-format
-msgid "%s: no start point returned from server\n"
-msgstr "%s : aucun point de red�marrage renvoy� du serveur\n"
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: server returned unexpected response to BASE_BACKUP command; got %d rows "
+"and %d fields, expected %d rows and %d fields\n"
+msgstr ""
+"%s : le serveur a renvoy� une r�ponse inattendue � la commande BASE_BACKUP ; "
+"a r�cup�r� %d lignes et %d champs, alors qu'il attendait %d lignes et %d "
+"champs\n"
+
+#: pg_basebackup.c:1427
+#, c-format
+#| msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
+msgid "transaction log start point: %s on timeline %u\n"
+msgstr "point de d�part du journal de transactions : %s sur la timeline %u\n"
 
-#: pg_basebackup.c:1027
+#: pg_basebackup.c:1436
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s : n'a pas pu obtenir l'en-t�te du serveur : %s"
 
-#: pg_basebackup.c:1033
+#: pg_basebackup.c:1442
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s : aucune donn�e renvoy�e du serveur\n"
 
-#: pg_basebackup.c:1062
+#: pg_basebackup.c:1471
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
-msgstr "%s : peut seulement �crire un tablespace sur la sortie standard, la base en a %d\n"
+msgstr ""
+"%s : peut seulement �crire un tablespace sur la sortie standard, la base en "
+"a %d\n"
 
-#: pg_basebackup.c:1074
+#: pg_basebackup.c:1483
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s : lance le r�cepteur de journaux de transactions en t�che de fond\n"
 
-#: pg_basebackup.c:1104
+#: pg_basebackup.c:1513
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr ""
 "%s : n'a pas pu obtenir la position finale des journaux de transactions �\n"
 "partir du serveur : %s"
 
-#: pg_basebackup.c:1111
+#: pg_basebackup.c:1520
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
-msgstr "%s : aucune position de fin du journal de transactions renvoy�e par le serveur\n"
+msgstr ""
+"%s : aucune position de fin du journal de transactions renvoy�e par le "
+"serveur\n"
 
-#: pg_basebackup.c:1123
+#: pg_basebackup.c:1532
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s : �chec lors de la r�ception finale : %s"
 
-#: pg_basebackup.c:1139
+#: pg_basebackup.c:1550
 #, c-format
-msgid "%s: waiting for background process to finish streaming...\n"
-msgstr "%s : en attente que le processus en t�che de fond finisse le flux...\n"
+#| msgid "%s: waiting for background process to finish streaming...\n"
+msgid "%s: waiting for background process to finish streaming ...\n"
+msgstr "%s : en attente que le processus en t�che de fond termine le flux...\n"
 
-#: pg_basebackup.c:1145
+#: pg_basebackup.c:1556
 #, c-format
 msgid "%s: could not send command to background pipe: %s\n"
 msgstr "%s : n'a pas pu envoyer la commande au tube du processus : %s\n"
 
-#: pg_basebackup.c:1154
+#: pg_basebackup.c:1565
 #, c-format
 msgid "%s: could not wait for child process: %s\n"
 msgstr "%s : n'a pas pu attendre le processus fils : %s\n"
 
-#: pg_basebackup.c:1160
+#: pg_basebackup.c:1571
 #, c-format
 msgid "%s: child %d died, expected %d\n"
 msgstr "%s : le fils %d est mort, %d attendu\n"
 
-#: pg_basebackup.c:1166
+#: pg_basebackup.c:1577
 #, c-format
 msgid "%s: child process did not exit normally\n"
 msgstr "%s : le processus fils n'a pas quitt� normalement\n"
 
-#: pg_basebackup.c:1172
+#: pg_basebackup.c:1583
 #, c-format
 msgid "%s: child process exited with error %d\n"
 msgstr "%s : le processus fils a quitt� avec le code erreur %d\n"
 
-#: pg_basebackup.c:1198
+#: pg_basebackup.c:1610
 #, c-format
 msgid "%s: could not wait for child thread: %s\n"
 msgstr "%s : n'a pas pu attendre le thread : %s\n"
 
-#: pg_basebackup.c:1205
+#: pg_basebackup.c:1617
 #, c-format
 msgid "%s: could not get child thread exit status: %s\n"
 msgstr "%s : n'a pas pu obtenir le code de sortie du thread : %s\n"
 
-#: pg_basebackup.c:1211
+#: pg_basebackup.c:1623
 #, c-format
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s : le thread a quitt� avec le code d'erreur %u\n"
 
-#: pg_basebackup.c:1292
+#: pg_basebackup.c:1709
 #, c-format
 msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
-msgstr "%s : format de sortie � %s � invalide, doit �tre soit � plain � soit � tar �\n"
+msgstr ""
+"%s : format de sortie � %s � invalide, doit �tre soit � plain � soit � tar "
+"�\n"
 
-#: pg_basebackup.c:1301
-#: pg_basebackup.c:1313
+#: pg_basebackup.c:1721 pg_basebackup.c:1733
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s : ne peut pas sp�cifier � la fois --xlog et --xlog-method\n"
 
-#: pg_basebackup.c:1328
+#: pg_basebackup.c:1748
 #, c-format
-msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
+msgid ""
+"%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
 msgstr ""
-"%s : option xlog-method � %s � invalide, doit �tre soit � fetch � soit � stream �\n"
+"%s : option xlog-method � %s � invalide, doit �tre soit � fetch � soit � "
+"stream �\n"
 "soit � stream �\n"
 
-#: pg_basebackup.c:1347
+#: pg_basebackup.c:1767
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s : niveau de compression � %s � invalide\n"
 
-#: pg_basebackup.c:1359
+#: pg_basebackup.c:1779
 #, c-format
-msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
 msgstr ""
 "%s : argument � %s � invalide pour le CHECKPOINT, doit �tre soit � fast �\n"
 "soit � spread �\n"
 
-#: pg_basebackup.c:1383
-#: pg_receivexlog.c:370
+#: pg_basebackup.c:1806 pg_receivexlog.c:392
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
 msgstr "%s : intervalle � %s � invalide du statut\n"
 
-#: pg_basebackup.c:1399
-#: pg_basebackup.c:1413
-#: pg_basebackup.c:1424
-#: pg_basebackup.c:1437
-#: pg_basebackup.c:1447
-#: pg_receivexlog.c:386
-#: pg_receivexlog.c:400
-#: pg_receivexlog.c:411
+#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
+#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
+#: pg_receivexlog.c:422 pg_receivexlog.c:433
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayer � %s --help � pour plus d'informations.\n"
 
-#: pg_basebackup.c:1411
-#: pg_receivexlog.c:398
+#: pg_basebackup.c:1834 pg_receivexlog.c:420
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s : trop d'arguments en ligne de commande (le premier �tant � %s �)\n"
 
-#: pg_basebackup.c:1423
-#: pg_receivexlog.c:410
+#: pg_basebackup.c:1846 pg_receivexlog.c:432
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s : aucun r�pertoire cible indiqu�\n"
 
-#: pg_basebackup.c:1435
+#: pg_basebackup.c:1858
 #, c-format
 msgid "%s: only tar mode backups can be compressed\n"
 msgstr "%s : seules les sauvegardes en mode tar peuvent �tre compress�es\n"
 
-#: pg_basebackup.c:1445
+#: pg_basebackup.c:1868
 #, c-format
-msgid "%s: wal streaming can only be used in plain mode\n"
-msgstr "%s : le flux de journaux de transactions peut seulement �tre utilis� en mode plain\n"
+#| msgid "%s: wal streaming can only be used in plain mode\n"
+msgid "%s: WAL streaming can only be used in plain mode\n"
+msgstr ""
+"%s : le flux de journaux de transactions peut seulement �tre utilis� en mode "
+"plain\n"
 
-#: pg_basebackup.c:1456
+#: pg_basebackup.c:1879
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s : cette construction ne supporte pas la compression\n"
 
-#: pg_receivexlog.c:57
+#: pg_receivexlog.c:51
 #, c-format
 msgid ""
 "%s receives PostgreSQL streaming transaction logs.\n"
@@ -552,7 +604,7 @@ msgstr ""
 "%s re�oit le flux des journaux de transactions PostgreSQL.\n"
 "\n"
 
-#: pg_receivexlog.c:61
+#: pg_receivexlog.c:55
 #, c-format
 msgid ""
 "\n"
@@ -561,205 +613,322 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: pg_receivexlog.c:62
+#: pg_receivexlog.c:56
 #, c-format
-msgid "  -D, --directory=DIR    receive transaction log files into this directory\n"
+msgid ""
+"  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr ""
 "  -D, --directory=R�P          re�oit les journaux de transactions dans ce\n"
 "                               r�pertoire\n"
 
-#: pg_receivexlog.c:63
+#: pg_receivexlog.c:57
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
-msgstr "  -n, --no-loop                ne boucle pas en cas de perte de la connexion\n"
+msgstr ""
+"  -n, --no-loop                ne boucle pas en cas de perte de la "
+"connexion\n"
 
-#: pg_receivexlog.c:82
+#: pg_receivexlog.c:81
 #, c-format
 msgid "%s: finished segment at %X/%X (timeline %u)\n"
 msgstr "%s : segment termin� � %X/%X (timeline %u)\n"
 
-#: pg_receivexlog.c:87
+#: pg_receivexlog.c:94
+#, c-format
+#| msgid "End of WAL reached on timeline %u at %X/%X."
+msgid "%s: switched to timeline %u at %X/%X\n"
+msgstr "%s : a bascul� sur la timeline %u � %X/%X\n"
+
+#: pg_receivexlog.c:103
 #, c-format
-msgid "%s: received interrupt signal, exiting.\n"
-msgstr "%s : a re�u un signal d'interruption, quitte.\n"
+#| msgid "%s: received interrupt signal, exiting.\n"
+msgid "%s: received interrupt signal, exiting\n"
+msgstr "%s : a re�u un signal d'interruption, quitte\n"
 
-#: pg_receivexlog.c:114
+#: pg_receivexlog.c:128
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le r�pertoire � %s � : %s\n"
 
-#: pg_receivexlog.c:155
+#: pg_receivexlog.c:157
 #, c-format
 msgid "%s: could not parse transaction log file name \"%s\"\n"
 msgstr "%s : n'a pas pu analyser le nom du journal de transactions � %s �\n"
 
-#: pg_receivexlog.c:168
+#: pg_receivexlog.c:167
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s : n'a pas pu r�cup�rer les informations sur le fichier � %s � : %s\n"
+msgstr ""
+"%s : n'a pas pu r�cup�rer les informations sur le fichier � %s � : %s\n"
 
-#: pg_receivexlog.c:187
+#: pg_receivexlog.c:185
 #, c-format
 msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
 msgstr "%s : le segment � %s � a une taille %d incorrecte, ignor�\n"
 
-#: pg_receivexlog.c:277
+#: pg_receivexlog.c:293
 #, c-format
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s : commence le flux des journaux � %X/%X (timeline %u)\n"
 
-#: pg_receivexlog.c:351
+#: pg_receivexlog.c:373
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
 msgstr "%s : num�ro de port invalide : � %s �\n"
 
-#: pg_receivexlog.c:433
+#: pg_receivexlog.c:455
 #, c-format
-msgid "%s: disconnected.\n"
-msgstr "%s : d�connect�.\n"
+#| msgid "%s: disconnected.\n"
+msgid "%s: disconnected\n"
+msgstr "%s : d�connect�\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:440
+#: pg_receivexlog.c:462
 #, c-format
-msgid "%s: disconnected. Waiting %d seconds to try again.\n"
-msgstr "%s : d�connect�. Attente de %d secondes avant une nouvelle tentative.\n"
+#| msgid "%s: disconnected. Waiting %d seconds to try again.\n"
+msgid "%s: disconnected; waiting %d seconds to try again\n"
+msgstr "%s : d�connect�, attente de %d secondes avant une nouvelle tentative\n"
 
-#: receivelog.c:72
+#: receivelog.c:69
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le journal des transactions � %s � : %s\n"
 
-#: receivelog.c:84
+#: receivelog.c:81
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr ""
 "%s : n'a pas pu r�cup�rer les informations sur le journal de transactions\n"
 "� %s � : %s\n"
 
-#: receivelog.c:94
+#: receivelog.c:95
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr ""
 "%s : le segment � %s � du journal de transactions comprend %d octets, cela\n"
 "devrait �tre 0 ou %d\n"
 
-#: receivelog.c:107
+#: receivelog.c:108
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
-msgstr "%s : n'a pas pu remplir de z�ros le journal de transactions � %s � : %s\n"
+msgstr ""
+"%s : n'a pas pu remplir de z�ros le journal de transactions � %s � : %s\n"
 
-#: receivelog.c:120
+#: receivelog.c:121
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
-msgstr "%s : n'a pas pu rechercher le d�but du journal de transaction � %s � : %s\n"
+msgstr ""
+"%s : n'a pas pu rechercher le d�but du journal de transaction � %s � : %s\n"
 
-#: receivelog.c:143
+#: receivelog.c:147
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
-msgstr "%s : n'a pas pu d�terminer la position de recherche dans le fichier d'archive � %s � : %s\n"
+msgstr ""
+"%s : n'a pas pu d�terminer la position de recherche dans le fichier "
+"d'archive � %s � : %s\n"
 
-#: receivelog.c:150
+#: receivelog.c:154 receivelog.c:344
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s : n'a pas pu synchroniser sur disque le fichier � %s � : %s\n"
 
-#: receivelog.c:177
+#: receivelog.c:181
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
 msgstr "%s : n'a pas pu renommer le fichier � %s � : %s\n"
 
-#: receivelog.c:184
+#: receivelog.c:188
 #, c-format
-msgid "%s: not renaming \"%s\", segment is not complete\n"
-msgstr "%s : pas de renommage de � %s �, le segment n'est pas complet\n"
+#| msgid "%s: not renaming \"%s\", segment is not complete\n"
+msgid "%s: not renaming \"%s%s\", segment is not complete\n"
+msgstr "%s : pas de renommage de � %s%s �, le segment n'est pas complet\n"
+
+#: receivelog.c:277
+#, c-format
+#| msgid "%s: could not open log file \"%s\": %s\n"
+msgid "%s: could not open timeline history file \"%s\": %s\n"
+msgstr ""
+"%s : n'a pas pu ouvrir le journal historique de la timeline � %s � : %s\n"
+
+#: receivelog.c:304
+#, c-format
+msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
+msgstr ""
+"%s : le serveur a renvoy� un nom de fichier historique inattendu pour la "
+"timeline %u : %s\n"
 
 #: receivelog.c:319
 #, c-format
-msgid "%s: system identifier does not match between base backup and streaming connection\n"
+#| msgid "%s: could not create file \"%s\": %s\n"
+msgid "%s: could not create timeline history file \"%s\": %s\n"
 msgstr ""
-"%s : l'identifiant syst�me ne correspond pas entre la sauvegarde des fichiers\n"
-"et la connexion de r�plication\n"
+"%s : n'a pas pu cr�er le fichier historique de la timeline � %s � : %s\n"
 
-#: receivelog.c:327
+#: receivelog.c:336
 #, c-format
-msgid "%s: timeline does not match between base backup and streaming connection\n"
+#| msgid "%s: could not write to file \"%s\": %s\n"
+msgid "%s: could not write timeline history file \"%s\": %s\n"
 msgstr ""
-"%s : la timeline ne correspond pas entre la sauvegarde des fichiers et la\n"
-"connexion de r�plication\n"
+"%s : n'a pas pu �crire dans le fichier historique de la timeline � %s � : "
+"%s\n"
 
-#: receivelog.c:398
+#: receivelog.c:363
+#, c-format
+#| msgid "could not rename file \"%s\" to \"%s\": %m"
+msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
+msgstr "%s : n'a pas pu renommer le fichier � %s � en � %s � : %s\n"
+
+#: receivelog.c:436
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s : n'a pas pu envoyer le paquet d'informations en retour : %s"
 
-#: receivelog.c:449
+#: receivelog.c:470
 #, c-format
-msgid "%s: select() failed: %s\n"
-msgstr "%s : �chec de select() : %s\n"
+#| msgid "No per-database role settings support in this server version.\n"
+msgid ""
+"%s: incompatible server version %s; streaming is only supported with server "
+"version %s\n"
+msgstr ""
+"%s : version %s du serveur incompatible ; le flux est seulement support� "
+"avec la version %s du serveur\n"
 
-#: receivelog.c:457
+#: receivelog.c:548
 #, c-format
-msgid "%s: could not receive data from WAL stream: %s"
-msgstr "%s : n'a pas pu recevoir des donn�es du flux de WAL : %s"
+msgid ""
+"%s: system identifier does not match between base backup and streaming "
+"connection\n"
+msgstr ""
+"%s : l'identifiant syst�me ne correspond pas entre la sauvegarde des "
+"fichiers\n"
+"et la connexion de r�plication\n"
 
-#: receivelog.c:481
+#: receivelog.c:556
 #, c-format
-msgid "%s: keepalive message has incorrect size %d\n"
-msgstr "%s : le message keepalive a une taille %d incorrecte\n"
+#| msgid ""
+#| "requested starting point %X/%X on timeline %u is not in this server's "
+#| "history"
+msgid "%s: starting timeline %u is not present in the server\n"
+msgstr "%s : la timeline %u de d�part n'est pas dans le serveur\n"
 
-#: receivelog.c:489
+#: receivelog.c:590
 #, c-format
-msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s : ent�te non reconnu du flux : � %c �\n"
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
+"fields, expected %d rows and %d fields\n"
+msgstr ""
+"%s : r�ponse inattendue � la commande TIMELINE_HISTORY : a r�cup�r� %d "
+"lignes et %d champs, alors qu'il attendait %d lignes et %d champs\n"
+
+#: receivelog.c:663
+#, c-format
+msgid ""
+"%s: server reported unexpected next timeline %u, following timeline %u\n"
+msgstr ""
+"%s: le serveur a renvoy� une timeline suivante %u inattendue, apr�s la "
+"timeline %u\n"
+
+#: receivelog.c:670
+#, c-format
+msgid ""
+"%s: server stopped streaming timeline %u at %X/%X, but reported next "
+"timeline %u to begin at %X/%X\n"
+msgstr ""
+"%s : le serveur a arr�t� l'envoi de la timeline %u � %X/%X, mais a indiqu� "
+"que la timeline suivante, %u, commence � %X/%X\n"
+
+#: receivelog.c:682 receivelog.c:717
+#, c-format
+msgid "%s: unexpected termination of replication stream: %s"
+msgstr "%s : fin inattendue du flux de r�plication : %s"
+
+#: receivelog.c:708
+#, c-format
+msgid "%s: replication stream was terminated before stop point\n"
+msgstr ""
+"%s : le flux de r�plication a �t� abandonn� avant d'arriver au point "
+"d'arr�t\n"
+
+#: receivelog.c:756
+#, c-format
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: unexpected result set after end-of-timeline: got %d rows and %d fields, "
+"expected %d rows and %d fields\n"
+msgstr ""
+"%s : ensemble de r�sultats inattendu apr�s la fin de la timeline : a "
+"r�cup�r� %d lignes et %d champs, alors qu'il attendait %d lignes et %d "
+"champs\n"
+
+#: receivelog.c:766
+#, c-format
+#| msgid "%s: could not parse xlog end position \"%s\"\n"
+msgid "%s: could not parse next timeline's starting point \"%s\"\n"
+msgstr ""
+"%s : n'a pas pu analyser la position de d�part de la prochaine timeline � %s "
+"�\n"
+
+#: receivelog.c:821 receivelog.c:923 receivelog.c:1088
+#, c-format
+#| msgid "%s: could not send feedback packet: %s"
+msgid "%s: could not send copy-end packet: %s"
+msgstr "%s : n'a pas pu envoyer le paquet de fin de copie : %s"
 
-#: receivelog.c:495
+#: receivelog.c:888
+#, c-format
+msgid "%s: select() failed: %s\n"
+msgstr "%s : �chec de select() : %s\n"
+
+#: receivelog.c:896
+#, c-format
+msgid "%s: could not receive data from WAL stream: %s"
+msgstr "%s : n'a pas pu recevoir des donn�es du flux de WAL : %s"
+
+#: receivelog.c:960 receivelog.c:995
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s : en-t�te de flux trop petit : %d\n"
 
-#: receivelog.c:514
+#: receivelog.c:1014
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr ""
 "%s : a re�u l'enregistrement du journal de transactions pour le d�calage %u\n"
 "sans fichier ouvert\n"
 
-#: receivelog.c:526
+#: receivelog.c:1026
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
-msgstr "%s : a obtenu le d�calage %08x pour les donn�es du journal, attendait %08x\n"
+msgstr ""
+"%s : a obtenu le d�calage %08x pour les donn�es du journal, attendait %08x\n"
 
-#: receivelog.c:562
+#: receivelog.c:1063
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
-msgstr "%s : n'a pas pu �crire %u octets dans le journal de transactions � %s � : %s\n"
-
-#: receivelog.c:608
-#, c-format
-msgid "%s: unexpected termination of replication stream: %s"
-msgstr "%s : fin inattendue du flux de r�plication : %s"
-
-#: receivelog.c:617
-#, c-format
-msgid "%s: replication stream was terminated before stop point\n"
-msgstr "%s : le flux de r�plication a �t� abandonn� avant d'arriver au point d'arr�t\n"
+msgstr ""
+"%s : n'a pas pu �crire %u octets dans le journal de transactions � %s � : "
+"%s\n"
 
-#: streamutil.c:46
-#: streamutil.c:60
+#: receivelog.c:1101
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s : m�moire �puis�e\n"
+msgid "%s: unrecognized streaming header: \"%c\"\n"
+msgstr "%s : ent�te non reconnu du flux : � %c �\n"
 
-#: streamutil.c:139
+#: streamutil.c:135
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: streamutil.c:152
+#: streamutil.c:148
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s : n'a pas pu se connecter au serveur\n"
 
-#: streamutil.c:168
+#: streamutil.c:164
 #, c-format
 msgid "%s: could not connect to server: %s\n"
 msgstr "%s : n'a pas pu se connecter au serveur : %s\n"
@@ -767,63 +936,80 @@ msgstr "%s : n'a pas pu se connecter au serveur : %s\n"
 #: streamutil.c:188
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
-msgstr "%s : n'a pas pu d�terminer la configuration serveur de integer_datetimes\n"
+msgstr ""
+"%s : n'a pas pu d�terminer la configuration serveur de integer_datetimes\n"
 
 #: streamutil.c:201
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
-msgstr "%s : l'option de compilation integer_datetimes ne correspond pas au serveur\n"
+msgstr ""
+"%s : l'option de compilation integer_datetimes ne correspond pas au serveur\n"
 
-#~ msgid "  --version                output version information, then exit\n"
-#~ msgstr "  --version                    affiche la version et quitte\n"
+#~ msgid "%s: could not close file %s: %s\n"
+#~ msgstr "%s : n'a pas pu fermer le fichier %s : %s\n"
 
-#~ msgid "  --help                   show this help, then exit\n"
-#~ msgstr "  --help                       affiche cette aide et quitte\n"
+#~ msgid "  -V, --version            output version information, then exit\n"
+#~ msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#~ msgid "%s: could not read copy data: %s\n"
-#~ msgstr "%s : n'a pas pu lire les donn�es du COPY : %s\n"
+#~ msgid "  -?, --help               show this help, then exit\n"
+#~ msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#~ msgid "%s: could not start replication: %s\n"
-#~ msgstr "%s : n'a pas pu d�marrer la r�plication : %s\n"
+#~ msgid "%s: invalid format of xlog location: %s\n"
+#~ msgstr ""
+#~ "%s : format invalide de l'emplacement du journal de transactions : %s\n"
 
-#~ msgid "%s: could not get current position in file %s: %s\n"
-#~ msgstr "%s : n'a pas pu obtenir la position courant dans le fichier %s : %s\n"
+#~ msgid "%s: could not identify system: %s"
+#~ msgstr "%s : n'a pas pu identifier le syst�me : %s"
 
-#~ msgid "%s: could not seek back to beginning of WAL segment %s: %s\n"
-#~ msgstr "%s : n'a pas pu se d�placer au d�but du segment WAL %s : %s\n"
+#~ msgid "%s: could not send base backup command: %s"
+#~ msgstr "%s : n'a pas pu envoyer la commande de sauvegarde de base : %s"
 
-#~ msgid "%s: could not pad WAL segment %s: %s\n"
-#~ msgstr "%s : n'a pas pu terminer le segment WAL %s : %s\n"
+#~ msgid "%s: could not identify system: %s\n"
+#~ msgstr "%s : n'a pas pu identifier le syst�me : %s\n"
 
-#~ msgid "%s: could not stat WAL segment %s: %s\n"
-#~ msgstr "%s : n'a pas pu r�cup�rer les informations sur le segment WAL %s : %s\n"
+#~ msgid "%s: could not parse log start position from value \"%s\"\n"
+#~ msgstr ""
+#~ "%s : n'a pas pu analyser la position de d�part des WAL � partir de la "
+#~ "valeur � %s �\n"
 
 #~ msgid "%s: could not open WAL segment %s: %s\n"
 #~ msgstr "%s : n'a pas pu ouvrir le segment WAL %s : %s\n"
 
-#~ msgid "%s: could not parse log start position from value \"%s\"\n"
-#~ msgstr "%s : n'a pas pu analyser la position de d�part des WAL � partir de la valeur � %s �\n"
+#~ msgid "%s: could not stat WAL segment %s: %s\n"
+#~ msgstr ""
+#~ "%s : n'a pas pu r�cup�rer les informations sur le segment WAL %s : %s\n"
 
-#~ msgid "%s: could not identify system: %s\n"
-#~ msgstr "%s : n'a pas pu identifier le syst�me : %s\n"
+#~ msgid "%s: could not pad WAL segment %s: %s\n"
+#~ msgstr "%s : n'a pas pu terminer le segment WAL %s : %s\n"
 
-#~ msgid "%s: could not send base backup command: %s"
-#~ msgstr "%s : n'a pas pu envoyer la commande de sauvegarde de base : %s"
+#~ msgid "%s: could not seek back to beginning of WAL segment %s: %s\n"
+#~ msgstr "%s : n'a pas pu se d�placer au d�but du segment WAL %s : %s\n"
 
-#~ msgid "%s: could not identify system: %s"
-#~ msgstr "%s : n'a pas pu identifier le syst�me : %s"
+#~ msgid "%s: could not get current position in file %s: %s\n"
+#~ msgstr ""
+#~ "%s : n'a pas pu obtenir la position courant dans le fichier %s : %s\n"
 
-#~ msgid "%s: invalid format of xlog location: %s\n"
-#~ msgstr "%s : format invalide de l'emplacement du journal de transactions : %s\n"
+#~ msgid "%s: could not start replication: %s\n"
+#~ msgstr "%s : n'a pas pu d�marrer la r�plication : %s\n"
 
-#~ msgid "%s: could not parse xlog end position \"%s\"\n"
-#~ msgstr "%s : n'a pas pu analyser la position finale du journal de transactions � %s �\n"
+#~ msgid "%s: could not read copy data: %s\n"
+#~ msgstr "%s : n'a pas pu lire les donn�es du COPY : %s\n"
 
-#~ msgid "  -?, --help               show this help, then exit\n"
-#~ msgstr "  -?, --help                 affiche cette aide puis quitte\n"
+#~ msgid "  --help                   show this help, then exit\n"
+#~ msgstr "  --help                       affiche cette aide et quitte\n"
 
-#~ msgid "  -V, --version            output version information, then exit\n"
-#~ msgstr "  -V, --version              affiche la version puis quitte\n"
+#~ msgid "  --version                output version information, then exit\n"
+#~ msgstr "  --version                    affiche la version et quitte\n"
 
-#~ msgid "%s: could not close file %s: %s\n"
-#~ msgstr "%s : n'a pas pu fermer le fichier %s : %s\n"
+#~ msgid "%s: keepalive message has incorrect size %d\n"
+#~ msgstr "%s : le message keepalive a une taille %d incorrecte\n"
+
+#~ msgid ""
+#~ "%s: timeline does not match between base backup and streaming connection\n"
+#~ msgstr ""
+#~ "%s : la timeline ne correspond pas entre la sauvegarde des fichiers et "
+#~ "la\n"
+#~ "connexion de r�plication\n"
+
+#~ msgid "%s: no start point returned from server\n"
+#~ msgstr "%s : aucun point de red�marrage renvoy� du serveur\n"
diff --git a/src/bin/pg_basebackup/po/ja.po b/src/bin/pg_basebackup/po/ja.po
index 6d645df9b5b..d6dab469bc7 100644
--- a/src/bin/pg_basebackup/po/ja.po
+++ b/src/bin/pg_basebackup/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2012-08-11 12:26+0900\n"
-"PO-Revision-Date: 2012-08-11 14:54+0900\n"
+"POT-Creation-Date: 2013-08-18 10:50+0900\n"
+"PO-Revision-Date: 2013-08-18 11:17+0900\n"
 "Last-Translator: honda@postgresql.jp\n"
 "Language-Team: Japan Postgresql User Group\n"
 "Language: ja\n"
@@ -16,24 +16,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_basebackup.c:103
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
+#, c-format
+msgid "out of memory\n"
+msgstr "メモリ不足です\n"
+
+#: ../../common/fe_memutils.c:77
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "null ポインタを複製できません（内部エラー）。\n"
+
+#: pg_basebackup.c:106
 #, c-format
 msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
 "\n"
 msgstr "%sは実行中のPostgreSQLサーバのベースバックアップを取得します。\n"
 
-#: pg_basebackup.c:105 pg_receivexlog.c:59
+#: pg_basebackup.c:108 pg_receivexlog.c:53
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: pg_basebackup.c:106 pg_receivexlog.c:60
+#: pg_basebackup.c:109 pg_receivexlog.c:54
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_basebackup.c:107
+#: pg_basebackup.c:110
 #, c-format
 msgid ""
 "\n"
@@ -42,22 +53,34 @@ msgstr ""
 "\n"
 "出力を制御するオプション:\n"
 
-#: pg_basebackup.c:108
+#: pg_basebackup.c:111
 #, c-format
 msgid "  -D, --pgdata=DIRECTORY receive base backup into directory\n"
 msgstr "  -D, --pgdata=DIRECTORY   ディレクトリ内にベースバックアップを格納します\n"
 
-#: pg_basebackup.c:109
+#: pg_basebackup.c:112
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
 msgstr "  -F, --format=p|t         出力フォーマット（プレイン(デフォルト)またはtar）\n"
 
-#: pg_basebackup.c:110
+#: pg_basebackup.c:113
+#, c-format
+#| msgid ""
+#| "  -0, --record-separator-zero\n"
+#| "                           set record separator to zero byte\n"
+msgid ""
+"  -R, --write-recovery-conf\n"
+"                         write recovery.conf after backup\n"
+msgstr ""
+"  -R, --record-separator-zero\n"
+"                           バックアップの後にrecovery.confを書き出す\n"
+
+#: pg_basebackup.c:115
 #, c-format
 msgid "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr "  -x, --xlog               必要なWALファイルをバックアップ内に含めます（フェッチモード）\n"
 
-#: pg_basebackup.c:111
+#: pg_basebackup.c:116
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
@@ -66,17 +89,17 @@ msgstr ""
 "  -x, --xlog-method=fetch|stream\n"
 "               必要なWALファイルを指定した方法で含めます\n"
 
-#: pg_basebackup.c:113
+#: pg_basebackup.c:118
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip               出力を圧縮します\n"
 
-#: pg_basebackup.c:114
+#: pg_basebackup.c:119
 #, c-format
 msgid "  -Z, --compress=0-9     compress tar output with given compression level\n"
 msgstr "  -Z, --compress=0-9       指定した圧縮レベルでtar出力を圧縮します\n"
 
-#: pg_basebackup.c:115
+#: pg_basebackup.c:120
 #, c-format
 msgid ""
 "\n"
@@ -85,7 +108,7 @@ msgstr ""
 "\n"
 "汎用のオプション:\n"
 
-#: pg_basebackup.c:116
+#: pg_basebackup.c:121
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
@@ -94,32 +117,32 @@ msgstr ""
 "  -c, --checkpoint=fast|spread\n"
 "                           高速チェックポイント処理または分散チェックポイント処理の設定\n"
 
-#: pg_basebackup.c:118
+#: pg_basebackup.c:123
 #, c-format
 msgid "  -l, --label=LABEL      set backup label\n"
 msgstr "  -l, --label=LABEL        バックアップラベルの設定\n"
 
-#: pg_basebackup.c:119
+#: pg_basebackup.c:124
 #, c-format
 msgid "  -P, --progress         show progress information\n"
 msgstr "  -P, --progress           進行状況の表示\n"
 
-#: pg_basebackup.c:120 pg_receivexlog.c:64
+#: pg_basebackup.c:125 pg_receivexlog.c:58
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose            冗長メッセージの出力\n"
 
-#: pg_basebackup.c:121 pg_receivexlog.c:65
+#: pg_basebackup.c:126 pg_receivexlog.c:59
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version             バージョン情報を表示し、終了します\n"
 
-#: pg_basebackup.c:122 pg_receivexlog.c:66
+#: pg_basebackup.c:127 pg_receivexlog.c:60
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help                このヘルプを表示し、終了します\n"
 
-#: pg_basebackup.c:123 pg_receivexlog.c:67
+#: pg_basebackup.c:128 pg_receivexlog.c:61
 #, c-format
 msgid ""
 "\n"
@@ -128,41 +151,47 @@ msgstr ""
 "\n"
 "接続オプション:\n"
 
-#: pg_basebackup.c:124 pg_receivexlog.c:68
+#: pg_basebackup.c:129 pg_receivexlog.c:62
 #, c-format
-msgid ""
-"  -s, --status-interval=INTERVAL\n"
-"                         time between status packets sent to server (in seconds)\n"
-msgstr ""
-"  -s, --status-interval=INTERVAL\n"
-"                           サーバへ状態パケットを送信する間隔（秒単位）\n"
+#| msgid "  -d, --dbname=NAME        connect to database name\n"
+msgid "  -d, --dbname=CONNSTR   connection string\n"
+msgstr "  -d, --dbname=CONSTR        接続文字列\n"
 
-#: pg_basebackup.c:126 pg_receivexlog.c:70
+#: pg_basebackup.c:130 pg_receivexlog.c:63
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME      データベースサーバホストまたはソケットディレクトリ\n"
 
-#: pg_basebackup.c:127 pg_receivexlog.c:71
+#: pg_basebackup.c:131 pg_receivexlog.c:64
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT          データベースサーバのポート番号\n"
 
-#: pg_basebackup.c:128 pg_receivexlog.c:72
+#: pg_basebackup.c:132 pg_receivexlog.c:65
+#, c-format
+msgid ""
+"  -s, --status-interval=INTERVAL\n"
+"                         time between status packets sent to server (in seconds)\n"
+msgstr ""
+"  -s, --status-interval=INTERVAL\n"
+"                           サーバへ状態パケットを送信する間隔（秒単位）\n"
+
+#: pg_basebackup.c:134 pg_receivexlog.c:67
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NAME      指定したデータベースユーザで接続\n"
 
-#: pg_basebackup.c:129 pg_receivexlog.c:73
+#: pg_basebackup.c:135 pg_receivexlog.c:68
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password        パスワード入力を促さない\n"
 
-#: pg_basebackup.c:130 pg_receivexlog.c:74
+#: pg_basebackup.c:136 pg_receivexlog.c:69
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr " -W, --password           強制的にパスワード入力を促す（自動的に行われるはずです）\n"
 
-#: pg_basebackup.c:131 pg_receivexlog.c:75
+#: pg_basebackup.c:137 pg_receivexlog.c:70
 #, c-format
 msgid ""
 "\n"
@@ -171,324 +200,348 @@ msgstr ""
 "\n"
 "不具合は<pgsql-bugs@postgresql.org>まで報告ください\n"
 
-#: pg_basebackup.c:172
+#: pg_basebackup.c:180
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s: 準備されたパイプから読み込めませんでした: %s\n"
 
-#: pg_basebackup.c:180 pg_basebackup.c:271 pg_basebackup.c:1187
-#: pg_receivexlog.c:256
+#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
+#: pg_receivexlog.c:266
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
 msgstr "%s: トランザクションログ位置\"%s\"を解析できませんでした\n"
 
-#: pg_basebackup.c:283
+#: pg_basebackup.c:293
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
 msgstr "%s: バックグランドプロセス用のパイプを作成できませんでした: \"%s\"\n"
 
-#: pg_basebackup.c:316
+#: pg_basebackup.c:326
 #, c-format
 msgid "%s: could not create background process: %s\n"
 msgstr "%s: バックグランドプロセスを作成できませんでした: %s\n"
 
-#: pg_basebackup.c:328
+#: pg_basebackup.c:338
 #, c-format
 msgid "%s: could not create background thread: %s\n"
 msgstr "%s: バックグランドスレッドを作成できませんでした: %s\n"
 
-#: pg_basebackup.c:353 pg_basebackup.c:821
+#: pg_basebackup.c:363 pg_basebackup.c:989
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: \"%s\"ディレクトリを作成することができませんでした: %s\n"
 
-#: pg_basebackup.c:370
+#: pg_basebackup.c:382
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: \"%s\"ディレクトリは存在しますが空ではありません\n"
 
-#: pg_basebackup.c:378
+#: pg_basebackup.c:390
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: \"%s\"ディレクトリにアクセスできませんでした: %s\n"
 
-#: pg_basebackup.c:425
+#: pg_basebackup.c:438
 #, c-format
-msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
-msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
+msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pg_basebackup.c:432
+#: pg_basebackup.c:450
 #, c-format
-msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
-msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
+msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pg_basebackup.c:440
+#: pg_basebackup.c:466
 #, c-format
-msgid "%s/%s kB (%d%%), %d/%d tablespace"
-msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgid "%*s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pg_basebackup.c:486 pg_basebackup.c:506 pg_basebackup.c:534
+#: pg_basebackup.c:493
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: \"%s\"圧縮ファイルに書き出すことができませんでした: %s\n"
+
+#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: \"%s\"ファイルに書き出すことができませんでした: %s\n"
+
+#: pg_basebackup.c:558 pg_basebackup.c:578 pg_basebackup.c:606
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s: 圧縮レベルを%dに設定することができませんでした: %s\n"
 
-#: pg_basebackup.c:555
+#: pg_basebackup.c:627
 #, c-format
 msgid "%s: could not create compressed file \"%s\": %s\n"
 msgstr "%s: \"%s\"圧縮ファイルを作成することができませんでした: %s\n"
 
-#: pg_basebackup.c:566 pg_basebackup.c:863
+#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
 msgstr "%s: \"%s\"ファイルを作成することができませんでした: %s\n"
 
-#: pg_basebackup.c:578 pg_basebackup.c:725
+#: pg_basebackup.c:650 pg_basebackup.c:893
 #, c-format
 msgid "%s: could not get COPY data stream: %s"
 msgstr "%s: COPYデータストリームを入手できませんでした: %s"
 
-#: pg_basebackup.c:612 pg_basebackup.c:670
-#, c-format
-msgid "%s: could not write to compressed file \"%s\": %s\n"
-msgstr "%s: \"%s\"圧縮ファイルに書き出すことができませんでした: %s\n"
-
-#: pg_basebackup.c:623 pg_basebackup.c:680 pg_basebackup.c:903
-#, c-format
-msgid "%s: could not write to file \"%s\": %s\n"
-msgstr "%s: \"%s\"ファイルに書き出すことができませんでした: %s\n"
-
-#: pg_basebackup.c:635
+#: pg_basebackup.c:707
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
 msgstr "%s: \"%s\"圧縮ファイルを閉じることができませんでした: %s\n"
 
-#: pg_basebackup.c:648 receivelog.c:157
+#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:351 receivelog.c:725
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
 msgstr "%s: ファイル\"%s\"を閉じることができませんでした: %s\n"
 
-#: pg_basebackup.c:659 pg_basebackup.c:754 receivelog.c:468
+#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:938
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: COPYデータを読み取ることができませんでした: %s"
 
-#: pg_basebackup.c:768
+#: pg_basebackup.c:936
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
 msgstr "%s: 無効なtarブロックヘッダサイズ: %d\n"
 
-#: pg_basebackup.c:776
+#: pg_basebackup.c:944
 #, c-format
 msgid "%s: could not parse file size\n"
 msgstr "%s: ファイルサイズの解析ができませんでした\n"
 
-#: pg_basebackup.c:784
+#: pg_basebackup.c:952
 #, c-format
 msgid "%s: could not parse file mode\n"
 msgstr "%s: ファイルモードの解析ができませんでした\n"
 
-#: pg_basebackup.c:829
+#: pg_basebackup.c:997
 #, c-format
 msgid "%s: could not set permissions on directory \"%s\": %s\n"
 msgstr "%s: \"%s\"ディレクトリの権限を設定することができませんでした: %s\n"
 
-#: pg_basebackup.c:842
+#: pg_basebackup.c:1010
 #, c-format
 msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
 msgstr "%s: \"%s\"から\"%s\"へのシンボリックリンクを作成できませんでした: %s\n"
 
-#: pg_basebackup.c:850
+#: pg_basebackup.c:1018
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s: 未知のリンク指示子\"%c\"\n"
 
-#: pg_basebackup.c:870
+#: pg_basebackup.c:1038
 #, c-format
 msgid "%s: could not set permissions on file \"%s\": %s\n"
 msgstr "%s: \"%s\"ファイルの権限を設定できませんでした: %s\n"
 
-#: pg_basebackup.c:929
+#: pg_basebackup.c:1097
 #, c-format
 msgid "%s: COPY stream ended before last file was finished\n"
 msgstr "%s: 最後のファイルが終わる前にCOPYストリームが完了しました\n"
 
-#: pg_basebackup.c:965 pg_basebackup.c:994 pg_receivexlog.c:239
-#: receivelog.c:303 receivelog.c:340
+#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
+#: pg_basebackup.c:1257
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: メモリ不足です\n"
+
+#: pg_basebackup.c:1333
+#, c-format
+#| msgid "%s: could not parse server version \"%s\"\n"
+msgid "%s: incompatible server version %s\n"
+msgstr "%s: 互換性がないサーババージョン\"%s\"\n"
+
+#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:251
+#: receivelog.c:532 receivelog.c:577 receivelog.c:616
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
 msgstr "%s: レプリケーションコマンド\"%s\"を送信できませんでした: %s"
 
-#: pg_basebackup.c:972 pg_receivexlog.c:247 receivelog.c:311
+#: pg_basebackup.c:1367 pg_receivexlog.c:258 receivelog.c:540
 #, c-format
 msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: システムを識別できませんでした。%d行と%dフィールドを入手しました。想定では%d行と%dフィールドでした\n"
 
-#: pg_basebackup.c:1005
+#: pg_basebackup.c:1400
 #, c-format
 msgid "%s: could not initiate base backup: %s"
 msgstr "%s: ベースバックアップを初期化できませんでした: %s"
 
-#: pg_basebackup.c:1011
+#: pg_basebackup.c:1407
+#, c-format
+#| msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
+msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
+msgstr "%s: サーバはBASE_BACKUPコマンドに想定外の応答を返しました: %d行と%dフィールドを入手しました。想定では%d行と%dフィールドでした\n"
+
+#: pg_basebackup.c:1427
 #, c-format
-msgid "%s: no start point returned from server\n"
-msgstr "%s: サーバからスタートポイントが返りませんでした\n"
+#| msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
+msgid "transaction log start point: %s on timeline %u\n"
+msgstr "トランザクションログの開始ポイント: タイムライン%2$u上の%1$s\n"
 
-#: pg_basebackup.c:1027
+#: pg_basebackup.c:1436
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: バックアップヘッダを入手できませんでした: %s"
 
-#: pg_basebackup.c:1033
+#: pg_basebackup.c:1442
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: サーバから返されるデータがありません\n"
 
-#: pg_basebackup.c:1062
+#: pg_basebackup.c:1471
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
 msgstr "%s: データベースには%dありましたが、１つのテーブル空間のみ標準出力に書き出すことができます\n"
 
-#: pg_basebackup.c:1074
+#: pg_basebackup.c:1483
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s: バックグランドWAL受信処理を開始します\n"
 
-#: pg_basebackup.c:1104
+#: pg_basebackup.c:1513
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr "%s: サーバからトランザクションログの終了位置を入手できませんでした: %s"
 
-#: pg_basebackup.c:1111
+#: pg_basebackup.c:1520
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
 msgstr "%s: サーバからトランザクションログの終了位置が返されませんでした\n"
 
-#: pg_basebackup.c:1123
+#: pg_basebackup.c:1532
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: 最終受信に失敗しました: %s"
 
-#: pg_basebackup.c:1139
+#: pg_basebackup.c:1550
 #, c-format
-msgid "%s: waiting for background process to finish streaming...\n"
-msgstr "%s: ストリーミング処理が終わるまでバックグランドプロセスを待機します。。。\n"
+#| msgid "%s: waiting for background process to finish streaming...\n"
+msgid "%s: waiting for background process to finish streaming ...\n"
+msgstr "%s: ストリーミング処理が終わるまでバックグランドプロセスを待機します ...\n"
 
-#: pg_basebackup.c:1145
+#: pg_basebackup.c:1556
 #, c-format
 msgid "%s: could not send command to background pipe: %s\n"
 msgstr "%s: バックグランドパイプにコマンドを送信できませんでした: %s\n"
 
-#: pg_basebackup.c:1154
+#: pg_basebackup.c:1565
 #, c-format
 msgid "%s: could not wait for child process: %s\n"
 msgstr "%s: 子プロセスを待機できませんでした: %s\n"
 
-#: pg_basebackup.c:1160
+#: pg_basebackup.c:1571
 #, c-format
 msgid "%s: child %d died, expected %d\n"
 msgstr "%s: 子プロセス%d 終了、その期待値は%dです\n"
 
-#: pg_basebackup.c:1166
+#: pg_basebackup.c:1577
 #, c-format
 msgid "%s: child process did not exit normally\n"
 msgstr "%s: 子プロセスが正常に終わりませんでした\n"
 
-#: pg_basebackup.c:1172
+#: pg_basebackup.c:1583
 #, c-format
 msgid "%s: child process exited with error %d\n"
 msgstr "%s: 子プロセスが終了コード%dで終了しました\n"
 
-#: pg_basebackup.c:1198
+#: pg_basebackup.c:1610
 #, c-format
 msgid "%s: could not wait for child thread: %s\n"
 msgstr "%s: 子スレッドを待機できませんでした: %s\n"
 
-#: pg_basebackup.c:1205
+#: pg_basebackup.c:1617
 #, c-format
 msgid "%s: could not get child thread exit status: %s\n"
 msgstr "%s: 子スレッドの終了ステータスを入手できませんでした: %s\n"
 
-#: pg_basebackup.c:1211
+#: pg_basebackup.c:1623
 #, c-format
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s: 子スレッドがエラー%uで終了しました\n"
 
-#: pg_basebackup.c:1292
+#: pg_basebackup.c:1709
 #, c-format
 msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
 msgstr "%s: \"%s\"出力フォーマットは無効です。\"plain\"か\"tar\"でなければなりません\n"
 
-#: pg_basebackup.c:1301 pg_basebackup.c:1313
+#: pg_basebackup.c:1721 pg_basebackup.c:1733
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s: --xlogと--xlog-methodは同時には指定できません\n"
 
-#: pg_basebackup.c:1328
+#: pg_basebackup.c:1748
 #, c-format
-msgid "%s: invalid xlog-method option \"%s\", must be empty, \"fetch\", or \"stream\"\n"
-msgstr "%s: \"%s\" xlog方式は無効です。空か\"fetch\"、\"stream\"のいずれかでなければなりません\n"
+#| msgid "%s: invalid xlog-method option \"%s\", must be empty, \"fetch\", or \"stream\"\n"
+msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
+msgstr "%s: \"%s\" xlog方式は無効です。\"fetch\"、\"stream\"のいずれかでなければなりません\n"
 
-#: pg_basebackup.c:1347
+#: pg_basebackup.c:1767
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: \"%s\"圧縮レベルは無効です\n"
 
-#: pg_basebackup.c:1359
+#: pg_basebackup.c:1779
 #, c-format
 msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
 msgstr "%s: \"%s\"チェックポイント引数は無効です。\"fast\"または\"spreadでなければなりません\n"
 
-#: pg_basebackup.c:1383 pg_receivexlog.c:370
+#: pg_basebackup.c:1806 pg_receivexlog.c:392
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
 msgstr "%s: \"%s\" 状態間隔は無効です\n"
 
-#: pg_basebackup.c:1399 pg_basebackup.c:1413 pg_basebackup.c:1424
-#: pg_basebackup.c:1437 pg_basebackup.c:1447 pg_receivexlog.c:386
-#: pg_receivexlog.c:400 pg_receivexlog.c:411
+#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
+#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
+#: pg_receivexlog.c:422 pg_receivexlog.c:433
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "詳細については\"%s --help\"を実行してください。\n"
 
-#: pg_basebackup.c:1411 pg_receivexlog.c:398
+#: pg_basebackup.c:1834 pg_receivexlog.c:420
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: コマンドライン引数が多過ぎます(最初は\"%s\"です)\n"
 
-#: pg_basebackup.c:1423 pg_receivexlog.c:410
+#: pg_basebackup.c:1846 pg_receivexlog.c:432
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: 対象ディレクトリが指定されていません\n"
 
-#: pg_basebackup.c:1435
+#: pg_basebackup.c:1858
 #, c-format
 msgid "%s: only tar mode backups can be compressed\n"
 msgstr "%s: tarモードのバックアップのみ圧縮することができます\n"
 
-#: pg_basebackup.c:1445
+#: pg_basebackup.c:1868
 #, c-format
-msgid "%s: wal streaming can only be used in plain mode\n"
+#| msgid "%s: wal streaming can only be used in plain mode\n"
+msgid "%s: WAL streaming can only be used in plain mode\n"
 msgstr "%s: WALストリーミングはプレインモードでのみ使用することができます。\n"
 
-#: pg_basebackup.c:1456
+#: pg_basebackup.c:1879
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: この構築では圧縮をサポートしていません\n"
 
-#: pg_receivexlog.c:57
+#: pg_receivexlog.c:51
 #, c-format
 msgid ""
 "%s receives PostgreSQL streaming transaction logs.\n"
 "\n"
-msgstr "%sはPostgreSQLのトランザクションログストリーミングを受信します。\n\n"
+msgstr ""
+"%sはPostgreSQLのトランザクションログストリーミングを受信します。\n"
+"\n"
 
-#: pg_receivexlog.c:61
+#: pg_receivexlog.c:55
 #, c-format
 msgid ""
 "\n"
@@ -497,196 +550,260 @@ msgstr ""
 "\n"
 "オプション:\n"
 
-#: pg_receivexlog.c:62
+#: pg_receivexlog.c:56
 #, c-format
 msgid "  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr "  -D, --xlogdir=XLOGDIR     受信したトランザクションログの格納ディレクトリ\n"
 
-#: pg_receivexlog.c:63
+#: pg_receivexlog.c:57
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop            接続がなくなった時に繰り返さない\n"
 
-#: pg_receivexlog.c:82
+#: pg_receivexlog.c:81
 #, c-format
 msgid "%s: finished segment at %X/%X (timeline %u)\n"
 msgstr "%s: %X/%X (タイムライン %u)でセグメントが完了\n"
 
-#: pg_receivexlog.c:87
+#: pg_receivexlog.c:94
+#, c-format
+msgid "%s: switched to timeline %u at %X/%X\n"
+msgstr "%s: タイムライン%uに%X/%Xで切り替わりました\n"
+
+#: pg_receivexlog.c:103
 #, c-format
-msgid "%s: received interrupt signal, exiting.\n"
-msgstr "%s: 割り込みシグナルを受け取りました。終了します。\n"
+#| msgid "%s: received interrupt signal, exiting.\n"
+msgid "%s: received interrupt signal, exiting\n"
+msgstr "%s: 割り込みシグナルを受け取りました。終了します\n"
 
-#: pg_receivexlog.c:114
+#: pg_receivexlog.c:128
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: ディレクトリ\"%s\"をオープンできませんでした: %s\n"
 
-#: pg_receivexlog.c:155
+#: pg_receivexlog.c:157
 #, c-format
 msgid "%s: could not parse transaction log file name \"%s\"\n"
 msgstr "%s: トランザクションログファイル名\"%s\"を解析できませんでした\n"
 
-#: pg_receivexlog.c:168
+#: pg_receivexlog.c:167
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: \"%s\"ファイルの状態を確認できませんでした: %s\n"
 
-#: pg_receivexlog.c:187
+#: pg_receivexlog.c:185
 #, c-format
 msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
 msgstr "%s: セグメントファイル\"%s\"のサイズ%dが不正です。飛ばします\n"
 
-#: pg_receivexlog.c:277
+#: pg_receivexlog.c:293
 #, c-format
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s: %X/%X (タイムライン %u)でログストリーミングを始めます\n"
 
-#: pg_receivexlog.c:351
+#: pg_receivexlog.c:373
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
 msgstr "%s: 無効なポート番号です: \"%s\"\n"
 
-#: pg_receivexlog.c:433
+#: pg_receivexlog.c:455
 #, c-format
-msgid "%s: disconnected.\n"
-msgstr "%s: 切断しました。\n"
+#| msgid "%s: disconnected.\n"
+msgid "%s: disconnected\n"
+msgstr "%s: 切断しました\n"
 
-#: pg_receivexlog.c:439
+#. translator: check source for value for %d
+#: pg_receivexlog.c:462
 #, c-format
-msgid "%s: disconnected. Waiting %d seconds to try again\n"
+#| msgid "%s: disconnected. Waiting %d seconds to try again\n"
+msgid "%s: disconnected; waiting %d seconds to try again\n"
 msgstr "%s: 切断しました。%d秒待機し再試行します\n"
 
-#: receivelog.c:72
+#: receivelog.c:69
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
 msgstr "%s: トランザクションログファイル \"%s\" をオープンできません: %s\n"
 
-#: receivelog.c:84
+#: receivelog.c:81
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr "%s: トランザクションログファイル \"%s\" の状態を確認できません: %s\n"
 
-#: receivelog.c:94
+#: receivelog.c:95
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr "%s: トランザクションログファイル\"%s\"は%dバイトです。0または%dでなければなりません\n"
 
-#: receivelog.c:107
+#: receivelog.c:108
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
 msgstr "%s: トランザクションログファイル\"%s\"を埋めることができませんでした: %s\n"
 
-#: receivelog.c:120
+#: receivelog.c:121
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
 msgstr "%s: トランザクションログファイル\"%s\"の先頭にシークできませんでした: %s\n"
 
-#: receivelog.c:143
+#: receivelog.c:147
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
 msgstr "%s: ファイル\"%s\"のシーク位置を決定できませんでした: %s\n"
 
-#: receivelog.c:150
+#: receivelog.c:154 receivelog.c:344
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: ファイル\"%s\"をfsyncできませんでした: %s\n"
 
-#: receivelog.c:177
+#: receivelog.c:181
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
 msgstr "%s: \"%s\"ファイルの名前を変更できませんでした: %s\n"
 
-#: receivelog.c:184
+#: receivelog.c:188
+#, c-format
+#| msgid "%s: not renaming \"%s\", segment is not complete.\n"
+msgid "%s: not renaming \"%s%s\", segment is not complete\n"
+msgstr "%s: \"%s%s\"の名前を変更しません。セグメントが完了していません。\n"
+
+#: receivelog.c:277
+#, c-format
+#| msgid "%s: could not open log file \"%s\": %s\n"
+msgid "%s: could not open timeline history file \"%s\": %s\n"
+msgstr "%s: タイムライン履歴ファイル \"%s\" をオープンできません: %s\n"
+
+#: receivelog.c:304
 #, c-format
-msgid "%s: not renaming \"%s\", segment is not complete.\n"
-msgstr "%s: \"%s\"の名前を変更しません。セグメントが完了していません。\n"
+msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
+msgstr "%s: サーバはライムライン%u用の履歴ファイルが想定外であることを報告しました: %s\n"
 
 #: receivelog.c:319
 #, c-format
-msgid "%s: system identifier does not match between base backup and streaming connection\n"
-msgstr "%s: システム識別子がベースバックアップとストリーミング接続の間で一致しません\n"
+#| msgid "%s: could not create file \"%s\": %s\n"
+msgid "%s: could not create timeline history file \"%s\": %s\n"
+msgstr "%s: \"%s\"タイムライン履歴ファイルを作成することができませんでした: %s\n"
+
+#: receivelog.c:336
+#, c-format
+#| msgid "%s: could not write to file \"%s\": %s\n"
+msgid "%s: could not write timeline history file \"%s\": %s\n"
+msgstr "%s: \"%s\"タイムライン履歴ファイルに書き出すことができませんでした: %s\n"
 
-#: receivelog.c:327
+#: receivelog.c:363
 #, c-format
-msgid "%s: timeline does not match between base backup and streaming connection\n"
-msgstr "%s: タイムラインがベースバックアップとストリーミング接続の間で一致しません\n"
+#| msgid "could not rename file \"%s\" to \"%s\": %m"
+msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
+msgstr "%s: ファイル\"%s\"の名前を\"%s\"に変更できませんでした: %s\n"
 
-#: receivelog.c:398
+#: receivelog.c:436
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s: フィードバックパケットを送信できませんでした: %s"
 
-#: receivelog.c:449
+#: receivelog.c:470
 #, c-format
-msgid "%s: select() failed: %s\n"
-msgstr "%s: select()が失敗しました: %s\n"
+#| msgid "No per-database role settings support in this server version.\n"
+msgid "%s: incompatible server version %s; streaming is only supported with server version %s\n"
+msgstr "%s: 互換性がないサーババージョン%s。ストリーミングはサーババージョン%sでのみサポートされています\n"
 
-#: receivelog.c:457
+#: receivelog.c:548
 #, c-format
-msgid "%s: could not receive data from WAL stream: %s"
-msgstr "%s: WALストリームからデータを受信できませんでした: %s"
+msgid "%s: system identifier does not match between base backup and streaming connection\n"
+msgstr "%s: システム識別子がベースバックアップとストリーミング接続の間で一致しません\n"
 
-#: receivelog.c:481
+#: receivelog.c:556
 #, c-format
-msgid "%s: keepalive message has incorrect size %d\n"
-msgstr "%s: キープアライブメッセージのサイズ%dが不正です\n"
+msgid "%s: starting timeline %u is not present in the server\n"
+msgstr "%s: 開始するタイムライン%uがサーバ上に存在しません\n"
 
-#: receivelog.c:489
+#: receivelog.c:590
 #, c-format
-msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s: ストリーミングヘッダ\"%c\"は不明です\n"
+#| msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
+msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
+msgstr "%s: TIMELINE_HISTORYコマンドへの想定外の応答: %d行と%dフィールドを入手しました。想定では%d行と%dフィールドでした\n"
+
+#: receivelog.c:663
+#, c-format
+msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
+msgstr "%1$s: サーバがタイムライン%3$uに続く次のタイムライン%2$uが想定外であることを報告しました\n"
+
+#: receivelog.c:670
+#, c-format
+msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
+msgstr "%s: サーバはストリーミングタイムライン%uを%X%Xで停止しました。しかし次のタイムライン%uが%X%Xで始まりました\n"
+
+#: receivelog.c:682 receivelog.c:717
+#, c-format
+msgid "%s: unexpected termination of replication stream: %s"
+msgstr "%s: レプリケーションストリームの想定外の終了: %s"
+
+#: receivelog.c:708
+#, c-format
+msgid "%s: replication stream was terminated before stop point\n"
+msgstr "%s: レプリケーションストリームがストップポイントの前に終了しました\n"
+
+#: receivelog.c:756
+#, c-format
+#| msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
+msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
+msgstr "%s: タイムラインの終了後の想定外の結果セット: %d行、%dフィールドを入手しましたが、想定していたのは%d行、%dフィールドでした\n"
+
+#: receivelog.c:766
+#, c-format
+#| msgid "%s: could not parse transaction log location \"%s\"\n"
+msgid "%s: could not parse next timeline's starting point \"%s\"\n"
+msgstr "%s: 次のタイムラインの開始ポイント\"%s\"を解析できませんでした\n"
 
-#: receivelog.c:495
+#: receivelog.c:821 receivelog.c:923 receivelog.c:1088
+#, c-format
+#| msgid "%s: could not send feedback packet: %s"
+msgid "%s: could not send copy-end packet: %s"
+msgstr "%s: コピーエンドパケットを送信できませんでした: %s"
+
+#: receivelog.c:888
+#, c-format
+msgid "%s: select() failed: %s\n"
+msgstr "%s: select()が失敗しました: %s\n"
+
+#: receivelog.c:896
+#, c-format
+msgid "%s: could not receive data from WAL stream: %s"
+msgstr "%s: WALストリームからデータを受信できませんでした: %s"
+
+#: receivelog.c:960 receivelog.c:995
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s: ストリーミングヘッダが小さ過ぎます: %d\n"
 
-#: receivelog.c:514
+#: receivelog.c:1014
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr "%s: ファイルオープンがないオフセット%uに対するトランザクションログレコードを受信\n"
 
-#: receivelog.c:526
+#: receivelog.c:1026
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
 msgstr "%s: WALデータオフセット%08xを入手。想定値は%08x\n"
 
-#: receivelog.c:562
+#: receivelog.c:1063
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
 msgstr "%1$s: WALファイル\"%3$s\"に%2$uバイト書き出すことができませんでした: %4$s\n"
 
-#: receivelog.c:608
-#, c-format
-msgid "%s: unexpected termination of replication stream: %s"
-msgstr "%s: レプリケーションストリームの想定外の終了: %s"
-
-#: receivelog.c:617
-#, c-format
-msgid "%s: replication stream was terminated before stop point\n"
-msgstr "%s: レプリケーションストリームがストップポイントの前に終了しました\n"
-
-#: receivelog.c:625 receivelog.c:634
-#, c-format
-msgid "%s: could not close file %s: %s\n"
-msgstr "%s: ファイル%sを閉じることができませんでした: %s\n"
-
-#: streamutil.c:46 streamutil.c:60
+#: receivelog.c:1101
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: メモリ不足です\n"
+msgid "%s: unrecognized streaming header: \"%c\"\n"
+msgstr "%s: ストリーミングヘッダ\"%c\"は不明です\n"
 
-#: streamutil.c:139
+#: streamutil.c:135
 msgid "Password: "
 msgstr "パスワード: "
 
-#: streamutil.c:152
+#: streamutil.c:148
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s: サーバに接続できませんでした\n"
 
-#: streamutil.c:168
+#: streamutil.c:164
 #, c-format
 msgid "%s: could not connect to server: %s\n"
 msgstr "%s: サーバに接続できませんでした: %s\n"
@@ -701,8 +818,20 @@ msgstr "%s: integer_datetimesのサーバ設定を決定できませんでした
 msgid "%s: integer_datetimes compile flag does not match server\n"
 msgstr "%s: integer_datetimesコンパイルフラグがサーバと一致しません\n"
 
+#~ msgid "  --help                   show this help, then exit\n"
+#~ msgstr "  --help                   このヘルプを表示し終了します\n"
+
 #~ msgid "  --version                output version information, then exit\n"
 #~ msgstr "  --version                バージョン情報を出力し終了します\n"
 
-#~ msgid "  --help                   show this help, then exit\n"
-#~ msgstr "  --help                   このヘルプを表示し終了します\n"
+#~ msgid "%s: could not close file %s: %s\n"
+#~ msgstr "%s: ファイル%sを閉じることができませんでした: %s\n"
+
+#~ msgid "%s: no start point returned from server\n"
+#~ msgstr "%s: サーバからスタートポイントが返りませんでした\n"
+
+#~ msgid "%s: keepalive message has incorrect size %d\n"
+#~ msgstr "%s: キープアライブメッセージのサイズ%dが不正です\n"
+
+#~ msgid "%s: timeline does not match between base backup and streaming connection\n"
+#~ msgstr "%s: タイムラインがベースバックアップとストリーミング接続の間で一致しません\n"
diff --git a/src/bin/pg_basebackup/po/pt_BR.po b/src/bin/pg_basebackup/po/pt_BR.po
index 4839622784b..eb96f90f9b7 100644
--- a/src/bin/pg_basebackup/po/pt_BR.po
+++ b/src/bin/pg_basebackup/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2012-09-02 22:43-0300\n"
+"POT-Creation-Date: 2013-08-17 15:45-0300\n"
 "PO-Revision-Date: 2011-08-20 23:33-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -73,7 +73,7 @@ msgid ""
 "                         write recovery.conf after backup\n"
 msgstr ""
 "  -R, --write-recovery-conf\n"
-"                          escreve recovery.conf após cópia de segurança\n"
+"                         escreve recovery.conf após cópia de segurança\n"
 
 #: pg_basebackup.c:115
 #, c-format
@@ -204,8 +204,8 @@ msgstr ""
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s: não pôde ler do pipe: %s\n"
 
-#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1518
-#: pg_receivexlog.c:264
+#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
+#: pg_receivexlog.c:266
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
 msgstr "%s: não pôde validar local do log de transação \"%s\"\n"
@@ -266,7 +266,7 @@ msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespaces"
 msgid "%s: could not write to compressed file \"%s\": %s\n"
 msgstr "%s: não pôde escrever no arquivo comprimido \"%s\": %s\n"
 
-#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1212
+#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
 #, c-format
 msgid "%s: could not write to file \"%s\": %s\n"
 msgstr "%s: não pôde escrever no arquivo \"%s\": %s\n"
@@ -281,7 +281,7 @@ msgstr "%s: não pôde definir nível de compressão %d: %s\n"
 msgid "%s: could not create compressed file \"%s\": %s\n"
 msgstr "%s: não pôde criar arquivo comprimido \"%s\": %s\n"
 
-#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1205
+#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
 msgstr "%s: não pôde criar arquivo \"%s\": %s\n"
@@ -296,12 +296,12 @@ msgstr "%s: não pôde obter fluxo de dados do COPY: %s"
 msgid "%s: could not close compressed file \"%s\": %s\n"
 msgstr "%s: não pôde fechar arquivo comprimido \"%s\": %s\n"
 
-#: pg_basebackup.c:720 receivelog.c:158 receivelog.c:346 receivelog.c:701
+#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:351 receivelog.c:725
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
 msgstr "%s: não pôde fechar arquivo \"%s\": %s\n"
 
-#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:861
+#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:938
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: não pôde ler dados do COPY: %s"
@@ -346,181 +346,181 @@ msgstr "%s: não pôde definir permissões no arquivo \"%s\": %s\n"
 msgid "%s: COPY stream ended before last file was finished\n"
 msgstr "%s: fluxo do COPY terminou antes que o último arquivo estivesse completo\n"
 
-#: pg_basebackup.c:1119 pg_basebackup.c:1137 pg_basebackup.c:1144
-#: pg_basebackup.c:1182
+#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
+#: pg_basebackup.c:1257
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memória\n"
 
-#: pg_basebackup.c:1255
+#: pg_basebackup.c:1333
 #, c-format
 msgid "%s: incompatible server version %s\n"
 msgstr "%s: versão do servidor %s é incompatível\n"
 
-#: pg_basebackup.c:1282 pg_basebackup.c:1311 pg_receivexlog.c:249
-#: receivelog.c:526 receivelog.c:571 receivelog.c:610
+#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:251
+#: receivelog.c:532 receivelog.c:577 receivelog.c:616
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
 msgstr "%s: não pôde enviar comando de replicação \"%s\": %s"
 
-#: pg_basebackup.c:1289 pg_receivexlog.c:256 receivelog.c:534
+#: pg_basebackup.c:1367 pg_receivexlog.c:258 receivelog.c:540
 #, c-format
 msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: não pôde identificar sistema: recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
 
-#: pg_basebackup.c:1322
+#: pg_basebackup.c:1400
 #, c-format
 msgid "%s: could not initiate base backup: %s"
 msgstr "%s: não pôde inicializar cópia de segurança base: %s"
 
-#: pg_basebackup.c:1329
+#: pg_basebackup.c:1407
 #, c-format
 msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: servidor retornou resposta inesperada para comando BASE_BACKUP; recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
 
-#: pg_basebackup.c:1347
+#: pg_basebackup.c:1427
 #, c-format
 msgid "transaction log start point: %s on timeline %u\n"
 msgstr "ponto de início do log de transação: %s na linha do tempo %u\n"
 
-#: pg_basebackup.c:1356
+#: pg_basebackup.c:1436
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: não pôde obter cabeçalho da cópia de segurança: %s"
 
-#: pg_basebackup.c:1362
+#: pg_basebackup.c:1442
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: nenhum dado foi retornado do servidor\n"
 
-#: pg_basebackup.c:1391
+#: pg_basebackup.c:1471
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
 msgstr "%s: só pode escrever uma tablespace para saída padrão, banco de dados tem %d\n"
 
-#: pg_basebackup.c:1403
+#: pg_basebackup.c:1483
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s: iniciando receptor do WAL em segundo plano\n"
 
-#: pg_basebackup.c:1433
+#: pg_basebackup.c:1513
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr "%s: não pôde obter posição final do log de transação do servidor: %s"
 
-#: pg_basebackup.c:1440
+#: pg_basebackup.c:1520
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
 msgstr "%s: nenhuma posição final do log de transação foi retornada do servidor\n"
 
-#: pg_basebackup.c:1452
+#: pg_basebackup.c:1532
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: recepção final falhou: %s"
 
-#: pg_basebackup.c:1470
+#: pg_basebackup.c:1550
 #, c-format
 msgid "%s: waiting for background process to finish streaming ...\n"
-msgstr "%s: esperando processo em segundo plano terminar o fluxo ...\n"
+msgstr "%s: esperando processo em segundo plano terminar o envio ...\n"
 
-#: pg_basebackup.c:1476
+#: pg_basebackup.c:1556
 #, c-format
 msgid "%s: could not send command to background pipe: %s\n"
 msgstr "%s: não pôde enviar comando para pipe em segundo plano: %s\n"
 
-#: pg_basebackup.c:1485
+#: pg_basebackup.c:1565
 #, c-format
 msgid "%s: could not wait for child process: %s\n"
 msgstr "%s: não pôde esperar por processo filho: %s\n"
 
-#: pg_basebackup.c:1491
+#: pg_basebackup.c:1571
 #, c-format
 msgid "%s: child %d died, expected %d\n"
 msgstr "%s: processo filho %d morreu, esperado %d\n"
 
-#: pg_basebackup.c:1497
+#: pg_basebackup.c:1577
 #, c-format
 msgid "%s: child process did not exit normally\n"
 msgstr "%s: processo filho não terminou normalmente\n"
 
-#: pg_basebackup.c:1503
+#: pg_basebackup.c:1583
 #, c-format
 msgid "%s: child process exited with error %d\n"
 msgstr "%s: processo filho terminou com código de saída %d\n"
 
-#: pg_basebackup.c:1530
+#: pg_basebackup.c:1610
 #, c-format
 msgid "%s: could not wait for child thread: %s\n"
 msgstr "%s: não pôde esperar por thread filho: %s\n"
 
-#: pg_basebackup.c:1537
+#: pg_basebackup.c:1617
 #, c-format
 msgid "%s: could not get child thread exit status: %s\n"
 msgstr "%s: não pôde obter status de saída de thread filho: %s\n"
 
-#: pg_basebackup.c:1543
+#: pg_basebackup.c:1623
 #, c-format
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s: thread filho terminou com erro %u\n"
 
-#: pg_basebackup.c:1629
+#: pg_basebackup.c:1709
 #, c-format
 msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
 msgstr "%s: formato de saída \"%s\" é inválido, deve ser \"plain\" ou \"tar\"\n"
 
-#: pg_basebackup.c:1641 pg_basebackup.c:1653
+#: pg_basebackup.c:1721 pg_basebackup.c:1733
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s: não pode especificar ambas opções --xlog e --xlog-method\n"
 
-#: pg_basebackup.c:1668
+#: pg_basebackup.c:1748
 #, c-format
 msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
 msgstr "%s: opção de xlog-method \"%s\" é inválida, deve ser \"fetch\" ou \"stream\"\n"
 
-#: pg_basebackup.c:1687
+#: pg_basebackup.c:1767
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: nível de compressão \"%s\" é inválido\n"
 
-#: pg_basebackup.c:1699
+#: pg_basebackup.c:1779
 #, c-format
 msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
 msgstr "%s: argumento de ponto de controle \"%s\" é inválido, deve ser \"fast\" ou \"spread\"\n"
 
-#: pg_basebackup.c:1726 pg_receivexlog.c:390
+#: pg_basebackup.c:1806 pg_receivexlog.c:392
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
 msgstr "%s: intervalo do status \"%s\" é inválido\n"
 
-#: pg_basebackup.c:1742 pg_basebackup.c:1756 pg_basebackup.c:1767
-#: pg_basebackup.c:1780 pg_basebackup.c:1790 pg_receivexlog.c:406
-#: pg_receivexlog.c:420 pg_receivexlog.c:431
+#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
+#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
+#: pg_receivexlog.c:422 pg_receivexlog.c:433
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: pg_basebackup.c:1754 pg_receivexlog.c:418
+#: pg_basebackup.c:1834 pg_receivexlog.c:420
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: muitos argumentos de linha de comando (primeiro é \"%s\")\n"
 
-#: pg_basebackup.c:1766 pg_receivexlog.c:430
+#: pg_basebackup.c:1846 pg_receivexlog.c:432
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: nenhum diretório de destino foi especificado\n"
 
-#: pg_basebackup.c:1778
+#: pg_basebackup.c:1858
 #, c-format
 msgid "%s: only tar mode backups can be compressed\n"
 msgstr "%s: somente cópias de segurança com modo tar podem ser comprimidas\n"
 
-#: pg_basebackup.c:1788
+#: pg_basebackup.c:1868
 #, c-format
 msgid "%s: WAL streaming can only be used in plain mode\n"
-msgstr "%s: fluxo do WAL só pode ser utilizado em modo plain\n"
+msgstr "%s: envio do WAL só pode ser utilizado em modo plain\n"
 
-#: pg_basebackup.c:1799
+#: pg_basebackup.c:1879
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: esse programa binário não suporta compressão\n"
@@ -558,222 +558,242 @@ msgstr "  -n, --no-loop          não tentar novamente ao perder a conexão\n"
 msgid "%s: finished segment at %X/%X (timeline %u)\n"
 msgstr "%s: terminou o segmento em %X/%X (linha do tempo %u)\n"
 
-#: pg_receivexlog.c:92
+#: pg_receivexlog.c:94
 #, c-format
 msgid "%s: switched to timeline %u at %X/%X\n"
 msgstr "%s: passou para linha do tempo %u em %X/%X\n"
 
-#: pg_receivexlog.c:101
+#: pg_receivexlog.c:103
 #, c-format
 msgid "%s: received interrupt signal, exiting\n"
 msgstr "%s: recebeu sinal de interrupção, terminando\n"
 
-#: pg_receivexlog.c:126
+#: pg_receivexlog.c:128
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: não pôde abrir diretório \"%s\": %s\n"
 
-#: pg_receivexlog.c:155
+#: pg_receivexlog.c:157
 #, c-format
 msgid "%s: could not parse transaction log file name \"%s\"\n"
 msgstr "%s: não pôde validar nome do arquivo de log de transação \"%s\"\n"
 
-#: pg_receivexlog.c:165
+#: pg_receivexlog.c:167
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: não pôde executar stat no arquivo \"%s\": %s\n"
 
-#: pg_receivexlog.c:183
+#: pg_receivexlog.c:185
 #, c-format
 msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
 msgstr "%s: arquivo de segmento \"%s\" tem tamanho incorreto %d, ignorando\n"
 
-#: pg_receivexlog.c:291
+#: pg_receivexlog.c:293
 #, c-format
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s: iniciando fluxo de log em %X/%X (linha do tempo %u)\n"
 
-#: pg_receivexlog.c:371
+#: pg_receivexlog.c:373
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
 msgstr "%s: número de porta inválido: \"%s\"\n"
 
-#: pg_receivexlog.c:453
+#: pg_receivexlog.c:455
 #, c-format
 msgid "%s: disconnected\n"
 msgstr "%s: desconectado\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:460
+#: pg_receivexlog.c:462
 #, c-format
 msgid "%s: disconnected; waiting %d seconds to try again\n"
 msgstr "%s: desconectado; esperando %d segundos para tentar novamente\n"
 
-#: receivelog.c:66
+#: receivelog.c:69
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:78
+#: receivelog.c:81
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde executar stat no arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:92
+#: receivelog.c:95
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr "%s: arquivo de log de transação \"%s\" tem %d bytes, deveria ser 0 ou %d\n"
 
-#: receivelog.c:105
+#: receivelog.c:108
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde preencher arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:118
+#: receivelog.c:121
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde buscar início do arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:144
+#: receivelog.c:147
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
 msgstr "%s: não pôde determinar posição de busca no arquivo \"%s\": %s\n"
 
-#: receivelog.c:151 receivelog.c:339
+#: receivelog.c:154 receivelog.c:344
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: não pôde executar fsync no arquivo \"%s\": %s\n"
 
-#: receivelog.c:178
+#: receivelog.c:181
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
 msgstr "%s: não pôde renomear arquivo \"%s\": %s\n"
 
-#: receivelog.c:185
+#: receivelog.c:188
 #, c-format
 msgid "%s: not renaming \"%s%s\", segment is not complete\n"
 msgstr "%s: não renomeará \"%s%s\", segmento não está completo\n"
 
-#: receivelog.c:274
+#: receivelog.c:277
 #, c-format
-msgid "%s: could not open timeline history file \"%s\": %s"
-msgstr "%s: não pôde abrir arquivo de histórico da linha do tempo \"%s\": %s"
+msgid "%s: could not open timeline history file \"%s\": %s\n"
+msgstr "%s: não pôde abrir arquivo de histórico da linha do tempo \"%s\": %s\n"
 
-#: receivelog.c:301
+#: receivelog.c:304
 #, c-format
-msgid "%s: server reported unexpected history file name for timeline %u: %s"
-msgstr "%s: servidor relatou nome de arquivo de histórico inesperado para linha do tempo %u: %s"
+msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
+msgstr "%s: servidor relatou nome de arquivo de histórico inesperado para linha do tempo %u: %s\n"
 
-#: receivelog.c:316
+#: receivelog.c:319
 #, c-format
 msgid "%s: could not create timeline history file \"%s\": %s\n"
 msgstr "%s: não pôde criar arquivo de histórico da linha do tempo \"%s\": %s\n"
 
-#: receivelog.c:332
+#: receivelog.c:336
 #, c-format
 msgid "%s: could not write timeline history file \"%s\": %s\n"
 msgstr "%s: não pôde escrever no arquivo de histórico da linha do tempo \"%s\": %s\n"
 
-#: receivelog.c:358
+#: receivelog.c:363
 #, c-format
 msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
 msgstr "%s: não pôde renomear arquivo \"%s\" para \"%s\": %s\n"
 
-#: receivelog.c:431
+#: receivelog.c:436
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s: não pôde enviar pacote de retorno: %s"
 
-#: receivelog.c:464
+#: receivelog.c:470
 #, c-format
 msgid "%s: incompatible server version %s; streaming is only supported with server version %s\n"
 msgstr "%s: versão do servidor %s é incompatível; fluxo somente é suportado com versão do servidor %s\n"
 
-#: receivelog.c:542
+#: receivelog.c:548
 #, c-format
 msgid "%s: system identifier does not match between base backup and streaming connection\n"
 msgstr "%s: identificador do sistema não corresponde entre cópia base e conexão de envio do WAL\n"
 
-#: receivelog.c:550
+#: receivelog.c:556
 #, c-format
 msgid "%s: starting timeline %u is not present in the server\n"
 msgstr "%s: linha do tempo inicial %u não está presente no servidor\n"
 
-#: receivelog.c:584
+#: receivelog.c:590
 #, c-format
 msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: resposta inesperada para comando TIMELINE_HISTORY: recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
 
-#: receivelog.c:658 receivelog.c:693
+#: receivelog.c:663
+#, c-format
+msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
+msgstr "%s: servidor relatou próxima linha do tempo %u inesperada, seguindo linha do tempo %u\n"
+
+#: receivelog.c:670
+#, c-format
+msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
+msgstr "%s: servidor parou de enviar linha do tempo %u em %X/%X, mas relatou próxima linha do tempo %u começando em %X/%X\n"
+
+#: receivelog.c:682 receivelog.c:717
 #, c-format
 msgid "%s: unexpected termination of replication stream: %s"
 msgstr "%s: término inesperado do fluxo de replicação: %s"
 
-#: receivelog.c:684
+#: receivelog.c:708
 #, c-format
 msgid "%s: replication stream was terminated before stop point\n"
 msgstr "%s: fluxo de replicação foi terminado antes do ponto de parada\n"
 
-#: receivelog.c:752 receivelog.c:848 receivelog.c:1011
+#: receivelog.c:756
+#, c-format
+msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
+msgstr "%s: conjunto de resultados inesperado após fim da linha do tempo: recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
+
+#: receivelog.c:766
+#, c-format
+msgid "%s: could not parse next timeline's starting point \"%s\"\n"
+msgstr "%s: não pôde validar ponto de partida da próxima linha do tempo \"%s\"\n"
+
+#: receivelog.c:821 receivelog.c:923 receivelog.c:1088
 #, c-format
 msgid "%s: could not send copy-end packet: %s"
 msgstr "%s: não pôde enviar pacote indicando fim de cópia: %s"
 
-#: receivelog.c:819
+#: receivelog.c:888
 #, c-format
 msgid "%s: select() failed: %s\n"
 msgstr "%s: select() falhou: %s\n"
 
-#: receivelog.c:827
+#: receivelog.c:896
 #, c-format
 msgid "%s: could not receive data from WAL stream: %s"
 msgstr "%s: não pôde receber dados do fluxo do WAL: %s"
 
-#: receivelog.c:883 receivelog.c:918
+#: receivelog.c:960 receivelog.c:995
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s: cabeçalho de fluxo muito pequeno: %d\n"
 
-#: receivelog.c:937
+#: receivelog.c:1014
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr "%s: recebeu registro do log de transação para posição %u sem um arquivo aberto\n"
 
-#: receivelog.c:949
+#: receivelog.c:1026
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
 msgstr "%s: recebeu dados do WAL da posição %08x, esperada %08x\n"
 
-#: receivelog.c:986
+#: receivelog.c:1063
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
 msgstr "%s: não pôde escrever %u bytes no arquivo do WAL \"%s\": %s\n"
 
-#: receivelog.c:1024
+#: receivelog.c:1101
 #, c-format
 msgid "%s: unrecognized streaming header: \"%c\"\n"
 msgstr "%s: cabeçalho de fluxo desconhecido: \"%c\"\n"
 
-#: streamutil.c:136
+#: streamutil.c:135
 msgid "Password: "
 msgstr "Senha: "
 
-#: streamutil.c:149
+#: streamutil.c:148
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s: não pôde se conectar ao servidor\n"
 
-#: streamutil.c:165
+#: streamutil.c:164
 #, c-format
 msgid "%s: could not connect to server: %s\n"
 msgstr "%s: não pôde se conectar ao servidor: %s\n"
 
-#: streamutil.c:189
+#: streamutil.c:188
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
 msgstr "%s: não pôde determinar valor do parâmetro integer_datetimes do servidor\n"
 
-#: streamutil.c:202
+#: streamutil.c:201
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
 msgstr "%s: opção de compilação integer_datetimes não corresponde com a do servidor\n"