summaryrefslogtreecommitdiff
path: root/src/bin/pg_rewind
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2017-05-15 12:19:54 -0400
committerPeter Eisentraut <peter_e@gmx.net>2017-05-15 12:19:54 -0400
commit82d24bab75d4f85ae7a6d89f149d29fbb2ccbc70 (patch)
tree043805b423a9e32a4a045bb98405259a17321951 /src/bin/pg_rewind
parent4b99d32b2b0de97063b85a0ea69d482d8a4bf075 (diff)
Translation updates
Source-Git-URL: git://git.postgresql.org/git/pgtranslation/messages.git Source-Git-Hash: 398beeef4921df0956f917becd7b5669d2a8a5c4
Diffstat (limited to 'src/bin/pg_rewind')
-rw-r--r--src/bin/pg_rewind/nls.mk2
-rw-r--r--src/bin/pg_rewind/po/de.po245
-rw-r--r--src/bin/pg_rewind/po/fr.po163
-rw-r--r--src/bin/pg_rewind/po/ja.po850
-rw-r--r--src/bin/pg_rewind/po/ko.po248
-rw-r--r--src/bin/pg_rewind/po/pl.po304
-rw-r--r--src/bin/pg_rewind/po/pt_BR.po859
-rw-r--r--src/bin/pg_rewind/po/ru.po252
8 files changed, 2374 insertions, 549 deletions
diff --git a/src/bin/pg_rewind/nls.mk b/src/bin/pg_rewind/nls.mk
index ef2353d482c..18ee7bac8dc 100644
--- a/src/bin/pg_rewind/nls.mk
+++ b/src/bin/pg_rewind/nls.mk
@@ -1,6 +1,6 @@
# src/bin/pg_rewind/nls.mk
CATALOG_NAME = pg_rewind
-AVAIL_LANGUAGES =de es fr it ko pl ru zh_CN
+AVAIL_LANGUAGES =de es fr it ja ko pl pt_BR ru zh_CN
GETTEXT_FILES = copy_fetch.c datapagemap.c fetch.c file_ops.c filemap.c libpq_fetch.c logging.c parsexlog.c pg_rewind.c timeline.c ../../common/fe_memutils.c ../../common/restricted_token.c xlogreader.c
GETTEXT_TRIGGERS = pg_log:2 pg_fatal report_invalid_record:2
diff --git a/src/bin/pg_rewind/po/de.po b/src/bin/pg_rewind/po/de.po
index b0c81900e98..e8d5b17e634 100644
--- a/src/bin/pg_rewind/po/de.po
+++ b/src/bin/pg_rewind/po/de.po
@@ -1,14 +1,14 @@
# German message translation file for pg_rewind
-# Copyright (C) 2015-2016 PostgreSQL Global Development Group
+# Copyright (C) 2015-2017 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
-# Peter Eisentraut <peter_e@gmx.net>, 2015-2016.
+# Peter Eisentraut <peter_e@gmx.net>, 2015-2017.
#
msgid ""
msgstr ""
-"Project-Id-Version: pg_rewind (PostgreSQL) 9.6\n"
+"Project-Id-Version: pg_rewind (PostgreSQL) 10\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-06-17 17:14+0000\n"
-"PO-Revision-Date: 2016-06-17 15:16-0400\n"
+"POT-Creation-Date: 2017-05-12 23:46+0000\n"
+"PO-Revision-Date: 2017-05-12 22:57-0400\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: German <peter_e@gmx.net>\n"
"Language: de\n"
@@ -63,62 +63,62 @@ msgstr "%s: konnte Prozess nicht mit beschränktem Token neu starten: Fehlercode
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr "%s: konnte Statuscode des Subprozesses nicht ermitteln: Fehlercode %lu\n"
-#: copy_fetch.c:64
+#: copy_fetch.c:62
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "konnte Verzeichnis »%s« nicht öffnen: %s\n"
-#: copy_fetch.c:93 filemap.c:112 filemap.c:267
+#: copy_fetch.c:91 filemap.c:111 filemap.c:266
#, c-format
msgid "could not stat file \"%s\": %s\n"
msgstr "konnte »stat« für Datei »%s« nicht ausführen: %s\n"
-#: copy_fetch.c:122
+#: copy_fetch.c:120
#, c-format
msgid "could not read symbolic link \"%s\": %s\n"
msgstr "konnte symbolische Verknüpfung »%s« nicht lesen: %s\n"
-#: copy_fetch.c:125
+#: copy_fetch.c:123
#, c-format
msgid "symbolic link \"%s\" target is too long\n"
msgstr "Ziel für symbolische Verknüpfung »%s« ist zu lang\n"
-#: copy_fetch.c:140
+#: copy_fetch.c:138
#, c-format
msgid "\"%s\" is a symbolic link, but symbolic links are not supported on this platform\n"
msgstr "»%s« ist eine symbolische Verknüpfung, aber symbolische Verknüpfungen werden auf dieser Plattform nicht unterstützt\n"
-#: copy_fetch.c:147
+#: copy_fetch.c:145
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "konnte Verzeichnis »%s« nicht lesen: %s\n"
-#: copy_fetch.c:151
+#: copy_fetch.c:149
#, c-format
msgid "could not close directory \"%s\": %s\n"
msgstr "konnte Verzeichnis »%s« nicht schließen: %s\n"
-#: copy_fetch.c:171
+#: copy_fetch.c:169
#, c-format
msgid "could not open source file \"%s\": %s\n"
msgstr "konnte Quelldatei »%s« nicht öffnen: %s\n"
-#: copy_fetch.c:175
+#: copy_fetch.c:173
#, c-format
msgid "could not seek in source file: %s\n"
msgstr "konnte Positionszeiger in Quelldatei nicht setzen: %s\n"
-#: copy_fetch.c:192 file_ops.c:300
+#: copy_fetch.c:190 file_ops.c:299
#, c-format
msgid "could not read file \"%s\": %s\n"
msgstr "konnte Datei »%s« nicht lesen: %s\n"
-#: copy_fetch.c:195
+#: copy_fetch.c:193
#, c-format
msgid "unexpected EOF while reading file \"%s\"\n"
msgstr "unerwartetes EOF beim Lesen der Datei »%s«\n"
-#: copy_fetch.c:202
+#: copy_fetch.c:200
#, c-format
msgid "could not close file \"%s\": %s\n"
msgstr "konnte Datei »%s« nicht schließen: %s\n"
@@ -128,103 +128,103 @@ msgstr "konnte Datei »%s« nicht schließen: %s\n"
msgid " block %u\n"
msgstr " Block %u\n"
-#: file_ops.c:64
+#: file_ops.c:63
#, c-format
msgid "could not open target file \"%s\": %s\n"
msgstr "konnte Zieldatei »%s« nicht öffnen: %s\n"
-#: file_ops.c:78
+#: file_ops.c:77
#, c-format
msgid "could not close target file \"%s\": %s\n"
msgstr "konnte Zieldatei »%s« nicht schließen: %s\n"
-#: file_ops.c:98
+#: file_ops.c:97
#, c-format
msgid "could not seek in target file \"%s\": %s\n"
msgstr "konnte Positionszeiger in Zieldatei »%s« nicht setzen: %s\n"
-#: file_ops.c:114
+#: file_ops.c:113
#, c-format
msgid "could not write file \"%s\": %s\n"
msgstr "konnte Datei »%s« nicht schreiben: %s\n"
-#: file_ops.c:164
+#: file_ops.c:163
#, c-format
msgid "invalid action (CREATE) for regular file\n"
msgstr "ungültige Aktion (CREATE) für normale Datei\n"
-#: file_ops.c:179
+#: file_ops.c:178
#, c-format
msgid "could not remove file \"%s\": %s\n"
msgstr "konnte Datei »%s« nicht löschen: %s\n"
-#: file_ops.c:196
+#: file_ops.c:195
#, c-format
msgid "could not open file \"%s\" for truncation: %s\n"
msgstr "konnte Datei »%s« nicht zum Kürzen öffnen: %s\n"
-#: file_ops.c:200
+#: file_ops.c:199
#, c-format
msgid "could not truncate file \"%s\" to %u: %s\n"
msgstr "konnte Datei »%s« nicht auf %u kürzen: %s\n"
-#: file_ops.c:216
+#: file_ops.c:215
#, c-format
msgid "could not create directory \"%s\": %s\n"
msgstr "konnte Verzeichnis »%s« nicht erzeugen: %s\n"
-#: file_ops.c:230
+#: file_ops.c:229
#, c-format
msgid "could not remove directory \"%s\": %s\n"
msgstr "konnte Verzeichnis »%s« nicht löschen: %s\n"
-#: file_ops.c:244
+#: file_ops.c:243
#, c-format
msgid "could not create symbolic link at \"%s\": %s\n"
msgstr "konnte symbolische Verknüpfung »%s« nicht erstellen: %s\n"
-#: file_ops.c:258
+#: file_ops.c:257
#, c-format
msgid "could not remove symbolic link \"%s\": %s\n"
msgstr "konnte symbolische Verknüpfung »%s« nicht löschen: %s\n"
-#: file_ops.c:288 file_ops.c:292
+#: file_ops.c:287 file_ops.c:291
#, c-format
msgid "could not open file \"%s\" for reading: %s\n"
msgstr "konnte Datei »%s« nicht zum Lesen öffnen: %s\n"
-#: filemap.c:104
+#: filemap.c:103
#, c-format
msgid "data file \"%s\" in source is not a regular file\n"
msgstr "Datendatei »%s« in der Quelle ist keine normale Datei\n"
-#: filemap.c:126
+#: filemap.c:125
#, c-format
msgid "\"%s\" is not a directory\n"
msgstr "»%s« ist kein Verzeichnis\n"
-#: filemap.c:149
+#: filemap.c:148
#, c-format
msgid "\"%s\" is not a symbolic link\n"
msgstr "»%s« ist keine symbolische Verknüpfung\n"
-#: filemap.c:161
+#: filemap.c:160
#, c-format
msgid "\"%s\" is not a regular file\n"
msgstr "»%s« ist keine normale Datei\n"
-#: filemap.c:279
+#: filemap.c:278
#, c-format
msgid "source file list is empty\n"
msgstr "Quelldateiliste ist leer\n"
-#: filemap.c:401
+#: filemap.c:400
#, c-format
msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
msgstr "unerwartete Seitenänderung für Verzeichnis oder symbolische Verknüpfung »%s«\n"
#. translator: first %s is a file path, second is a keyword such as COPY
-#: filemap.c:537
+#: filemap.c:536
#, c-format
msgid "%s (%s)\n"
msgstr "%s (%s)\n"
@@ -249,122 +249,127 @@ msgstr "Quell-Server darf nicht im Wiederherstellungsmodus sein\n"
msgid "full_page_writes must be enabled in the source server\n"
msgstr "full_page_writes muss im Quell-Server eingeschaltet sein\n"
-#: libpq_fetch.c:95
+#: libpq_fetch.c:90
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "konnte Verbindungskontext nicht einrichten: %s"
+
+#: libpq_fetch.c:108
#, c-format
msgid "error running query (%s) in source server: %s"
msgstr "Fehler beim Ausführen einer Anfrage (%s) im Quellserver: %s"
-#: libpq_fetch.c:100
+#: libpq_fetch.c:113
#, c-format
msgid "unexpected result set from query\n"
msgstr "Anfrage ergab unerwartete Ergebnismenge\n"
-#: libpq_fetch.c:123
+#: libpq_fetch.c:136
#, c-format
msgid "unrecognized result \"%s\" for current WAL insert location\n"
msgstr "unbekanntes Ergebnis »%s« für aktuelle WAL-Einfügeposition\n"
-#: libpq_fetch.c:173
+#: libpq_fetch.c:186
#, c-format
msgid "could not fetch file list: %s"
msgstr "konnte Dateiliste nicht holen: %s"
-#: libpq_fetch.c:178
+#: libpq_fetch.c:191
#, c-format
msgid "unexpected result set while fetching file list\n"
msgstr "unerwartete Ergebnismenge beim Holen der Dateiliste\n"
-#: libpq_fetch.c:226
+#: libpq_fetch.c:239
#, c-format
msgid "could not send query: %s"
msgstr "konnte Anfrage nicht senden: %s"
-#: libpq_fetch.c:228
+#: libpq_fetch.c:241
#, c-format
msgid "getting file chunks\n"
msgstr "hole Dateistücke\n"
-#: libpq_fetch.c:231
+#: libpq_fetch.c:244
#, c-format
msgid "could not set libpq connection to single row mode\n"
msgstr "konnte libpq-Verbindung nicht in den Einzelzeilenmodus setzen\n"
-#: libpq_fetch.c:251
+#: libpq_fetch.c:264
#, c-format
msgid "unexpected result while fetching remote files: %s"
msgstr "unerwartetes Ergebnis beim Holen von fernen Dateien: %s"
-#: libpq_fetch.c:257
+#: libpq_fetch.c:270
#, c-format
msgid "unexpected result set size while fetching remote files\n"
msgstr "unerwartete Ergebnismengengröße beim Holen von fernen Dateien\n"
-#: libpq_fetch.c:263
+#: libpq_fetch.c:276
#, c-format
msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
msgstr "unerwartete Datentypen in Ergebnismenge beim Holen von fernen Dateien: %u %u %u\n"
-#: libpq_fetch.c:271
+#: libpq_fetch.c:284
#, c-format
msgid "unexpected result format while fetching remote files\n"
msgstr "unerwartetes Ergebnisformat beim Holen von fernen Dateien\n"
-#: libpq_fetch.c:277
+#: libpq_fetch.c:290
#, c-format
msgid "unexpected null values in result while fetching remote files\n"
msgstr "unerwartete NULL-Werte im Ergebnis beim Holen von fernen Dateien\n"
-#: libpq_fetch.c:281
+#: libpq_fetch.c:294
#, c-format
msgid "unexpected result length while fetching remote files\n"
msgstr "unerwartete Ergebnislänge beim Holen von fernen Dateien\n"
-#: libpq_fetch.c:303
+#: libpq_fetch.c:316
#, c-format
msgid "received null value for chunk for file \"%s\", file has been deleted\n"
msgstr "NULL-Wert für Stück von Datei »%s« empfangen, Datei wurde gelöscht\n"
-#: libpq_fetch.c:310
+#: libpq_fetch.c:323
#, c-format
msgid "received chunk for file \"%s\", offset %d, size %d\n"
msgstr "Stück von Datei »%s« empfangen, Offset %d, Größe %d\n"
-#: libpq_fetch.c:339
+#: libpq_fetch.c:352
#, c-format
msgid "could not fetch remote file \"%s\": %s"
msgstr "konnte ferne Datei »%s« nicht holen: %s"
-#: libpq_fetch.c:344
+#: libpq_fetch.c:357
#, c-format
msgid "unexpected result set while fetching remote file \"%s\"\n"
msgstr "unerwartete Ergebnismenge beim Holen der fernen Datei »%s«\n"
-#: libpq_fetch.c:355
+#: libpq_fetch.c:368
#, c-format
msgid "fetched file \"%s\", length %d\n"
msgstr "Datei »%s« geholt, Länge %d\n"
-#: libpq_fetch.c:387
+#: libpq_fetch.c:400
#, c-format
msgid "could not send COPY data: %s"
msgstr "konnte COPY-Daten nicht senden: %s"
-#: libpq_fetch.c:413
+#: libpq_fetch.c:426
#, c-format
msgid "could not create temporary table: %s"
msgstr "konnte temporäre Tabelle nicht erzeugen: %s"
-#: libpq_fetch.c:421
+#: libpq_fetch.c:434
#, c-format
msgid "could not send file list: %s"
msgstr "konnte Dateiliste nicht senden: %s"
-#: libpq_fetch.c:463
+#: libpq_fetch.c:476
#, c-format
msgid "could not send end-of-COPY: %s"
msgstr "konnte COPY-Ende nicht senden: %s"
-#: libpq_fetch.c:469
+#: libpq_fetch.c:482
#, c-format
msgid "unexpected result while sending file list: %s"
msgstr "unerwartetes Ergebnis beim Senden der Dateiliste: %s"
@@ -498,7 +503,8 @@ msgstr ""
"\n"
"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
-#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:176
+#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:175
+#: pg_rewind.c:183
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
@@ -510,65 +516,70 @@ msgstr "%s: keine Quelle angegeben (--source-pgdata oder --source-server)\n"
#: pg_rewind.c:167
#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: --source-pgdata und --source-server können nicht zusammen angegeben werden\n"
+
+#: pg_rewind.c:174
+#, c-format
msgid "%s: no target data directory specified (--target-pgdata)\n"
msgstr "%s: kein Zielverzeichnis angegeben (--target-pgdata)\n"
-#: pg_rewind.c:174
+#: pg_rewind.c:181
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
-#: pg_rewind.c:189
+#: pg_rewind.c:196
#, c-format
msgid "cannot be executed by \"root\"\n"
msgstr "kann nicht von »root« ausgeführt werden\n"
-#: pg_rewind.c:190
+#: pg_rewind.c:197
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "Sie müssen %s als PostgreSQL-Superuser ausführen.\n"
-#: pg_rewind.c:221
+#: pg_rewind.c:228
#, c-format
msgid "source and target cluster are on the same timeline\n"
msgstr "Quell- und Ziel-Cluster sind auf der gleichen Zeitleiste\n"
-#: pg_rewind.c:227
+#: pg_rewind.c:234
#, c-format
-msgid "servers diverged at WAL position %X/%X on timeline %u\n"
+msgid "servers diverged at WAL location %X/%X on timeline %u\n"
msgstr "Server divergierten bei WAL-Position %X/%X auf Zeitleiste %u\n"
-#: pg_rewind.c:264
+#: pg_rewind.c:271
#, c-format
msgid "no rewind required\n"
msgstr "kein Rückspulen nötig\n"
-#: pg_rewind.c:271
+#: pg_rewind.c:278
#, c-format
msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
msgstr "Rückspulen ab letztem gemeinsamen Checkpoint bei %X/%X auf Zeitleiste %u\n"
-#: pg_rewind.c:279
+#: pg_rewind.c:286
#, c-format
msgid "reading source file list\n"
msgstr "lese Quelldateiliste\n"
-#: pg_rewind.c:281
+#: pg_rewind.c:288
#, c-format
msgid "reading target file list\n"
msgstr "lese Zieldateiliste\n"
-#: pg_rewind.c:291
+#: pg_rewind.c:298
#, c-format
msgid "reading WAL in target\n"
msgstr "lese WAL im Ziel-Cluster\n"
-#: pg_rewind.c:308
+#: pg_rewind.c:315
#, c-format
msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
msgstr "%lu MB müssen kopiert werden (Gesamtgröße des Quellverzeichnisses ist %lu MB)\n"
-#: pg_rewind.c:325
+#: pg_rewind.c:332
#, c-format
msgid ""
"\n"
@@ -577,83 +588,83 @@ msgstr ""
"\n"
"erzeuge Backup-Label und aktualisiere Kontrolldatei\n"
-#: pg_rewind.c:353
+#: pg_rewind.c:360
#, c-format
msgid "syncing target data directory\n"
msgstr "synchronisiere Zieldatenverzeichnis\n"
-#: pg_rewind.c:356
+#: pg_rewind.c:363
#, c-format
msgid "Done!\n"
msgstr "Fertig!\n"
-#: pg_rewind.c:368
+#: pg_rewind.c:375
#, c-format
msgid "source and target clusters are from different systems\n"
msgstr "Quell- und Ziel-Cluster sind von verschiedenen Systemen\n"
-#: pg_rewind.c:376
+#: pg_rewind.c:383
#, c-format
msgid "clusters are not compatible with this version of pg_rewind\n"
msgstr "die Cluster sind nicht mit dieser Version von pg_rewind kompatibel\n"
-#: pg_rewind.c:386
+#: pg_rewind.c:393
#, c-format
msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
msgstr "Zielserver muss entweder Datenprüfsummen oder »wal_log_hints = on« verwenden\n"
-#: pg_rewind.c:397
+#: pg_rewind.c:404
#, c-format
msgid "target server must be shut down cleanly\n"
msgstr "Zielserver muss sauber heruntergefahren worden sein\n"
-#: pg_rewind.c:407
+#: pg_rewind.c:414
#, c-format
msgid "source data directory must be shut down cleanly\n"
msgstr "Quelldatenverzeichnis muss sauber heruntergefahren worden sein\n"
-#: pg_rewind.c:462
+#: pg_rewind.c:469
#, c-format
msgid "invalid control file"
msgstr "ungültige Kontrolldatei"
-#: pg_rewind.c:473
+#: pg_rewind.c:480
#, c-format
msgid "Source timeline history:\n"
msgstr "Verlauf der Quellzeitleiste:\n"
-#: pg_rewind.c:475
+#: pg_rewind.c:482
#, c-format
msgid "Target timeline history:\n"
msgstr "Verlauf der Zielzeitleiste:\n"
#. translator: %d is a timeline number, others are LSN positions
-#: pg_rewind.c:489
+#: pg_rewind.c:496
#, c-format
msgid "%d: %X/%X - %X/%X\n"
msgstr "%d: %X/%X - %X/%X\n"
-#: pg_rewind.c:548
+#: pg_rewind.c:555
#, c-format
msgid "could not find common ancestor of the source and target cluster's timelines\n"
msgstr "konnte keinen gemeinsamen Anfangspunkt in den Zeitleisten von Quell- und Ziel-Cluster finden\n"
-#: pg_rewind.c:589
+#: pg_rewind.c:596
#, c-format
msgid "backup label buffer too small\n"
msgstr "Puffer für Backup-Label ist zu klein\n"
-#: pg_rewind.c:612
+#: pg_rewind.c:619
#, c-format
msgid "unexpected control file CRC\n"
msgstr "unerwartete CRC in Kontrolldatei\n"
-#: pg_rewind.c:622
+#: pg_rewind.c:629
#, c-format
msgid "unexpected control file size %d, expected %d\n"
msgstr "unerwartete Kontrolldateigröße %d, erwartet wurde %d\n"
-#: pg_rewind.c:689
+#: pg_rewind.c:696
#, c-format
msgid ""
"The program \"initdb\" is needed by %s but was\n"
@@ -664,7 +675,7 @@ msgstr ""
"selben Verzeichnis wie »%s« gefunden.\n"
"Prüfen Sie Ihre Installation.\n"
-#: pg_rewind.c:693
+#: pg_rewind.c:700
#, c-format
msgid ""
"The program \"initdb\" was found by \"%s\"\n"
@@ -675,7 +686,7 @@ msgstr ""
"aber es hatte nicht die gleiche Version wie %s.\n"
"Prüfen Sie Ihre Installation.\n"
-#: pg_rewind.c:711
+#: pg_rewind.c:718
#, c-format
msgid "sync of target directory failed\n"
msgstr "Synchronisieren des Zielverzeichnisses fehlgeschlagen\n"
@@ -692,8 +703,8 @@ msgstr "Eine numerische Zeitleisten-ID wurde erwartet.\n"
#: timeline.c:83
#, c-format
-msgid "Expected a transaction log switchpoint location.\n"
-msgstr "Eine Transaktionslog-Switchpoint-Position wurde erwartet.\n"
+msgid "Expected a write-ahead log switchpoint location.\n"
+msgstr "Eine Write-Ahead-Log-Switchpoint-Position wurde erwartet.\n"
#: timeline.c:88
#, c-format
@@ -725,7 +736,7 @@ msgstr "ungültiger Datensatz-Offset bei %X/%X"
msgid "contrecord is requested by %X/%X"
msgstr "Contrecord angefordert von %X/%X"
-#: xlogreader.c:325 xlogreader.c:624
+#: xlogreader.c:325 xlogreader.c:625
#, c-format
msgid "invalid record length at %X/%X: wanted %u, got %u"
msgstr "ungültige Datensatzlänge bei %X/%X: %u erwartet, %u erhalten"
@@ -745,107 +756,107 @@ msgstr "keine Contrecord-Flag bei %X/%X"
msgid "invalid contrecord length %u at %X/%X"
msgstr "ungültige Contrecord-Länge %u bei %X/%X"
-#: xlogreader.c:632
+#: xlogreader.c:633
#, c-format
msgid "invalid resource manager ID %u at %X/%X"
msgstr "ungültige Resource-Manager-ID %u bei %X/%X"
-#: xlogreader.c:646 xlogreader.c:663
+#: xlogreader.c:647 xlogreader.c:664
#, c-format
msgid "record with incorrect prev-link %X/%X at %X/%X"
msgstr "Datensatz mit falschem Prev-Link %X/%X bei %X/%X"
-#: xlogreader.c:700
+#: xlogreader.c:701
#, c-format
msgid "incorrect resource manager data checksum in record at %X/%X"
msgstr "ungültige Resource-Manager-Datenprüfsumme in Datensatz bei %X/%X"
-#: xlogreader.c:733
+#: xlogreader.c:734
#, c-format
msgid "invalid magic number %04X in log segment %s, offset %u"
msgstr "ungültige magische Zahl %04X in Logsegment %s, Offset %u"
-#: xlogreader.c:747 xlogreader.c:798
+#: xlogreader.c:748 xlogreader.c:799
#, c-format
msgid "invalid info bits %04X in log segment %s, offset %u"
msgstr "ungültige Info-Bits %04X in Logsegment %s, Offset %u"
-#: xlogreader.c:773
+#: xlogreader.c:774
#, c-format
msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
msgstr "WAL-Datei ist von einem anderen Datenbanksystem: Datenbanksystemidentifikator in WAL-Datei ist %s, Datenbanksystemidentifikator in pg_control ist %s"
-#: xlogreader.c:780
+#: xlogreader.c:781
#, c-format
msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
msgstr "WAL-Datei ist von einem anderen Datenbanksystem: Falsche XLOG_SEG_SIZE im Seitenkopf"
-#: xlogreader.c:786
+#: xlogreader.c:787
#, c-format
msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
msgstr "WAL-Datei ist von einem anderen Datenbanksystem: Falsche XLOG_BLCKSZ im Seitenkopf"
-#: xlogreader.c:812
+#: xlogreader.c:813
#, c-format
msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
msgstr "unerwartete Pageaddr %X/%X in Logsegment %s, Offset %u"
-#: xlogreader.c:837
+#: xlogreader.c:838
#, c-format
msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
msgstr "Zeitleisten-ID %u außer der Reihe (nach %u) in Logsegment %s, Offset %u"
-#: xlogreader.c:1044
+#: xlogreader.c:1083
#, c-format
msgid "out-of-order block_id %u at %X/%X"
msgstr "block_id %u außer der Reihe bei %X/%X"
-#: xlogreader.c:1066
+#: xlogreader.c:1106
#, c-format
msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
msgstr "BKPBLOCK_HAS_DATA gesetzt, aber keine Daten enthalten bei %X/%X"
-#: xlogreader.c:1073
+#: xlogreader.c:1113
#, c-format
msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
msgstr "BKPBLOCK_HAS_DATA nicht gesetzt, aber Datenlänge ist %u bei %X/%X"
-#: xlogreader.c:1106
+#: xlogreader.c:1149
#, c-format
msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
msgstr "BKPIMAGE_HAS_HOLE gesetzt, aber Loch Offset %u Länge %u Block-Abbild-Länge %u bei %X/%X"
-#: xlogreader.c:1122
+#: xlogreader.c:1165
#, c-format
msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
msgstr "BKPIMAGE_HAS_HOLE nicht gesetzt, aber Loch Offset %u Länge %u bei %X/%X"
-#: xlogreader.c:1137
+#: xlogreader.c:1180
#, c-format
msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
msgstr "BKPIMAGE_IS_COMPRESSED gesetzt, aber Block-Abbild-Länge %u bei %X/%X"
-#: xlogreader.c:1152
+#: xlogreader.c:1195
#, c-format
msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
msgstr "weder BKPIMAGE_HAS_HOLE noch BKPIMAGE_IS_COMPRESSED gesetzt, aber Block-Abbild-Länge ist %u bei %X/%X"
-#: xlogreader.c:1168
+#: xlogreader.c:1211
#, c-format
msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
msgstr "BKPBLOCK_SAME_REL gesetzt, aber keine vorangehende Relation bei %X/%X"
-#: xlogreader.c:1180
+#: xlogreader.c:1223
#, c-format
msgid "invalid block_id %u at %X/%X"
msgstr "ungültige block_id %u bei %X/%X"
-#: xlogreader.c:1245
+#: xlogreader.c:1291
#, c-format
msgid "record with invalid length at %X/%X"
msgstr "Datensatz mit ungültiger Länge bei %X/%X"
-#: xlogreader.c:1334
+#: xlogreader.c:1380
#, c-format
msgid "invalid compressed image at %X/%X, block %d"
msgstr "ungültiges komprimiertes Abbild bei %X/%X, Block %d"
diff --git a/src/bin/pg_rewind/po/fr.po b/src/bin/pg_rewind/po/fr.po
index cc20bc01736..684715e7fad 100644
--- a/src/bin/pg_rewind/po/fr.po
+++ b/src/bin/pg_rewind/po/fr.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_rewind (PostgreSQL) 9.6\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-05-08 21:14+0000\n"
-"PO-Revision-Date: 2016-05-09 10:30+0200\n"
+"POT-Creation-Date: 2016-10-24 20:44+0000\n"
+"PO-Revision-Date: 2016-10-25 18:51+0200\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.8\n"
#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127 parsexlog.c:179
@@ -229,142 +229,147 @@ msgstr "modification inattendue de page pour le répertoire ou le lien symboliqu
msgid "%s (%s)\n"
msgstr "%s (%s)\n"
-#: libpq_fetch.c:55
+#: libpq_fetch.c:56
#, c-format
msgid "could not connect to server: %s"
msgstr "n'a pas pu se connecter au serveur : %s"
-#: libpq_fetch.c:58
+#: libpq_fetch.c:59
#, c-format
msgid "connected to server\n"
msgstr "connecté au serveur\n"
-#: libpq_fetch.c:68
+#: libpq_fetch.c:69
#, c-format
msgid "source server must not be in recovery mode\n"
msgstr "le serveur source ne doit pas être en mode restauration\n"
-#: libpq_fetch.c:78
+#: libpq_fetch.c:79
#, c-format
msgid "full_page_writes must be enabled in the source server\n"
msgstr "full_page_writes doit être activé sur le serveur source\n"
-#: libpq_fetch.c:95
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "n'a pas pu initialiser le contexte de connexion : « %s »"
+
+#: libpq_fetch.c:109
#, c-format
msgid "error running query (%s) in source server: %s"
msgstr "erreur lors de l'exécution de la requête (%s) dans le serveur source : %s"
-#: libpq_fetch.c:100
+#: libpq_fetch.c:114
#, c-format
msgid "unexpected result set from query\n"
msgstr "ensemble de résultats inattendu de la requête\n"
-#: libpq_fetch.c:123
+#: libpq_fetch.c:137
#, c-format
msgid "unrecognized result \"%s\" for current WAL insert location\n"
msgstr "résultat non reconnu « %s » pour l'emplacement d'insertion actuel dans les WAL\n"
-#: libpq_fetch.c:173
+#: libpq_fetch.c:187
#, c-format
msgid "could not fetch file list: %s"
msgstr "n'a pas pu récupérer la liste des fichiers : %s"
-#: libpq_fetch.c:178
+#: libpq_fetch.c:192
#, c-format
msgid "unexpected result set while fetching file list\n"
msgstr "ensemble de résultats inattendu lors de la récupération de la liste des fichiers\n"
-#: libpq_fetch.c:226
+#: libpq_fetch.c:240
#, c-format
msgid "could not send query: %s"
msgstr "n'a pas pu envoyer la requête : %s"
-#: libpq_fetch.c:228
+#: libpq_fetch.c:242
#, c-format
msgid "getting file chunks\n"
msgstr "récupération des parties de fichier\n"
-#: libpq_fetch.c:231
+#: libpq_fetch.c:245
#, c-format
msgid "could not set libpq connection to single row mode\n"
msgstr "n'a pas pu configurer la connexion libpq en mode ligne seule\n"
-#: libpq_fetch.c:251
+#: libpq_fetch.c:265
#, c-format
msgid "unexpected result while fetching remote files: %s"
msgstr "résultat inattendu lors de la récupération des fichiers cibles : %s"
-#: libpq_fetch.c:257
+#: libpq_fetch.c:271
#, c-format
msgid "unexpected result set size while fetching remote files\n"
msgstr "taille inattendue de l'ensemble de résultats lors de la récupération des fichiers distants\n"
-#: libpq_fetch.c:263
+#: libpq_fetch.c:277
#, c-format
msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
msgstr "types de données inattendus dans l'ensemble de résultats lors de la récupération des fichiers distants : %u %u %u\n"
-#: libpq_fetch.c:271
+#: libpq_fetch.c:285
#, c-format
msgid "unexpected result format while fetching remote files\n"
msgstr "format de résultat inattendu lors de la récupération des fichiers distants\n"
-#: libpq_fetch.c:277
+#: libpq_fetch.c:291
#, c-format
msgid "unexpected null values in result while fetching remote files\n"
msgstr "valeurs NULL inattendues dans le résultat lors de la récupération des fichiers distants\n"
-#: libpq_fetch.c:281
+#: libpq_fetch.c:295
#, c-format
msgid "unexpected result length while fetching remote files\n"
msgstr "longueur de résultats inattendu lors de la récupération des fichiers distants\n"
-#: libpq_fetch.c:303
+#: libpq_fetch.c:317
#, c-format
msgid "received null value for chunk for file \"%s\", file has been deleted\n"
msgstr "a reçu une valeur NULL pour une partie du fichier « %s », le fichier a été supprimé\n"
-#: libpq_fetch.c:310
+#: libpq_fetch.c:324
#, c-format
msgid "received chunk for file \"%s\", offset %d, size %d\n"
msgstr "récupération d'une partie du fichier « %s », décalage %d, taille %d\n"
-#: libpq_fetch.c:339
+#: libpq_fetch.c:353
#, c-format
msgid "could not fetch remote file \"%s\": %s"
msgstr "n'a pas pu récupérer le fichier distant « %s » : %s"
-#: libpq_fetch.c:344
+#: libpq_fetch.c:358
#, c-format
msgid "unexpected result set while fetching remote file \"%s\"\n"
msgstr "ensemble de résultats inattendu lors de la récupération du fichier distant « %s »\n"
-#: libpq_fetch.c:355
+#: libpq_fetch.c:369
#, c-format
msgid "fetched file \"%s\", length %d\n"
msgstr "fichier récupéré « %s », longueur %d\n"
-#: libpq_fetch.c:387
+#: libpq_fetch.c:401
#, c-format
msgid "could not send COPY data: %s"
msgstr "n'a pas pu envoyer les données COPY : %s"
-#: libpq_fetch.c:413
+#: libpq_fetch.c:427
#, c-format
msgid "could not create temporary table: %s"
msgstr "n'a pas pu créer la table temporaire : %s"
-#: libpq_fetch.c:421
+#: libpq_fetch.c:435
#, c-format
msgid "could not send file list: %s"
msgstr "n'a pas pu envoyer la liste de fichiers : %s"
-#: libpq_fetch.c:463
+#: libpq_fetch.c:477
#, c-format
msgid "could not send end-of-COPY: %s"
msgstr "n'a pas pu envoyer end-of-COPY : %s"
-#: libpq_fetch.c:469
+#: libpq_fetch.c:483
#, c-format
msgid "unexpected result while sending file list: %s"
msgstr "résultat inattendu lors de l'envoi de la liste de fichiers : %s"
@@ -496,7 +501,8 @@ msgstr ""
"\n"
"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
-#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:176
+#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:175
+#: pg_rewind.c:183
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Essayez « %s --help » pour plus d'informations.\n"
@@ -508,65 +514,70 @@ msgstr "%s : aucune source indiquée (--source-pgdata ou --source-server)\n"
#: pg_rewind.c:167
#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s : une seule des options --source-pgdata et --source-server peut être indiquée\n"
+
+#: pg_rewind.c:174
+#, c-format
msgid "%s: no target data directory specified (--target-pgdata)\n"
msgstr "%s : aucun répertoire de données cible indiqué (--target-pgdata)\n"
-#: pg_rewind.c:174
+#: pg_rewind.c:181
#, 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_rewind.c:189
+#: pg_rewind.c:196
#, c-format
msgid "cannot be executed by \"root\"\n"
msgstr "ne peut pas être exécuté par « root »\n"
-#: pg_rewind.c:190
+#: pg_rewind.c:197
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "Vous devez exécuter %s en tant que super-utilisateur PostgreSQL.\n"
-#: pg_rewind.c:221
+#: pg_rewind.c:228
#, c-format
msgid "source and target cluster are on the same timeline\n"
msgstr "les instances source et cible sont sur la même ligne de temps\n"
-#: pg_rewind.c:227
+#: pg_rewind.c:234
#, c-format
msgid "servers diverged at WAL position %X/%X on timeline %u\n"
msgstr "les serveurs ont divergé à la position %X/%X des WAL sur la timeline %u\n"
-#: pg_rewind.c:264
+#: pg_rewind.c:271
#, c-format
msgid "no rewind required\n"
msgstr "pas de retour en arrière requis\n"
-#: pg_rewind.c:271
+#: pg_rewind.c:278
#, c-format
msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
msgstr "retour en arrière depuis le dernier checkpoint commun à %X/%X sur la ligne de temps %u\n"
-#: pg_rewind.c:279
+#: pg_rewind.c:286
#, c-format
msgid "reading source file list\n"
msgstr "lecture de la liste des fichiers sources\n"
-#: pg_rewind.c:281
+#: pg_rewind.c:288
#, c-format
msgid "reading target file list\n"
msgstr "lecture de la liste des fichiers cibles\n"
-#: pg_rewind.c:291
+#: pg_rewind.c:298
#, c-format
msgid "reading WAL in target\n"
msgstr "lecture du WAL dans la cible\n"
-#: pg_rewind.c:308
+#: pg_rewind.c:315
#, c-format
msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
msgstr "a besoin de copier %lu Mo (la taille totale du répertoire source est %lu Mo)\n"
-#: pg_rewind.c:325
+#: pg_rewind.c:332
#, c-format
msgid ""
"\n"
@@ -575,86 +586,86 @@ msgstr ""
"\n"
"création du fichier backup_label et mise à jour du fichier contrôle\n"
-#: pg_rewind.c:353
+#: pg_rewind.c:360
#, c-format
msgid "syncing target data directory\n"
msgstr "synchronisation du répertoire des données cible\n"
-#: pg_rewind.c:356
+#: pg_rewind.c:363
#, c-format
msgid "Done!\n"
msgstr "Terminé !\n"
-#: pg_rewind.c:368
+#: pg_rewind.c:375
#, c-format
msgid "source and target clusters are from different systems\n"
msgstr "les instances source et cible proviennent de systèmes différents\n"
-#: pg_rewind.c:376
+#: pg_rewind.c:383
#, c-format
msgid "clusters are not compatible with this version of pg_rewind\n"
msgstr "les instances ne sont pas compatibles avec cette version de pg_rewind\n"
-#: pg_rewind.c:386
+#: pg_rewind.c:393
#, c-format
msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
msgstr "le serveur cible doit soit utiliser les sommes de contrôle sur les données soit avoir wal_log_hints configuré à on\n"
-#: pg_rewind.c:397
+#: pg_rewind.c:404
#, c-format
msgid "target server must be shut down cleanly\n"
msgstr "le serveur cible doit être arrêté proprement\n"
-#: pg_rewind.c:407
+#: pg_rewind.c:414
#, c-format
msgid "source data directory must be shut down cleanly\n"
msgstr "le répertoire de données source doit être arrêté proprement\n"
-#: pg_rewind.c:462
+#: pg_rewind.c:469
#, c-format
-msgid "Invalid control file"
-msgstr "Fichier de contrôle invalide."
+msgid "invalid control file"
+msgstr "Fichier de contrôle invalide"
-#: pg_rewind.c:473
+#: pg_rewind.c:480
#, c-format
msgid "Source timeline history:\n"
msgstr "Historique de la ligne de temps source :\n"
-#: pg_rewind.c:475
+#: pg_rewind.c:482
#, c-format
msgid "Target timeline history:\n"
msgstr "Historique de la ligne de temps cible :\n"
#. translator: %d is a timeline number, others are LSN positions
-#: pg_rewind.c:489
+#: pg_rewind.c:496
#, c-format
msgid "%d: %X/%X - %X/%X\n"
msgstr "%d : %X/%X - %X/%X\n"
-#: pg_rewind.c:547
+#: pg_rewind.c:555
#, c-format
msgid "could not find common ancestor of the source and target cluster's timelines\n"
msgstr "n'a pas pu trouver l'ancêtre commun des lignes de temps des instances source et cible\n"
-#: pg_rewind.c:588
+#: pg_rewind.c:596
#, c-format
msgid "backup label buffer too small\n"
msgstr "tampon du label de sauvegarde trop petit\n"
-#: pg_rewind.c:611
+#: pg_rewind.c:619
#, c-format
msgid "unexpected control file CRC\n"
msgstr "CRC inattendu pour le fichier de contrôle\n"
-#: pg_rewind.c:621
+#: pg_rewind.c:629
#, c-format
msgid "unexpected control file size %d, expected %d\n"
msgstr "taille %d inattendue du fichier de contrôle, %d attendu\n"
-#: pg_rewind.c:688
+#: pg_rewind.c:696
#, c-format
msgid ""
-"The program \"initdb\" is needed by %s but was \n"
+"The program \"initdb\" is needed by %s but was\n"
"not found in the same directory as \"%s\".\n"
"Check your installation.\n"
msgstr ""
@@ -662,7 +673,7 @@ msgstr ""
"dans le même répertoire que « %s ».\n"
"Vérifiez votre installation.\n"
-#: pg_rewind.c:692
+#: pg_rewind.c:700
#, c-format
msgid ""
"The program \"initdb\" was found by \"%s\"\n"
@@ -673,7 +684,7 @@ msgstr ""
"que %s.\n"
"Vérifiez votre installation.\n"
-#: pg_rewind.c:710
+#: pg_rewind.c:718
#, c-format
msgid "sync of target directory failed\n"
msgstr "échec de la synchronisation du répertoire cible\n"
@@ -795,57 +806,57 @@ msgstr "pageaddr %X/%X inattendue dans le journal de transactions %s, segment %u
msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
msgstr "identifiant timeline %u hors de la séquence (après %u) dans le segment %s, décalage %u"
-#: xlogreader.c:1044
+#: xlogreader.c:1081
#, c-format
msgid "out-of-order block_id %u at %X/%X"
msgstr "block_id %u désordonné à %X/%X"
-#: xlogreader.c:1066
+#: xlogreader.c:1103
#, c-format
msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
msgstr "BKPBLOCK_HAS_DATA configuré, mais aucune donnée inclus à %X/%X"
-#: xlogreader.c:1073
+#: xlogreader.c:1110
#, c-format
msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
msgstr "BKPBLOCK_HAS_DATA non configuré, mais la longueur des données est %u à %X/%X"
-#: xlogreader.c:1106
+#: xlogreader.c:1143
#, c-format
msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
msgstr "BKPIMAGE_HAS_HOLE activé, mais décalage trou %u longueur %u longueur image bloc %u à %X/%X"
-#: xlogreader.c:1122
+#: xlogreader.c:1159
#, c-format
msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
msgstr "BKPIMAGE_HAS_HOLE désactivé, mais décalage trou %u longueur %u à %X/%X"
-#: xlogreader.c:1137
+#: xlogreader.c:1174
#, c-format
msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
msgstr "BKPIMAGE_IS_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
-#: xlogreader.c:1152
+#: xlogreader.c:1189
#, c-format
msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_IS_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
-#: xlogreader.c:1168
+#: xlogreader.c:1205
#, c-format
msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
msgstr "BKPBLOCK_SAME_REL configuré, mais pas de relation précédente à %X/%X"
-#: xlogreader.c:1180
+#: xlogreader.c:1217
#, c-format
msgid "invalid block_id %u at %X/%X"
msgstr "block_id %u invalide à %X/%X"
-#: xlogreader.c:1245
+#: xlogreader.c:1282
#, c-format
msgid "record with invalid length at %X/%X"
msgstr "enregistrement de longueur invalide à %X/%X"
-#: xlogreader.c:1334
+#: xlogreader.c:1371
#, c-format
msgid "invalid compressed image at %X/%X, block %d"
msgstr "image compressée invalide à %X/%X, bloc %d"
diff --git a/src/bin/pg_rewind/po/ja.po b/src/bin/pg_rewind/po/ja.po
new file mode 100644
index 00000000000..0343ff45ac6
--- /dev/null
+++ b/src/bin/pg_rewind/po/ja.po
@@ -0,0 +1,850 @@
+# LANGUAGE message translation file for pg_rewind
+# Copyright (C) 2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_rewind (PostgreSQL) 9.6\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2016-09-21 12:34+0900\n"
+"PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n"
+"Last-Translator: IDERIHA Takeshi <ideriha.takeshi@jp.fujitsu.com>\n"
+"Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127
+#: parsexlog.c:179
+#, c-format
+msgid "out of memory\n"
+msgstr "メモリ不足です\n"
+
+#: ../../common/fe_memutils.c:92
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "null ポインタを複製できません(内部エラー)\n"
+
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: 警告: このプラットフォームでは制限付きトークンを作成できません\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: プロセストークンをオープンできませんでした: エラーコード %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: SIDを割り当てられませんでした: エラーコード %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: 制限付きトークンを作成できませんでした: エラーコード %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: \"%s\"コマンド用のプロセスを起動できませんでした: エラーコード %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: 制限付きトークンで再実行できませんでした: %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: サブプロセスの終了コードを入手できませんでした。: エラーコード %lu\n"
+
+#: copy_fetch.c:64
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "ディレクトリ\"%s\"をオープンできませんでした: %s\n"
+
+#: copy_fetch.c:93 filemap.c:112 filemap.c:267
+#, c-format
+msgid "could not stat file \"%s\": %s\n"
+msgstr "ファイル\"%s\"のstatができませんでした: %s\n"
+
+#: copy_fetch.c:122
+#, c-format
+msgid "could not read symbolic link \"%s\": %s\n"
+msgstr "シンボリックリンク \"%s\" を読み込めませんでした: %s\n"
+
+#: copy_fetch.c:125
+#, c-format
+msgid "symbolic link \"%s\" target is too long\n"
+msgstr "シンボリックリンク\"%s\"の参照先は長すぎます\n"
+
+#: copy_fetch.c:140
+#, c-format
+msgid "\"%s\" is a symbolic link, but symbolic links are not supported on this platform\n"
+msgstr "\"%s\"はシンボリックリンクですが、このプラットフォームではシンボリックリンクをサポートしていません\n"
+
+#: copy_fetch.c:147
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "ディレクトリ\"%s\"を読み取れませんでした: %s\n"
+
+#: copy_fetch.c:151
+#, c-format
+msgid "could not close directory \"%s\": %s\n"
+msgstr "ディレクトリ\"%s\"をクローズできませんでした: %s\n"
+
+#: copy_fetch.c:171
+#, c-format
+msgid "could not open source file \"%s\": %s\n"
+msgstr "ソースファイル\"%s\"をオープンすることができませんでした: %s\n"
+
+#: copy_fetch.c:175
+#, c-format
+msgid "could not seek in source file: %s\n"
+msgstr "ソースファイルをシークすることができませんでした: %s\n"
+
+#: copy_fetch.c:192 file_ops.c:300
+#, c-format
+msgid "could not read file \"%s\": %s\n"
+msgstr "ファイル \"%s\" を読み込めませんでした: %s\n"
+
+#: copy_fetch.c:195
+#, c-format
+msgid "unexpected EOF while reading file \"%s\"\n"
+msgstr "ファイル\"%s\"を読み込み中に想定外のEOFがありました\n"
+
+#: copy_fetch.c:202
+#, c-format
+msgid "could not close file \"%s\": %s\n"
+msgstr "ファイル \"%s\" をクローズできませんでした: %s\n"
+
+#: datapagemap.c:124
+#, c-format
+msgid " block %u\n"
+msgstr "ブロック数 %u\n"
+
+#: file_ops.c:64
+#, c-format
+msgid "could not open target file \"%s\": %s\n"
+msgstr "ターゲットファイル\"%s\"をオープンできませんでした: %s\n"
+
+#: file_ops.c:78
+#, c-format
+msgid "could not close target file \"%s\": %s\n"
+msgstr "ターゲットファイル\"%s\"をクローズできませんでした: %s\n"
+
+#: file_ops.c:98
+#, c-format
+msgid "could not seek in target file \"%s\": %s\n"
+msgstr "ターゲットファイル\"%s\"をシークできませんでした: %s\n"
+
+#: file_ops.c:114
+#, c-format
+msgid "could not write file \"%s\": %s\n"
+msgstr "ファイル\"%s\"に書き込めませんでした: %s\n"
+
+#: file_ops.c:164
+#, c-format
+msgid "invalid action (CREATE) for regular file\n"
+msgstr "通常のファイルに対する不正なアクション(CREATE)です\n"
+
+#: file_ops.c:179
+#, c-format
+msgid "could not remove file \"%s\": %s\n"
+msgstr "ファイル\"%s\"を削除できませんでした: %s\n"
+
+#: file_ops.c:196
+#, c-format
+msgid "could not open file \"%s\" for truncation: %s\n"
+msgstr "ファイル\"%s\"を切り詰め用にオープンできませんでした: %s\n"
+
+#: file_ops.c:200
+#, c-format
+msgid "could not truncate file \"%s\" to %u: %s\n"
+msgstr "ファイル \"%s\" を%uに切り詰められませんでした: %s\n"
+
+#: file_ops.c:216
+#, c-format
+msgid "could not create directory \"%s\": %s\n"
+msgstr "ディレクトリ\"%s\"を作成できませんでした: %s\n"
+
+#: file_ops.c:230
+#, c-format
+msgid "could not remove directory \"%s\": %s\n"
+msgstr "ディレクトリ\"%s\"を削除できませんでした: %s\n"
+
+#: file_ops.c:244
+#, c-format
+msgid "could not create symbolic link at \"%s\": %s\n"
+msgstr "\"%s\"でシンボリックリンクを作成できませんでした: %s\n"
+
+#: file_ops.c:258
+#, c-format
+msgid "could not remove symbolic link \"%s\": %s\n"
+msgstr "シンボリックリンク \"%s\" を削除できませんでした: %s\n"
+
+#: file_ops.c:288 file_ops.c:292
+#, c-format
+msgid "could not open file \"%s\" for reading: %s\n"
+msgstr "読み取り用のファイル\"%s\"をオープンできませんでした:%s\n"
+
+#: filemap.c:104
+#, c-format
+msgid "data file \"%s\" in source is not a regular file\n"
+msgstr "ソースのデータファイル\"%s\"は通常のファイルではありません\n"
+
+#: filemap.c:126
+#, c-format
+msgid "\"%s\" is not a directory\n"
+msgstr "\"%s\"はディレクトリではありません\n"
+
+#: filemap.c:149
+#, c-format
+msgid "\"%s\" is not a symbolic link\n"
+msgstr "\"%s\"はシンボリックリンクではありません\n"
+
+#: filemap.c:161
+#, c-format
+msgid "\"%s\" is not a regular file\n"
+msgstr "\"%s\" は通常のファイルではありません\n"
+
+#: filemap.c:279
+#, c-format
+msgid "source file list is empty\n"
+msgstr "ソースファイルリストが空です\n"
+
+#: filemap.c:401
+#, c-format
+msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
+msgstr "ディレクトリまたはシンボリックリンク\"%s\"に対する想定外のページ修正です\n"
+
+#. translator: first %s is a file path, second is a keyword such as COPY
+#: filemap.c:537
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
+#: libpq_fetch.c:55
+#, c-format
+msgid "could not connect to server: %s"
+msgstr "サーバに接続できませんでした: %s"
+
+#: libpq_fetch.c:58
+#, c-format
+msgid "connected to server\n"
+msgstr "サーバへ接続しました\n"
+
+#: libpq_fetch.c:68
+#, c-format
+msgid "source server must not be in recovery mode\n"
+msgstr "ソースサーバはリカバリモードでなければなりません\n"
+
+#: libpq_fetch.c:78
+#, c-format
+msgid "full_page_writes must be enabled in the source server\n"
+msgstr "ソースサーバではfull_pate_writesは有効でなければなりません\n"
+
+#: libpq_fetch.c:95
+#, c-format
+msgid "error running query (%s) in source server: %s"
+msgstr "ソースサーバの実行中のクエリ(%s)でエラー:%s"
+
+#: libpq_fetch.c:100
+#, c-format
+msgid "unexpected result set from query\n"
+msgstr "クエリから想定外の結果セット\n"
+
+#: libpq_fetch.c:123
+#, c-format
+msgid "unrecognized result \"%s\" for current WAL insert location\n"
+msgstr "現在のWALの挿入場所に対する未知の結果 \"%s\" \n"
+
+#: libpq_fetch.c:173
+#, c-format
+msgid "could not fetch file list: %s"
+msgstr "ファイルリストをフェッチできませんでした: %s"
+
+#: libpq_fetch.c:178
+#, c-format
+msgid "unexpected result set while fetching file list\n"
+msgstr "ファイルリストをフェッチ中に想定外の結果セット\n"
+
+#: libpq_fetch.c:226
+#, c-format
+msgid "could not send query: %s"
+msgstr "クエリを送信できませんでした: %s"
+
+#: libpq_fetch.c:228
+#, c-format
+msgid "getting file chunks\n"
+msgstr "ファイルチャンクの取得\n"
+
+#: libpq_fetch.c:231
+#, c-format
+msgid "could not set libpq connection to single row mode\n"
+msgstr "libpq接続を単一行モードに設定できませんでした\n"
+
+#: libpq_fetch.c:251
+#, c-format
+msgid "unexpected result while fetching remote files: %s"
+msgstr "リモートファイルをフェッチ中に想定外の結果: %s"
+
+#: libpq_fetch.c:257
+#, c-format
+msgid "unexpected result set size while fetching remote files\n"
+msgstr "リモートファイルをフェッチ中に想定外の結果セットサイズ\n"
+
+#: libpq_fetch.c:263
+#, c-format
+msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
+msgstr "リモートファイルをフェッチ中の結果セットに想定外のデータ型: %u %u %u\n"
+
+#: libpq_fetch.c:271
+#, c-format
+msgid "unexpected result format while fetching remote files\n"
+msgstr "リモートファイルをフェッチ中に想定外の結果形式\n"
+
+#: libpq_fetch.c:277
+#, c-format
+msgid "unexpected null values in result while fetching remote files\n"
+msgstr "リモートファイルをフェッチ中の結果に想定外のNULL値\n"
+
+#: libpq_fetch.c:281
+#, c-format
+msgid "unexpected result length while fetching remote files\n"
+msgstr "リモートファイルをフェッチ中に想定外の結果の長さ\n"
+
+#: libpq_fetch.c:303
+#, c-format
+msgid "received null value for chunk for file \"%s\", file has been deleted\n"
+msgstr "ファイル\"%s\"のNULL値のチャンクを受け取りました。ファイルは削除されました。\n"
+
+#: libpq_fetch.c:310
+#, c-format
+msgid "received chunk for file \"%s\", offset %d, size %d\n"
+msgstr "ファイル \"%s\",オフセット %d, サイズ %dのチャンクを受け取りました\n"
+
+#: libpq_fetch.c:339
+#, c-format
+msgid "could not fetch remote file \"%s\": %s"
+msgstr "リモートファイル\"%s\"をフェッチできませんでした: %s"
+
+#: libpq_fetch.c:344
+#, c-format
+msgid "unexpected result set while fetching remote file \"%s\"\n"
+msgstr "リモートファイル \"%s\"をフェッチ中に想定外の結果セット\n"
+
+#: libpq_fetch.c:355
+#, c-format
+msgid "fetched file \"%s\", length %d\n"
+msgstr "フェッチしたファイル \"%s\",長さ %d\n"
+
+#: libpq_fetch.c:387
+#, c-format
+msgid "could not send COPY data: %s"
+msgstr "COPY 対象データを送信できませんでした:%s"
+
+#: libpq_fetch.c:413
+#, c-format
+msgid "could not create temporary table: %s"
+msgstr "一時テーブルを作成できませんでした:%s"
+
+#: libpq_fetch.c:421
+#, c-format
+msgid "could not send file list: %s"
+msgstr "ファイルリストを送信できませんでした:%s"
+
+#: libpq_fetch.c:463
+#, c-format
+msgid "could not send end-of-COPY: %s"
+msgstr "コピー終端を送信できませんでした:%s"
+
+#: libpq_fetch.c:469
+#, c-format
+msgid "unexpected result while sending file list: %s"
+msgstr "ファイルリストを送信中に想定外の結果: %s"
+
+#: logging.c:57
+msgid "Failure, exiting\n"
+msgstr "失敗しました、終了します\n"
+
+#: logging.c:140
+#, c-format
+msgid "%*s/%s kB (%d%%) copied"
+msgstr "%*s/%s kB (%d%%) コピーしました"
+
+#: parsexlog.c:87 parsexlog.c:133
+#, c-format
+msgid "could not read WAL record at %X/%X: %s\n"
+msgstr "%X/%XでWALレコードを読み取れませんでした: %s\n"
+
+#: parsexlog.c:91 parsexlog.c:136
+#, c-format
+msgid "could not read WAL record at %X/%X\n"
+msgstr "%X/%XでWALレコードを読み取れませんでした\n"
+
+#: parsexlog.c:191
+#, c-format
+msgid "could not find previous WAL record at %X/%X: %s\n"
+msgstr "%X/%Xで前のWALレコードが見つかりませんでした: %s\n"
+
+#: parsexlog.c:195
+#, c-format
+msgid "could not find previous WAL record at %X/%X\n"
+msgstr "%X/%Xで前のWALレコードが見つかりませんでした\n"
+
+#: parsexlog.c:283
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "ファイル \"%s\" をオープンできませんでした: %s\n"
+
+#: parsexlog.c:297
+#, c-format
+msgid "could not seek in file \"%s\": %s\n"
+msgstr "ファイル\"%s\"をシークできませんでした: %s\n"
+
+#: parsexlog.c:304
+#, c-format
+msgid "could not read from file \"%s\": %s\n"
+msgstr "ファイル\"%s\"を読み込めませんでした: %s\n"
+
+#: parsexlog.c:372
+#, c-format
+msgid ""
+"WAL record modifies a relation, but record type is not recognized\n"
+"lsn: %X/%X, rmgr: %s, info: %02X\n"
+msgstr ""
+"WALレコードはリレーションを修正しますが、レコードの型を認識できません。\n"
+"lsn: %X/%X, rmgr: %s, info: %02X\n"
+
+#: pg_rewind.c:64
+#, c-format
+msgid ""
+"%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
+"\n"
+msgstr ""
+"%s はPostgreSQLクラスタをそのクラスタのコピーで再同期します。\n"
+"\n"
+
+#: pg_rewind.c:65
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION]...\n"
+"\n"
+msgstr ""
+"使用方法:\n"
+"\" %s [オプション]...\n"
+"\n"
+
+#: pg_rewind.c:66
+#, c-format
+msgid "Options:\n"
+msgstr "オプション:\n"
+
+#: pg_rewind.c:67
+#, c-format
+msgid " -D, --target-pgdata=DIRECTORY existing data directory to modify\n"
+msgstr " -D, --target-pgdata=DIRECTORY 既存のデータディレクトリを修正する\n"
+
+#: pg_rewind.c:68
+#, c-format
+msgid " --source-pgdata=DIRECTORY source data directory to synchronize with\n"
+msgstr " --source-pgdata=DIRECTORY 同期するソースデータのディレクトリ\n"
+
+#: pg_rewind.c:69
+#, c-format
+msgid " --source-server=CONNSTR source server to synchronize with\n"
+msgstr " --source-server=CONNSTR 同期するソースサーバ\n"
+
+#: pg_rewind.c:70
+#, c-format
+msgid " -n, --dry-run stop before modifying anything\n"
+msgstr " -n, --dry-run 何かを修正する前に停止する\n"
+
+#: pg_rewind.c:71
+#, c-format
+msgid " -P, --progress write progress messages\n"
+msgstr " -P, --progress 進行中のメッセージを出力します\n"
+
+#: pg_rewind.c:72
+#, c-format
+msgid " --debug write a lot of debug messages\n"
+msgstr " --debug 多くのデバッグメッセージを出力します\n"
+
+#: pg_rewind.c:73
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version バージョン情報を表示し、終了します\n"
+
+#: pg_rewind.c:74
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help このヘルプを表示し、終了します\n"
+
+#: pg_rewind.c:75
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"不具合は<pgsql-bugs@postgresql.org>まで報告してください。\n"
+
+#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:176
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "詳細は\"%s --help\"を実行してください。\n"
+
+#: pg_rewind.c:160
+#, c-format
+msgid "%s: no source specified (--source-pgdata or --source-server)\n"
+msgstr "%s: ソースが特定されていません(--source-pgdata or --source-server)\n"
+
+#: pg_rewind.c:167
+#, c-format
+msgid "%s: no target data directory specified (--target-pgdata)\n"
+msgstr "%s: データディレクトリ対象が指定されていません (--target-pgdata)\n"
+
+#: pg_rewind.c:174
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: コマンドライン引数が多すぎます。(始めは\"%s\")\n"
+
+#: pg_rewind.c:189
+#, c-format
+msgid "cannot be executed by \"root\"\n"
+msgstr "\"root\"では実行できません\n"
+
+#: pg_rewind.c:190
+#, c-format
+msgid "You must run %s as the PostgreSQL superuser.\n"
+msgstr "PostgreSQLのスーパーユーザで%sを実行しなければなりません\n"
+
+#: pg_rewind.c:221
+#, c-format
+msgid "source and target cluster are on the same timeline\n"
+msgstr "変換元と変換先のクラスタが同一タイムラインにあります\n"
+
+#: pg_rewind.c:227
+#, c-format
+msgid "servers diverged at WAL position %X/%X on timeline %u\n"
+msgstr "タイムライン%3$uの WALの位置 %1$X/%2$Xでサーバが分岐しています\n"
+
+#: pg_rewind.c:264
+#, c-format
+msgid "no rewind required\n"
+msgstr "巻き戻しは必要ではありません\n"
+
+#: pg_rewind.c:271
+#, c-format
+msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
+msgstr "タイムライン%3$uの %1$X/%2$X で最新の共通チェックポイントから巻き戻しています\n"
+
+#: pg_rewind.c:279
+#, c-format
+msgid "reading source file list\n"
+msgstr "ソースファイルリストを読み込んでいます\n"
+
+#: pg_rewind.c:281
+#, c-format
+msgid "reading target file list\n"
+msgstr "ターゲットファイルリストを読み込んでいます\n"
+
+#: pg_rewind.c:291
+#, c-format
+msgid "reading WAL in target\n"
+msgstr "ターゲットでWALを読み込んでいます\n"
+
+#: pg_rewind.c:308
+#, c-format
+msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
+msgstr "%lu MBをコピーする必要があります(ソースディレクトリサイズの合計は%lu MBです)\n"
+
+#: pg_rewind.c:325
+#, c-format
+msgid ""
+"\n"
+"creating backup label and updating control file\n"
+msgstr ""
+"\n"
+"backup labelを作成して制御ファイルを更新しています\n"
+
+#: pg_rewind.c:353
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "同期しているターゲットデータディレクトリ\n"
+
+#: pg_rewind.c:356
+#, c-format
+msgid "Done!\n"
+msgstr "完了!\n"
+
+#: pg_rewind.c:368
+#, c-format
+msgid "source and target clusters are from different systems\n"
+msgstr "ソースクラスタとターゲットクラスタは異なるシステムのものです\n"
+
+#: pg_rewind.c:376
+#, c-format
+msgid "clusters are not compatible with this version of pg_rewind\n"
+msgstr "クラスタが、pg_rewindのバージョンと一致しません\n"
+
+#: pg_rewind.c:386
+#, c-format
+msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
+msgstr "ターゲットサーバはデータチェックサムを利用するあるいは\"wal_log_hints = onである必要があります\n"
+
+#: pg_rewind.c:397
+#, c-format
+msgid "target server must be shut down cleanly\n"
+msgstr "ターゲットサーバはきれいにシャットダウンしなければなりません\n"
+
+#: pg_rewind.c:407
+#, c-format
+msgid "source data directory must be shut down cleanly\n"
+msgstr "ソースデータディレクトリはきれいにシャットダウンしなければなりません\n"
+
+#: pg_rewind.c:462
+#, c-format
+msgid "invalid control file"
+msgstr "無効な制御ファイル"
+
+#: pg_rewind.c:473
+#, c-format
+msgid "Source timeline history:\n"
+msgstr "ソースタイムラインの履歴\n"
+
+#: pg_rewind.c:475
+#, c-format
+msgid "Target timeline history:\n"
+msgstr "ターゲットタイムラインの履歴:\n"
+
+#. translator: %d is a timeline number, others are LSN positions
+#: pg_rewind.c:489
+#, c-format
+msgid "%d: %X/%X - %X/%X\n"
+msgstr "%d: %X/%X - %X/%X\n"
+
+#: pg_rewind.c:548
+#, c-format
+msgid "could not find common ancestor of the source and target cluster's timelines\n"
+msgstr "ソースクラスタ、ターゲットクラスタのタイムラインの共通の祖先を見つけられません\n"
+
+#: pg_rewind.c:589
+#, c-format
+msgid "backup label buffer too small\n"
+msgstr "バックアップラベルのバッファが小さすぎます\n"
+
+#: pg_rewind.c:612
+#, c-format
+msgid "unexpected control file CRC\n"
+msgstr "想定外の制御ファイル CRC です\n"
+
+#: pg_rewind.c:622
+#, c-format
+msgid "unexpected control file size %d, expected %d\n"
+msgstr "想定外の制御ファイルのサイズ%dです、その期待値は%dです\n"
+
+#: pg_rewind.c:689
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was\n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%sには \"initdb\" プログラムが必要ですが、\"%s\"と同じディレクトリ\n"
+"にありませんでした。\n"
+"インストール状況を確認してください。\n"
+
+#: pg_rewind.c:693
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"\"%s\"がプログラム \"initdb\" を見つけましたが、これは%sと同じ\n"
+"バージョンではありませんでした。\n"
+"インストレーションを検査してください。\n"
+
+#: pg_rewind.c:711
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "ターゲットディレクトリの同期が失敗しました\n"
+
+#: timeline.c:76 timeline.c:82
+#, c-format
+msgid "syntax error in history file: %s\n"
+msgstr "履歴ファイル内の構文エラー: %s\n"
+
+#: timeline.c:77
+#, c-format
+msgid "Expected a numeric timeline ID.\n"
+msgstr "数字の時系列IDを想定しました。\n"
+
+#: timeline.c:83
+#, c-format
+msgid "Expected a transaction log switchpoint location.\n"
+msgstr "トランザクションログの切替えポイントを想定しています。\n"
+
+#: timeline.c:88
+#, c-format
+msgid "invalid data in history file: %s\n"
+msgstr "履歴ファイル内の無効なデータ: %s\n"
+
+#: timeline.c:89
+#, c-format
+msgid "Timeline IDs must be in increasing sequence.\n"
+msgstr "時系列IDは昇順の並びでなければなりません\n"
+
+#: timeline.c:109
+#, c-format
+msgid "invalid data in history file\n"
+msgstr "履歴ファイル内の無効なデータ\n"
+
+#: timeline.c:110
+#, c-format
+msgid "Timeline IDs must be less than child timeline's ID.\n"
+msgstr "時系列IDは副時系列IDより小さくなければなりません。\n"
+
+#: xlogreader.c:276
+#, c-format
+msgid "invalid record offset at %X/%X"
+msgstr "%X/%Xのレコードオフセットが無効です"
+
+#: xlogreader.c:284
+#, c-format
+msgid "contrecord is requested by %X/%X"
+msgstr "%X/%Xではcontrecordが必要です"
+
+#: xlogreader.c:325 xlogreader.c:624
+#, c-format
+msgid "invalid record length at %X/%X: wanted %u, got %u"
+msgstr "%X/%Xのレコード長が無効です:長さは%uである必要がありますが、長さは%uでした"
+
+#: xlogreader.c:340
+#, c-format
+msgid "record length %u at %X/%X too long"
+msgstr "%2$X/%3$Xのレコード長%1$uが大きすぎます"
+
+#: xlogreader.c:381
+#, c-format
+msgid "there is no contrecord flag at %X/%X"
+msgstr "%X/%Xで contrecord フラグがありません"
+
+#: xlogreader.c:394
+#, c-format
+msgid "invalid contrecord length %u at %X/%X"
+msgstr "%2$X/%3$Xのcontrecordの長さ %1$u が無効です"
+
+#: xlogreader.c:632
+#, c-format
+msgid "invalid resource manager ID %u at %X/%X"
+msgstr "%2$X/%3$XのリソースマネージャID %1$uが無効です"
+
+#: xlogreader.c:646 xlogreader.c:663
+#, c-format
+msgid "record with incorrect prev-link %X/%X at %X/%X"
+msgstr "直前のリンク%1$X/%2$Xが不正なレコードが%3$X/%4$Xにあります"
+
+#: xlogreader.c:700
+#, c-format
+msgid "incorrect resource manager data checksum in record at %X/%X"
+msgstr "%X/%Xのレコード内のリソースマネージャデータのチェックサムが不正です"
+
+#: xlogreader.c:733
+#, c-format
+msgid "invalid magic number %04X in log segment %s, offset %u"
+msgstr "ログセグメント%2$s、オフセット%3$uのマジック番号%1$04Xは無効です"
+
+#: xlogreader.c:747 xlogreader.c:798
+#, c-format
+msgid "invalid info bits %04X in log segment %s, offset %u"
+msgstr "ログセグメント %2$s、オフセット %3$u の情報ビット %1$04X は無効です"
+
+#: xlogreader.c:773
+#, c-format
+msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
+msgstr "WAL ファイルは異なるデータベースシステム由来ものです: WAL ファイルにおけるデータベースシステムの識別子は %s で、pg_control におけるデータベースシステムの識別子は %s です。"
+
+#: xlogreader.c:780
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
+msgstr "WAL ファイルは異なるデータベースシステム由来のものです: ページヘッダーのXLOG_SEG_SIZEが正しくありません"
+
+#: xlogreader.c:786
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
+msgstr "WAL ファイルは異なるデータベースシステム由来のものです: ページヘッダーのXLOG_BLCKSZが正しくありません"
+
+#: xlogreader.c:812
+#, c-format
+msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
+msgstr "ログセグメント%3$s、オフセット%4$uのページアドレス%1$X/%2$Xは想定外です"
+
+#: xlogreader.c:837
+#, c-format
+msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
+msgstr "ログセグメント%3$s、オフセット%4$uの時系列ID %1$u(%2$uの後)は順序に従っていません"
+
+#: xlogreader.c:1081
+#, c-format
+msgid "out-of-order block_id %u at %X/%X"
+msgstr "block_id %uが%X/%Xで無効です"
+
+#: xlogreader.c:1103
+#, c-format
+msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
+msgstr "BKPBLOCK_HAS_DATAが設定されていますが、%X/%Xにデータがありません"
+
+#: xlogreader.c:1110
+#, c-format
+msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
+msgstr "BKPBLOCK_HAS_DATAが設定されていませんが、%2$X/%3$Xのデータ長は%1$uです"
+
+#: xlogreader.c:1143
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLEが設定されていますが、%4$X/%5$Xでホールオフセット%1$u、長さ%2$u、ブロックイメージ長%3$uです"
+
+#: xlogreader.c:1159
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLEが設定されていませんが、%3$X/%4$Xにおけるホールオフセット%1$uの長さが%2$uです"
+
+#: xlogreader.c:1174
+#, c-format
+msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
+msgstr "BKPIMAGE_IS_COMPRESSEDが設定されていますが、%2$X/%3$Xにおいてブロックイメージ長が%1$uです"
+
+#: xlogreader.c:1189
+#, c-format
+msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLEもBKPIMAGE_IS_COMPRESSEDも設定されていませんが、%2$X/%3$Xにおいてブロックイメージ長が%1$uです"
+
+#: xlogreader.c:1205
+#, c-format
+msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
+msgstr "BKPBLOCK_SAME_RELが設定されていますが、%X/%Xにおいて以前のリレーションがありません"
+
+#: xlogreader.c:1217
+#, c-format
+msgid "invalid block_id %u at %X/%X"
+msgstr "%2$X/%3$Xにおけるblock_id %1$uが無効です"
+
+#: xlogreader.c:1282
+#, c-format
+msgid "record with invalid length at %X/%X"
+msgstr "%X/%Xのレコードのサイズが無効です"
+
+#: xlogreader.c:1371
+#, c-format
+msgid "invalid compressed image at %X/%X, block %d"
+msgstr "%X/%X、ブロック %d での圧縮イメージが無効です"
diff --git a/src/bin/pg_rewind/po/ko.po b/src/bin/pg_rewind/po/ko.po
index a0aec813536..36f7c1ca877 100644
--- a/src/bin/pg_rewind/po/ko.po
+++ b/src/bin/pg_rewind/po/ko.po
@@ -1,14 +1,14 @@
# LANGUAGE message translation file for pg_rewind
# Copyright (C) 2015 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# Ioseph Kim <ioseph@uri.sarang.net>, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
+"Project-Id-Version: pg_rewind (PostgreSQL) 9.6\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-12-25 23:16+0900\n"
-"PO-Revision-Date: 2015-12-27 23:49+0900\n"
+"POT-Creation-Date: 2016-09-26 14:02+0900\n"
+"PO-Revision-Date: 2016-09-26 18:50+0900\n"
"Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
"Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
"Language: ko\n"
@@ -112,7 +112,7 @@ msgstr "\"%s\" 원본 파일을 열 수 없음: %s\n"
msgid "could not seek in source file: %s\n"
msgstr "원본 파일에서 seek 작업을 할 수 없음: %s\n"
-#: copy_fetch.c:192 file_ops.c:301
+#: copy_fetch.c:192 file_ops.c:300
#, c-format
msgid "could not read file \"%s\": %s\n"
msgstr "\"%s\" 파일을 읽을 수 없음: %s\n"
@@ -127,6 +127,11 @@ msgstr "\"%s\" 파일을 읽는 중 예상치 못한 EOF\n"
msgid "could not close file \"%s\": %s\n"
msgstr "\"%s\" 파일을 닫을 수 없음: %s\n"
+#: datapagemap.c:124
+#, c-format
+msgid " block %u\n"
+msgstr " 블록 %u\n"
+
#: file_ops.c:64
#, c-format
msgid "could not open target file \"%s\": %s\n"
@@ -137,57 +142,57 @@ msgstr "\"%s\" 대상 파일을 열 수 없음: %s\n"
msgid "could not close target file \"%s\": %s\n"
msgstr "\"%s\" 대상 파일을 닫을 수 없음: %s\n"
-#: file_ops.c:99
+#: file_ops.c:98
#, c-format
msgid "could not seek in target file \"%s\": %s\n"
msgstr "\"%s\" 대상 파일에서 seek 작업을 할 수 없음: %s\n"
-#: file_ops.c:115
+#: file_ops.c:114
#, c-format
msgid "could not write file \"%s\": %s\n"
msgstr "\"%s\" 파일 쓰기 실패: %s\n"
-#: file_ops.c:165
+#: file_ops.c:164
#, c-format
msgid "invalid action (CREATE) for regular file\n"
msgstr "일반 파일에 대한 잘못 된 작업 (CREATE)\n"
-#: file_ops.c:180
+#: file_ops.c:179
#, c-format
msgid "could not remove file \"%s\": %s\n"
msgstr "\"%s\" 파일을 삭제할 수 없음: %s\n"
-#: file_ops.c:197
+#: file_ops.c:196
#, c-format
msgid "could not open file \"%s\" for truncation: %s\n"
msgstr "트랙잭션을 위한 \"%s\" 파일을 열 수 없음: %s\n"
-#: file_ops.c:201
+#: file_ops.c:200
#, c-format
msgid "could not truncate file \"%s\" to %u: %s\n"
msgstr "\"%s\" 파일을 %u 크기로 정리할 수 없음: %s\n"
-#: file_ops.c:217
+#: file_ops.c:216
#, c-format
msgid "could not create directory \"%s\": %s\n"
msgstr "\"%s\" 디렉터리를 만들 수 없음: %s\n"
-#: file_ops.c:231
+#: file_ops.c:230
#, c-format
msgid "could not remove directory \"%s\": %s\n"
msgstr "\"%s\" 디렉터리를 삭제 할 수 없음: %s\n"
-#: file_ops.c:245
+#: file_ops.c:244
#, c-format
msgid "could not create symbolic link at \"%s\": %s\n"
msgstr "\"%s\"에 대한 심볼릭 링크를 만들 수 없음: %s\n"
-#: file_ops.c:259
+#: file_ops.c:258
#, c-format
msgid "could not remove symbolic link \"%s\": %s\n"
msgstr "\"%s\" 심볼릭 링크를 삭제 할 수 없음: %s\n"
-#: file_ops.c:289 file_ops.c:293
+#: file_ops.c:288 file_ops.c:292
#, c-format
msgid "could not open file \"%s\" for reading: %s\n"
msgstr "읽기를 위한 \"%s\" 파일을 열 수 없음: %s\n"
@@ -222,6 +227,12 @@ msgstr "원본 파일 목록이 비었음\n"
msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
msgstr "디텍터리나 심볼릭 링크 \"%s\" 의 페이지 변경 정보가 잘못 됨\n"
+#. translator: first %s is a file path, second is a keyword such as COPY
+#: filemap.c:537
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
#: libpq_fetch.c:55
#, c-format
msgid "could not connect to server: %s"
@@ -392,22 +403,22 @@ msgstr "%X/%X 위치에서 이전 WAL 레코드를 찾을 수 없음: %s\n"
msgid "could not find previous WAL record at %X/%X\n"
msgstr "%X/%X 위치에서 이전 WAL 레코드를 찾을 수 없음\n"
-#: parsexlog.c:268
+#: parsexlog.c:283
#, c-format
msgid "could not open file \"%s\": %s\n"
msgstr "\"%s\" 파일을 열 수 없음: %s\n"
-#: parsexlog.c:282
+#: parsexlog.c:297
#, c-format
msgid "could not seek in file \"%s\": %s\n"
msgstr "\"%s\" 파일의 seek 작업을 할 수 없음: %s\n"
-#: parsexlog.c:289
+#: parsexlog.c:304
#, c-format
msgid "could not read from file \"%s\": %s\n"
msgstr "\"%s\" 파일을 읽을 수 없음: %s\n"
-#: parsexlog.c:357
+#: parsexlog.c:372
#, c-format
msgid ""
"WAL record modifies a relation, but record type is not recognized\n"
@@ -416,7 +427,7 @@ msgstr ""
"WAL 레코드가 릴레이션을 변경하려고 하지만, 레코드 형태가 올바르지 않음\n"
"lsn: %X/%X, rmgr: %s, info: %02X\n"
-#: pg_rewind.c:59
+#: pg_rewind.c:64
#, c-format
msgid ""
"%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
@@ -426,7 +437,7 @@ msgstr ""
"니다.\n"
"\n"
-#: pg_rewind.c:60
+#: pg_rewind.c:65
#, c-format
msgid ""
"Usage:\n"
@@ -437,54 +448,54 @@ msgstr ""
" %s [옵션]...\n"
"\n"
-#: pg_rewind.c:61
+#: pg_rewind.c:66
#, c-format
msgid "Options:\n"
msgstr "옵션들:\n"
-#: pg_rewind.c:62
+#: pg_rewind.c:67
#, c-format
msgid " -D, --target-pgdata=DIRECTORY existing data directory to modify\n"
msgstr " -D, --target-pgdata=디렉터리 변경하려는 데이터 디렉터리\n"
-#: pg_rewind.c:63
+#: pg_rewind.c:68
#, c-format
msgid ""
" --source-pgdata=DIRECTORY source data directory to synchronize with\n"
msgstr " --source-pgdata=디렉터리 동기화 원본이 되는 데이터 디렉터리\n"
-#: pg_rewind.c:64
+#: pg_rewind.c:69
#, c-format
msgid " --source-server=CONNSTR source server to synchronize with\n"
msgstr " --source-server=연결문자열 원본 서버 접속 정보\n"
-#: pg_rewind.c:65
+#: pg_rewind.c:70
#, c-format
msgid " -n, --dry-run stop before modifying anything\n"
msgstr " -n, --dry-run 변경 작업 전에 멈춤(검사, 확인용)\n"
-#: pg_rewind.c:66
+#: pg_rewind.c:71
#, c-format
msgid " -P, --progress write progress messages\n"
msgstr " -P, --progress 진행 과정 메시지를 보여줌\n"
-#: pg_rewind.c:67
+#: pg_rewind.c:72
#, c-format
msgid " --debug write a lot of debug messages\n"
msgstr " --debug 디버그 메시지를 보여줌\n"
-#: pg_rewind.c:68
+#: pg_rewind.c:73
#, c-format
msgid ""
" -V, --version output version information, then exit\n"
msgstr " -V, --version 버전 정보를 보여주고 마침\n"
-#: pg_rewind.c:69
+#: pg_rewind.c:74
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 이 도움말을 보여주고 마침\n"
-#: pg_rewind.c:70
+#: pg_rewind.c:75
#, c-format
msgid ""
"\n"
@@ -493,80 +504,80 @@ msgstr ""
"\n"
"오류보고: <pgsql-bugs@postgresql.org>.\n"
-#: pg_rewind.c:125 pg_rewind.c:156 pg_rewind.c:163 pg_rewind.c:171
+#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:176
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "자제한 사항은 \"%s --help\" 명령으로 살펴보십시오.\n"
-#: pg_rewind.c:155
+#: pg_rewind.c:160
#, c-format
msgid "%s: no source specified (--source-pgdata or --source-server)\n"
msgstr ""
"%s: 원본을 지정하지 않았음 (--source-pgdata 또는 --source-server 옵션을 지정 "
"해야 함)\n"
-#: pg_rewind.c:162
+#: pg_rewind.c:167
#, c-format
msgid "%s: no target data directory specified (--target-pgdata)\n"
msgstr ""
"%s: 대상 데이터 디렉토리가 지정되지 않았음 (--target-pgdata 옵션 사용)\n"
-#: pg_rewind.c:169
+#: pg_rewind.c:174
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 너무 많은 명령행 인수를 지정했습니다. (처음 \"%s\")\n"
-#: pg_rewind.c:184
+#: pg_rewind.c:189
#, c-format
msgid "cannot be executed by \"root\"\n"
msgstr "\"root\" 계정으로는 실행 할 수 없음\n"
-#: pg_rewind.c:185
+#: pg_rewind.c:190
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "PostgreSQL superuser로 %s 프로그램을 실행하십시오.\n"
-#: pg_rewind.c:216
+#: pg_rewind.c:221
#, c-format
msgid "source and target cluster are on the same timeline\n"
msgstr "원본과 대상 클러스터의 타임라인이 같음\n"
-#: pg_rewind.c:222
+#: pg_rewind.c:227
#, c-format
msgid "servers diverged at WAL position %X/%X on timeline %u\n"
msgstr "서버 분기 위치: %X/%X, 타임라인 %u\n"
-#: pg_rewind.c:258
+#: pg_rewind.c:264
#, c-format
msgid "no rewind required\n"
msgstr "되감을 필요 없음\n"
-#: pg_rewind.c:264
+#: pg_rewind.c:271
#, c-format
msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
msgstr "재동기화 시작함, 마지막 체크포인트 위치 %X/%X, 타임라인 %u\n"
-#: pg_rewind.c:272
+#: pg_rewind.c:279
#, c-format
msgid "reading source file list\n"
msgstr "원본 파일 목록 읽는 중\n"
-#: pg_rewind.c:274
+#: pg_rewind.c:281
#, c-format
msgid "reading target file list\n"
msgstr "대상 파일 목록 읽는 중\n"
-#: pg_rewind.c:284
+#: pg_rewind.c:291
#, c-format
msgid "reading WAL in target\n"
msgstr "대상 서버에서 WAL 읽는 중\n"
-#: pg_rewind.c:301
+#: pg_rewind.c:308
#, c-format
msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
msgstr "복사를 위해서 %lu MB 필요함 (원본 디렉토리 전체 크기는 %lu MB)\n"
-#: pg_rewind.c:318
+#: pg_rewind.c:325
#, c-format
msgid ""
"\n"
@@ -575,22 +586,27 @@ msgstr ""
"\n"
"백업 라벨을 만들고, 컨트롤 파일을 갱신 중\n"
-#: pg_rewind.c:346
+#: pg_rewind.c:353
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "대상 데이터 디렉터리 동기화 중\n"
+
+#: pg_rewind.c:356
#, c-format
msgid "Done!\n"
msgstr "완료!\n"
-#: pg_rewind.c:358
+#: pg_rewind.c:368
#, c-format
msgid "source and target clusters are from different systems\n"
msgstr "원본과 대상 클러스터의 데이터 클러스터의 식별 번호가 다름\n"
-#: pg_rewind.c:366
+#: pg_rewind.c:376
#, c-format
msgid "clusters are not compatible with this version of pg_rewind\n"
msgstr "해당 클러스터는 이 pg_rewind 버전으로 작업할 수 없음\n"
-#: pg_rewind.c:376
+#: pg_rewind.c:386
#, c-format
msgid ""
"target server needs to use either data checksums or \"wal_log_hints = on\"\n"
@@ -598,37 +614,85 @@ msgstr ""
"대상 서버의 데이터 클러스터가 데이터 체크섬 기능을 켰거나, \"wal_log_hints "
"= on\" 설정이 되어야 함\n"
-#: pg_rewind.c:387
+#: pg_rewind.c:397
#, c-format
msgid "target server must be shut down cleanly\n"
msgstr "대상 서버는 정상 종료되어야 함\n"
-#: pg_rewind.c:397
+#: pg_rewind.c:407
#, c-format
msgid "source data directory must be shut down cleanly\n"
msgstr "원본 데이터 디렉토리는 정상적으로 종료되어야 함\n"
-#: pg_rewind.c:464
+#: pg_rewind.c:462
+#, c-format
+msgid "invalid control file"
+msgstr "잘못된 컨트롤 파일"
+
+#: pg_rewind.c:473
+#, c-format
+msgid "Source timeline history:\n"
+msgstr "원본 타임라인 내역:\n"
+
+#: pg_rewind.c:475
+#, c-format
+msgid "Target timeline history:\n"
+msgstr "대상 타임라인 내역:\n"
+
+#. translator: %d is a timeline number, others are LSN positions
+#: pg_rewind.c:489
+#, c-format
+msgid "%d: %X/%X - %X/%X\n"
+msgstr "%d: %X/%X - %X/%X\n"
+
+#: pg_rewind.c:548
#, c-format
msgid ""
"could not find common ancestor of the source and target cluster's timelines\n"
msgstr "원본과 대상 서버의 공통된 상위 타임라인을 찾을 수 없음\n"
-#: pg_rewind.c:504
+#: pg_rewind.c:589
#, c-format
msgid "backup label buffer too small\n"
msgstr "백업 라벨 버퍼가 너무 작음\n"
-#: pg_rewind.c:526
+#: pg_rewind.c:612
#, c-format
msgid "unexpected control file CRC\n"
msgstr "컨트롤 파일 CRC 오류\n"
-#: pg_rewind.c:536
+#: pg_rewind.c:622
#, c-format
msgid "unexpected control file size %d, expected %d\n"
msgstr "컨트롤 파일의 크기가 %d 로 비정상, 정상값 %d\n"
+#: pg_rewind.c:689
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was\n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s 프로그램은 \"initdb\" 프로그램이 필요하지만\n"
+"\"%s\" 디렉터리 안에 없습니다.\n"
+"설치 상태를 확인해 주십시오.\n"
+
+#: pg_rewind.c:693
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"\"%s\" 프로그램은 \"initdb\" 프로그램이 필요해서 찾았지만 이 파일은\n"
+"%s 버전과 같지 않습니다.\n"
+"설치 상태를 확인해 주십시오.\n"
+
+#: pg_rewind.c:711
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "대상 디렉터리 동기화 실패\n"
+
#: timeline.c:76 timeline.c:82
#, c-format
msgid "syntax error in history file: %s\n"
@@ -664,62 +728,62 @@ msgstr "내역 파일에 잘못된 자료가 있음\n"
msgid "Timeline IDs must be less than child timeline's ID.\n"
msgstr "타임라인 ID는 하위 타임라인 ID보다 적어야 함\n"
-#: xlogreader.c:264
+#: xlogreader.c:276
#, c-format
msgid "invalid record offset at %X/%X"
msgstr "잘못된 레코드 위치: %X/%X"
-#: xlogreader.c:272
+#: xlogreader.c:284
#, c-format
msgid "contrecord is requested by %X/%X"
msgstr "%X/%X에서 contrecord를 필요로 함"
-#: xlogreader.c:312 xlogreader.c:603
+#: xlogreader.c:325 xlogreader.c:624
#, c-format
-msgid "invalid record length at %X/%X"
-msgstr "잘못된 레코드 길이: %X/%X"
+msgid "invalid record length at %X/%X: wanted %u, got %u"
+msgstr "잘못된 레코드 길이: %X/%X, 기대값 %u, 실재값 %u"
-#: xlogreader.c:326
+#: xlogreader.c:340
#, c-format
msgid "record length %u at %X/%X too long"
msgstr "너무 긴 길이(%u)의 레코드가 %X/%X에 있음"
-#: xlogreader.c:367
+#: xlogreader.c:381
#, c-format
msgid "there is no contrecord flag at %X/%X"
msgstr "%X/%X 위치에 contrecord 플래그가 없음"
-#: xlogreader.c:380
+#: xlogreader.c:394
#, c-format
msgid "invalid contrecord length %u at %X/%X"
msgstr "잘못된 contrecord 길이 %u, 위치 %X/%X"
-#: xlogreader.c:610
+#: xlogreader.c:632
#, c-format
msgid "invalid resource manager ID %u at %X/%X"
msgstr "잘못된 자원 관리 ID %u, 위치: %X/%X"
-#: xlogreader.c:624 xlogreader.c:641
+#: xlogreader.c:646 xlogreader.c:663
#, c-format
msgid "record with incorrect prev-link %X/%X at %X/%X"
msgstr "레코드의 잘못된 프리링크 %X/%X, 해당 레코드 %X/%X"
-#: xlogreader.c:678
+#: xlogreader.c:700
#, c-format
msgid "incorrect resource manager data checksum in record at %X/%X"
msgstr "잘못된 자원관리자 데이터 체크섬, 위치: %X/%X 레코드"
-#: xlogreader.c:711
+#: xlogreader.c:733
#, c-format
msgid "invalid magic number %04X in log segment %s, offset %u"
msgstr "%04X 매직 번호가 잘못됨, 로그 파일 %s, 위치 %u"
-#: xlogreader.c:725 xlogreader.c:776
+#: xlogreader.c:747 xlogreader.c:798
#, c-format
msgid "invalid info bits %04X in log segment %s, offset %u"
msgstr "잘못된 정보 비트 %04X, 로그 파일 %s, 위치 %u"
-#: xlogreader.c:751
+#: xlogreader.c:773
#, c-format
msgid ""
"WAL file is from different database system: WAL file database system "
@@ -728,7 +792,7 @@ msgstr ""
"WAL 파일이 다른 시스템의 것입니다. WAL 파일의 시스템 식별자는 %s, pg_control "
"의 식별자는 %s"
-#: xlogreader.c:758
+#: xlogreader.c:780
#, c-format
msgid ""
"WAL file is from different database system: incorrect XLOG_SEG_SIZE in page "
@@ -737,7 +801,7 @@ msgstr ""
"WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더의 XLOG_SEG_SIZE "
"값이 바르지 않음"
-#: xlogreader.c:764
+#: xlogreader.c:786
#, c-format
msgid ""
"WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -746,71 +810,73 @@ msgstr ""
"WAL 파일이 다른 데이터베이스 시스템의 것입니다: 페이지 헤더의 XLOG_BLCKSZ 값"
"이 바르지 않음"
-#: xlogreader.c:790
+#: xlogreader.c:812
#, c-format
msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
msgstr "잘못된 페이지 주소 %X/%X, 로그 파일 %s, 위치 %u"
-#: xlogreader.c:815
+#: xlogreader.c:837
#, c-format
msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
msgstr "타임라인 범위 벗어남 %u (이전 번호 %u), 로그 파일 %s, 위치 %u"
-#: xlogreader.c:1024
+#: xlogreader.c:1081
#, c-format
msgid "out-of-order block_id %u at %X/%X"
msgstr "%u block_id는 범위를 벗어남, 위치 %X/%X"
-#: xlogreader.c:1046
+#: xlogreader.c:1103
#, c-format
msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
msgstr "BKPBLOCK_HAS_DATA 지정했지만, %X/%X 에 자료가 없음"
-#: xlogreader.c:1053
+#: xlogreader.c:1110
#, c-format
msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
msgstr "BKPBLOCK_HAS_DATA 지정 않았지만, %u 길이의 자료가 있음, 위치 %X/%X"
-#: xlogreader.c:1086
+#: xlogreader.c:1143
#, c-format
msgid ""
"BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
"%X/%X"
-msgstr ""
+msgstr "BKPIMAGE_HAS_HOLE 설정이 되어 있지만, 옵셋: %u, 길이: %u, "
+"블록 이미지 길이: %u, 대상: %X/%X"
-#: xlogreader.c:1102
+#: xlogreader.c:1159
#, c-format
msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
-msgstr ""
+msgstr "BKPIMAGE_HAS_HOLE 설정이 안되어 있지만, 옵셋: %u, 길이: %u, 대상: %X/%X"
-#: xlogreader.c:1117
+#: xlogreader.c:1174
#, c-format
msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
-msgstr ""
+msgstr "BKPIMAGE_IS_COMPRESSED 설정이 되어 있지만, 블록 이미지 길이: %u, 대상: %X/%X"
-#: xlogreader.c:1132
+#: xlogreader.c:1189
#, c-format
msgid ""
"neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image "
"length is %u at %X/%X"
-msgstr ""
+msgstr "BKPIMAGE_HAS_HOLE, BKPIMAGE_IS_COMPRESSED 지정 안되어 있으나, 블록 "
+"이미지 길이는 %u, 대상: %X/%X"
-#: xlogreader.c:1148
+#: xlogreader.c:1205
#, c-format
msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
-msgstr ""
+msgstr "BKPBLOCK_SAME_REL 설정이 되어 있지만, %X/%X 에 이전 릴레이션 없음"
-#: xlogreader.c:1160
+#: xlogreader.c:1217
#, c-format
msgid "invalid block_id %u at %X/%X"
msgstr "잘못된 block_id %u, 위치 %X/%X"
-#: xlogreader.c:1225
+#: xlogreader.c:1282
#, c-format
msgid "record with invalid length at %X/%X"
msgstr "잘못된 레코드 길이, 위치 %X/%X"
-#: xlogreader.c:1314
+#: xlogreader.c:1371
#, c-format
msgid "invalid compressed image at %X/%X, block %d"
msgstr "잘못된 압축 이미지, 위치 %X/%X, 블록 %d"
diff --git a/src/bin/pg_rewind/po/pl.po b/src/bin/pg_rewind/po/pl.po
index 80d45d77658..06b83d7fe8b 100644
--- a/src/bin/pg_rewind/po/pl.po
+++ b/src/bin/pg_rewind/po/pl.po
@@ -2,13 +2,13 @@
# Copyright (C) 2015 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-# grzegorz <begina.felicysym@wp.eu>, 2015, 2016.
+# grzegorz <begina.felicysym@wp.eu>, 2015, 2016, 2017.
msgid ""
msgstr ""
"Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-07-03 03:14+0000\n"
-"PO-Revision-Date: 2016-07-04 20:38+0200\n"
+"POT-Creation-Date: 2017-03-14 17:46+0000\n"
+"PO-Revision-Date: 2017-03-14 19:38+0200\n"
"Last-Translator: grzegorz <begina.felicysym@wp.eu>\n"
"Language-Team: begina.felicysym@wp.eu\n"
"Language: pl\n"
@@ -66,62 +66,63 @@ msgstr "%s: nie udało się ponownie wykonać ograniczonego tokena: %lu\n"
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr "%s: nie udało uzyskać kodu wyjścia z usługi podrzędnej: kod błędu %lu\n"
-#: copy_fetch.c:64
+#: copy_fetch.c:62
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "nie można otworzyć katalogu \"%s\": %s\n"
-#: copy_fetch.c:93 filemap.c:112 filemap.c:267
+#: copy_fetch.c:91 filemap.c:111 filemap.c:266
#, c-format
msgid "could not stat file \"%s\": %s\n"
msgstr "nie można wykonać stat na pliku \"%s\": %s\n"
-#: copy_fetch.c:122
+#: copy_fetch.c:120
#, c-format
msgid "could not read symbolic link \"%s\": %s\n"
msgstr "nie można odczytać linku symbolicznego \"%s\": %s\n"
-#: copy_fetch.c:125
+#: copy_fetch.c:123
#, c-format
msgid "symbolic link \"%s\" target is too long\n"
msgstr "cel linku symbolicznego \"%s\" jest za długi\n"
-#: copy_fetch.c:140
+#: copy_fetch.c:138
#, c-format
msgid "\"%s\" is a symbolic link, but symbolic links are not supported on this platform\n"
-msgstr "\"%s\" jest dowiązaniem symbolicznym, ale linki symboliczne nie są obsługiwane na tej platformie\n"
+msgstr "\"%s\" jest dowiązaniem symbolicznym, ale linki symboliczne nie są obsługiwane "
+"na tej platformie\n"
-#: copy_fetch.c:147
+#: copy_fetch.c:145
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "nie można czytać katalogu \"%s\": %s\n"
-#: copy_fetch.c:151
+#: copy_fetch.c:149
#, c-format
msgid "could not close directory \"%s\": %s\n"
msgstr "nie można zamknąć katalogu \"%s\": %s\n"
-#: copy_fetch.c:171
+#: copy_fetch.c:169
#, c-format
msgid "could not open source file \"%s\": %s\n"
msgstr "nie można otworzyć pliku źródłowego \"%s\": %s\n"
-#: copy_fetch.c:175
+#: copy_fetch.c:173
#, c-format
msgid "could not seek in source file: %s\n"
msgstr "nie można pozycjonować w pliku wyjścia %s\n"
-#: copy_fetch.c:192 file_ops.c:300
+#: copy_fetch.c:190 file_ops.c:299
#, c-format
msgid "could not read file \"%s\": %s\n"
msgstr "nie można czytać pliku \"%s\": %s\n"
-#: copy_fetch.c:195
+#: copy_fetch.c:193
#, c-format
msgid "unexpected EOF while reading file \"%s\"\n"
msgstr "nieoczekiwany EOF podczas czytania pliku \"%s\"\n"
-#: copy_fetch.c:202
+#: copy_fetch.c:200
#, c-format
msgid "could not close file \"%s\": %s\n"
msgstr "nie można zamknąć pliku \"%s\": %s\n"
@@ -131,105 +132,104 @@ msgstr "nie można zamknąć pliku \"%s\": %s\n"
msgid " block %u\n"
msgstr " blok %u\n"
-#: file_ops.c:64
+#: file_ops.c:63
#, c-format
msgid "could not open target file \"%s\": %s\n"
msgstr "nie można otworzyć pliku docelowego \"%s\": %s\n"
-#: file_ops.c:78
+#: file_ops.c:77
#, c-format
msgid "could not close target file \"%s\": %s\n"
msgstr "nie można zamknąć pliku docelowego \"%s\": %s\n"
-#: file_ops.c:98
+#: file_ops.c:97
#, c-format
msgid "could not seek in target file \"%s\": %s\n"
msgstr "nie można przeszukiwać pliku docelowego \"%s\": %s\n"
-#: file_ops.c:114
+#: file_ops.c:113
#, c-format
msgid "could not write file \"%s\": %s\n"
msgstr "nie można pisać do pliku \"%s\": %s\n"
-#: file_ops.c:164
+#: file_ops.c:163
#, c-format
msgid "invalid action (CREATE) for regular file\n"
msgstr "nieprawidłowe działanie (CREATE) dla zwykłego pliku\n"
-#: file_ops.c:179
+#: file_ops.c:178
#, c-format
msgid "could not remove file \"%s\": %s\n"
msgstr "nie można usunąć pliku \"%s\": %s\n"
-#: file_ops.c:196
+#: file_ops.c:195
#, c-format
msgid "could not open file \"%s\" for truncation: %s\n"
msgstr "nie można otworzyć pliku \"%s\" do obcięcia: %s\n"
-#: file_ops.c:200
+#: file_ops.c:199
#, c-format
msgid "could not truncate file \"%s\" to %u: %s\n"
msgstr "nie można obciąć pliku \"%s\" do %u: %s\n"
-#: file_ops.c:216
+#: file_ops.c:215
#, c-format
msgid "could not create directory \"%s\": %s\n"
msgstr "nie można utworzyć folderu \"%s\": %s\n"
-#: file_ops.c:230
+#: file_ops.c:229
#, c-format
msgid "could not remove directory \"%s\": %s\n"
msgstr "nie można usunąć folderu \"%s\": %s\n"
-#: file_ops.c:244
+#: file_ops.c:243
#, c-format
msgid "could not create symbolic link at \"%s\": %s\n"
msgstr "nie można utworzyć linku symbolicznego na \"%s\": %s\n"
-#: file_ops.c:258
+#: file_ops.c:257
#, c-format
msgid "could not remove symbolic link \"%s\": %s\n"
msgstr "nie można usunąć linku symbolicznego \"%s\": %s\n"
-#: file_ops.c:288 file_ops.c:292
+#: file_ops.c:287 file_ops.c:291
#, c-format
msgid "could not open file \"%s\" for reading: %s\n"
msgstr "nie można otworzyć pliku \"%s\" do odczytu: %s\n"
-#: filemap.c:104
+#: filemap.c:103
#, c-format
msgid "data file \"%s\" in source is not a regular file\n"
msgstr "plik danych źródła \"%s\" nie jest zwykłym plikiem\n"
-#: filemap.c:126
+#: filemap.c:125
#, c-format
msgid "\"%s\" is not a directory\n"
msgstr "\"%s\" nie jest katalogiem\n"
-#: filemap.c:149
+#: filemap.c:148
#, c-format
msgid "\"%s\" is not a symbolic link\n"
msgstr "\"%s\" nie jest dowiązaniem symbolicznym\n"
-#: filemap.c:161
+#: filemap.c:160
#, c-format
msgid "\"%s\" is not a regular file\n"
msgstr "\"%s\" nie jest zwykłym plikiem\n"
-#: filemap.c:279
+#: filemap.c:278
#, c-format
msgid "source file list is empty\n"
msgstr "źródłowa lista plików jest pusta\n"
-#: filemap.c:401
+#: filemap.c:400
#, c-format
msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
msgstr "nieoczekiwana modyfikacja strony dla folderu lub linku symbolicznego \"%s\"\n"
#. translator: first %s is a file path, second is a keyword such as COPY
-#: filemap.c:537
+#: filemap.c:536
#, c-format
-#| msgid "%s (%s/%s) "
msgid "%s (%s)\n"
msgstr "%s (%s)\n"
@@ -253,122 +253,128 @@ msgstr "serwer źródłowy nie może być w trybie odzyskiwania\n"
msgid "full_page_writes must be enabled in the source server\n"
msgstr "full_page_writes musi być włączony na serwerze źródłowym\n"
-#: libpq_fetch.c:95
+#: libpq_fetch.c:90
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "nie można ustawić kontekstu połączenia: %s"
+
+#: libpq_fetch.c:108
#, c-format
msgid "error running query (%s) in source server: %s"
msgstr "błąd wykonania zapytania (%s) na serwerze źródłowym: %s"
-#: libpq_fetch.c:100
+#: libpq_fetch.c:113
#, c-format
msgid "unexpected result set from query\n"
msgstr "nieoczekiwany zbiór wynikowy z zapytania\n"
-#: libpq_fetch.c:123
+#: libpq_fetch.c:136
#, c-format
msgid "unrecognized result \"%s\" for current WAL insert location\n"
msgstr "nierozpoznany wynik \"%s\" dla bieżącego położenia wstawiania WAL\n"
-#: libpq_fetch.c:173
+#: libpq_fetch.c:186
#, c-format
msgid "could not fetch file list: %s"
msgstr "nie można pobrać listy plików: %s"
-#: libpq_fetch.c:178
+#: libpq_fetch.c:191
#, c-format
msgid "unexpected result set while fetching file list\n"
msgstr "nieoczekiwana zbiór wynikowy przy pobieraniu listy plików\n"
-#: libpq_fetch.c:226
+#: libpq_fetch.c:239
#, c-format
msgid "could not send query: %s"
msgstr "nie udało się wysłać zapytania: %s"
-#: libpq_fetch.c:228
+#: libpq_fetch.c:241
#, c-format
msgid "getting file chunks\n"
msgstr "pobieranie kawałków pliku\n"
-#: libpq_fetch.c:231
+#: libpq_fetch.c:244
#, c-format
msgid "could not set libpq connection to single row mode\n"
msgstr "nie można ustalić połączenia libpq na tryb pojedynczego wiersza\n"
-#: libpq_fetch.c:251
+#: libpq_fetch.c:264
#, c-format
msgid "unexpected result while fetching remote files: %s"
msgstr "nieoczekiwany wynik przy pobieraniu plików zdalnych: %s"
-#: libpq_fetch.c:257
+#: libpq_fetch.c:270
#, c-format
msgid "unexpected result set size while fetching remote files\n"
msgstr "nieoczekiwana długość zbioru wynikowego przy pobieraniu plików zdalnych\n"
-#: libpq_fetch.c:263
+#: libpq_fetch.c:276
#, c-format
msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
-msgstr "nieoczekiwane typy danych w zbiorze wartości przy pobieraniu plików zdalnych: %u %u %u\n"
+msgstr "nieoczekiwane typy danych w zbiorze wartości przy pobieraniu plików "
+"zdalnych: %u %u %u\n"
-#: libpq_fetch.c:271
+#: libpq_fetch.c:284
#, c-format
msgid "unexpected result format while fetching remote files\n"
msgstr "nieoczekiwany format wyniku przy pobieraniu plików zdalnych\n"
-#: libpq_fetch.c:277
+#: libpq_fetch.c:290
#, c-format
msgid "unexpected null values in result while fetching remote files\n"
msgstr "nieoczekiwane wartości puste przy pobieraniu plików zdalnych\n"
-#: libpq_fetch.c:281
+#: libpq_fetch.c:294
#, c-format
msgid "unexpected result length while fetching remote files\n"
msgstr "nieoczekiwana długość wyniku przy pobieraniu plików zdalnych\n"
-#: libpq_fetch.c:303
+#: libpq_fetch.c:316
#, c-format
msgid "received null value for chunk for file \"%s\", file has been deleted\n"
msgstr "otrzymano wartość null dla pliku \"%s\", plik został usunięty\n"
-#: libpq_fetch.c:310
+#: libpq_fetch.c:323
#, c-format
msgid "received chunk for file \"%s\", offset %d, size %d\n"
msgstr "otrzymany kawałek pliku \"%s\", pozycja %d, rozmiar %d\n"
-#: libpq_fetch.c:339
+#: libpq_fetch.c:352
#, c-format
msgid "could not fetch remote file \"%s\": %s"
msgstr "nie można pobrać pliku zdalnego \"%s\": %s"
-#: libpq_fetch.c:344
+#: libpq_fetch.c:357
#, c-format
msgid "unexpected result set while fetching remote file \"%s\"\n"
msgstr "nieoczekiwany zbiór wynikowy przy pobieraniu pliku zdalnego: \"%s\"\n"
-#: libpq_fetch.c:355
+#: libpq_fetch.c:368
#, c-format
msgid "fetched file \"%s\", length %d\n"
msgstr "pobrano plik \"%s\", długość %d\n"
-#: libpq_fetch.c:387
+#: libpq_fetch.c:400
#, c-format
msgid "could not send COPY data: %s"
msgstr "nie można wysłać danych COPY: %s"
-#: libpq_fetch.c:413
+#: libpq_fetch.c:426
#, c-format
msgid "could not create temporary table: %s"
msgstr "nie można utworzyć tabeli tymczasowej: %s"
-#: libpq_fetch.c:421
+#: libpq_fetch.c:434
#, c-format
msgid "could not send file list: %s"
msgstr "nie można przesłać listy plików: %s"
-#: libpq_fetch.c:463
+#: libpq_fetch.c:476
#, c-format
msgid "could not send end-of-COPY: %s"
msgstr "nie można wysłać end-of-COPY: %s"
-#: libpq_fetch.c:469
+#: libpq_fetch.c:482
#, c-format
msgid "unexpected result while sending file list: %s"
msgstr "nieoczekiwany wynik podczas wysyłania listy plików: %s"
@@ -500,7 +506,8 @@ msgstr ""
"\n"
"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
-#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:176
+#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:175
+#: pg_rewind.c:183
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Użyj \"%s --help\" aby uzyskać więcej informacji.\n"
@@ -512,65 +519,71 @@ msgstr "%s: nie wskazano źródła (--source-pgdata lub --source-server)\n"
#: pg_rewind.c:167
#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: tylko jedna z --source-pgdata lub --source-pgdata może być wskazana\n"
+
+#: pg_rewind.c:174
+#, c-format
msgid "%s: no target data directory specified (--target-pgdata)\n"
msgstr "%s: nie wskazano docelowego folderu danych (--target-pgdata)\n"
-#: pg_rewind.c:174
+#: pg_rewind.c:181
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: za duża ilość parametrów (pierwszy to \"%s\")\n"
-#: pg_rewind.c:189
+#: pg_rewind.c:196
#, c-format
msgid "cannot be executed by \"root\"\n"
msgstr "nie może być wykonywane pod \"rootem\"\n"
-#: pg_rewind.c:190
+#: pg_rewind.c:197
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "Musisz uruchomić %s jako superużytkownik PostgreSQL.\n"
-#: pg_rewind.c:221
+#: pg_rewind.c:228
#, c-format
msgid "source and target cluster are on the same timeline\n"
msgstr "klaster źródłowy i docelowy są na tej samej linii czasowej\n"
-#: pg_rewind.c:227
+#: pg_rewind.c:234
#, c-format
msgid "servers diverged at WAL position %X/%X on timeline %u\n"
msgstr "serwery rozeszły się na pozycji WAL %X/%X linii czasowej %u\n"
-#: pg_rewind.c:264
+#: pg_rewind.c:271
#, c-format
msgid "no rewind required\n"
msgstr "przewinięcie nie jest konieczne\n"
-#: pg_rewind.c:271
+#: pg_rewind.c:278
#, c-format
msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
-msgstr "przewinięcie do ostatniego zgodnego punktu kontrolnego na %X/%X linii czasowej %u\n"
+msgstr "przewinięcie do ostatniego zgodnego punktu kontrolnego na %X/%X linii "
+"czasowej %u\n"
-#: pg_rewind.c:279
+#: pg_rewind.c:286
#, c-format
msgid "reading source file list\n"
msgstr "odczyt źródłowej listy plików\n"
-#: pg_rewind.c:281
+#: pg_rewind.c:288
#, c-format
msgid "reading target file list\n"
msgstr "odczyt docelowej listy plików\n"
-#: pg_rewind.c:291
+#: pg_rewind.c:298
#, c-format
msgid "reading WAL in target\n"
msgstr "odczyt WAL docelowy\n"
-#: pg_rewind.c:308
+#: pg_rewind.c:315
#, c-format
msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
msgstr "potrzeba skopiować %lu MB (pełna wielkość folderu źródłowego to %lu MB)\n"
-#: pg_rewind.c:325
+#: pg_rewind.c:332
#, c-format
msgid ""
"\n"
@@ -579,92 +592,84 @@ msgstr ""
"\n"
"tworzenie etykiety kopii zapasowej i aktualizacja pliku sterującego\n"
-#: pg_rewind.c:353
+#: pg_rewind.c:360
#, c-format
-#| msgid "%s: failed to remove data directory\n"
msgid "syncing target data directory\n"
msgstr "docelowy katalog danych synchronizacji\n"
-#: pg_rewind.c:356
+#: pg_rewind.c:363
#, c-format
msgid "Done!\n"
msgstr "Wykonano!\n"
-#: pg_rewind.c:368
+#: pg_rewind.c:375
#, c-format
msgid "source and target clusters are from different systems\n"
msgstr "klastry źródłowy i docelowy pochodzą z innych systemów\n"
-#: pg_rewind.c:376
+#: pg_rewind.c:383
#, c-format
msgid "clusters are not compatible with this version of pg_rewind\n"
msgstr "klastry nie są kompatybilne z tą wersją pg_rewind\n"
-#: pg_rewind.c:386
+#: pg_rewind.c:393
#, c-format
msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
msgstr "serwer docelowy wymaga użycia albo sum kontrolnych albo \"wal_log_hints = on\"\n"
-#: pg_rewind.c:397
+#: pg_rewind.c:404
#, c-format
msgid "target server must be shut down cleanly\n"
msgstr "serwer docelowy musi zostać czysto wyłączony\n"
-#: pg_rewind.c:407
+#: pg_rewind.c:414
#, c-format
msgid "source data directory must be shut down cleanly\n"
msgstr "źródłowy folder danych musi być czysto wyłączony\n"
-#: pg_rewind.c:462
+#: pg_rewind.c:469
#, c-format
-#| msgid "invalid data in history file\n"
msgid "invalid control file"
msgstr "niepoprawny plik kontrolny"
-#: pg_rewind.c:473
+#: pg_rewind.c:480
#, c-format
-#| msgid "source file list is empty\n"
msgid "Source timeline history:\n"
msgstr "Historia źródłowej linii czasu:\n"
-#: pg_rewind.c:475
+#: pg_rewind.c:482
#, c-format
-#| msgid "new target timeline is %u"
msgid "Target timeline history:\n"
msgstr "Historia docelowej linii czasu:\n"
#. translator: %d is a timeline number, others are LSN positions
-#: pg_rewind.c:489
+#: pg_rewind.c:496
#, c-format
msgid "%d: %X/%X - %X/%X\n"
msgstr "%d: %X/%X - %X/%X\n"
-#: pg_rewind.c:548
+#: pg_rewind.c:555
#, c-format
msgid "could not find common ancestor of the source and target cluster's timelines\n"
msgstr "nie można znaleźć wspólnego przodka źródłowej i docelowej osi czasu klastra\n"
-#: pg_rewind.c:589
+#: pg_rewind.c:596
#, c-format
msgid "backup label buffer too small\n"
msgstr "bufor etykiety kopii zapasowej jest za mały\n"
-#: pg_rewind.c:612
+#: pg_rewind.c:619
#, c-format
msgid "unexpected control file CRC\n"
msgstr "nieoczekiwane CRC pliku kontrolnego\n"
-#: pg_rewind.c:622
+#: pg_rewind.c:629
#, c-format
msgid "unexpected control file size %d, expected %d\n"
msgstr "nieoczekiwana długość pliku kontrolnego %d, oczekiwano %d\n"
-#: pg_rewind.c:689
+#: pg_rewind.c:696
#, c-format
-#| msgid ""
-#| "The program \"%s\" is needed by %s but was not found in the\n"
-#| "same directory as \"%s\".\n"
-#| "Check your installation.\n"
msgid ""
"The program \"initdb\" is needed by %s but was\n"
"not found in the same directory as \"%s\".\n"
@@ -674,12 +679,8 @@ msgstr ""
"znaleziony w tym samym folderze co \"%s\".\n"
"Sprawdź instalację.\n"
-#: pg_rewind.c:693
+#: pg_rewind.c:700
#, c-format
-#| msgid ""
-#| "The program \"%s\" was found by \"%s\"\n"
-#| "but was not the same version as %s.\n"
-#| "Check your installation.\n"
msgid ""
"The program \"initdb\" was found by \"%s\"\n"
"but was not the same version as %s.\n"
@@ -689,9 +690,8 @@ msgstr ""
"ale nie jest w tej samej wersji co %s.\n"
"Sprawdź instalację.\n"
-#: pg_rewind.c:711
+#: pg_rewind.c:718
#, c-format
-#| msgid "%s: no target directory specified\n"
msgid "sync of target directory failed\n"
msgstr "nie powiodło się sync folderu docelowego\n"
@@ -740,9 +740,8 @@ msgstr "niepoprawne przesunięcie rekordu w %X/%X"
msgid "contrecord is requested by %X/%X"
msgstr "wymagany kontrekord w %X/%X"
-#: xlogreader.c:325 xlogreader.c:624
+#: xlogreader.c:325 xlogreader.c:625
#, c-format
-#| msgid "invalid record length at %X/%X"
msgid "invalid record length at %X/%X: wanted %u, got %u"
msgstr "niepoprawna długość rekordu w %X/%X: oczekiwana %u, jest %u"
@@ -761,113 +760,132 @@ msgstr "brak flagi kontrekordu na %X/%X"
msgid "invalid contrecord length %u at %X/%X"
msgstr "niepoprawna długość kontrekordu %u na %X/%X"
-#: xlogreader.c:632
+#: xlogreader.c:633
#, c-format
msgid "invalid resource manager ID %u at %X/%X"
msgstr "niepoprawny ID menażera zasobów %u w %X/%X"
-#: xlogreader.c:646 xlogreader.c:663
+#: xlogreader.c:647 xlogreader.c:664
#, c-format
msgid "record with incorrect prev-link %X/%X at %X/%X"
msgstr "rekord z niepoprawnym poprz-linkiem %X/%X w %X/%X"
-#: xlogreader.c:700
+#: xlogreader.c:701
#, c-format
msgid "incorrect resource manager data checksum in record at %X/%X"
msgstr "niepoprawna suma kontrolna danych menadżera zasobów w rekordzie w %X/%X"
-#: xlogreader.c:733
+#: xlogreader.c:734
#, c-format
msgid "invalid magic number %04X in log segment %s, offset %u"
-msgstr "niepoprawny magiczny numer %04X w segmencie dziennika %s, przesunięcie %u"
+msgstr ""
+"niepoprawny magiczny numer %04X w segmencie dziennika %s, przesunięcie %u"
-#: xlogreader.c:747 xlogreader.c:798
+#: xlogreader.c:748 xlogreader.c:799
#, c-format
msgid "invalid info bits %04X in log segment %s, offset %u"
-msgstr "niepoprawny bity informacji %04X w segmencie dziennika %s, przesunięcie %u"
+msgstr ""
+"niepoprawny bity informacji %04X w segmencie dziennika %s, przesunięcie %u"
-#: xlogreader.c:773
+#: xlogreader.c:774
#, c-format
msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
-msgstr "plik WAL pochodzi z innego systemu bazy danych: identyfikator systemu bazy danych z pliku WAL to %s, a identyfikator systemu bazy danych z pg_control to %s"
+msgstr ""
+"plik WAL pochodzi z innego systemu bazy danych: identyfikator systemu bazy "
+"danych z pliku WAL to %s, a identyfikator systemu bazy danych z pg_control "
+"to %s"
-#: xlogreader.c:780
+#: xlogreader.c:781
#, c-format
msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
-msgstr "plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_SEG_SIZE w nagłówku strony"
+msgstr ""
+"plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_SEG_SIZE w "
+"nagłówku strony"
-#: xlogreader.c:786
+#: xlogreader.c:787
#, c-format
msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
-msgstr "plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_BLCKSZ w nagłówku strony"
+msgstr ""
+"plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_BLCKSZ w "
+"nagłówku strony"
-#: xlogreader.c:812
+#: xlogreader.c:813
#, c-format
msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
msgstr "nieoczekiwany adrstrony %X/%X w segmencie dziennika %s, przesunięcie %u"
-#: xlogreader.c:837
+#: xlogreader.c:838
#, c-format
msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
-msgstr "nieoczekiwany ID linii czasu %u (po %u) w segmencie dziennika %s, przesunięcie %u"
+msgstr ""
+"nieoczekiwany ID linii czasu %u (po %u) w segmencie dziennika %s, "
+"przesunięcie %u"
-#: xlogreader.c:1044
+#: xlogreader.c:1083
#, c-format
msgid "out-of-order block_id %u at %X/%X"
msgstr "poza porządkiem block_id %u na %X/%X"
-#: xlogreader.c:1066
+#: xlogreader.c:1106
#, c-format
msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
msgstr "BKPBLOCK_HAS_DATA jest ustawione, ale nie załączono danych na %X/%X"
-#: xlogreader.c:1073
+#: xlogreader.c:1113
#, c-format
msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
msgstr "BKPBLOCK_HAS_DATA nie jest ustawione, długość danych to %u na %X/%X"
-#: xlogreader.c:1106
+#: xlogreader.c:1149
#, c-format
msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
-msgstr "BKPIMAGE_HAS_HOLE jest ustawione, ale przesunięcie dziury %u długości %u blok obrazu o długości %u na %X/%X"
+msgstr ""
+"BKPIMAGE_HAS_HOLE jest ustawione, ale przesunięcie dziury %u długości %u "
+"blok obrazu o długości %u na %X/%X"
-#: xlogreader.c:1122
+#: xlogreader.c:1165
#, c-format
msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
-msgstr "BKPIMAGE_HAS_HOLE nie jest ustawione, ale przesunięcie dziury %u o długości %u na %X/%X"
+msgstr ""
+"BKPIMAGE_HAS_HOLE nie jest ustawione, ale przesunięcie dziury %u o długości "
+"%u na %X/%X"
-#: xlogreader.c:1137
+#: xlogreader.c:1180
#, c-format
msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
-msgstr "BKPIMAGE_IS_COMPRESSED jest ustawione, ale blok obrazu o długości %u na %X/%X"
+msgstr ""
+"BKPIMAGE_IS_COMPRESSED jest ustawione, ale blok obrazu o długości %u na %X/%"
+"X"
-#: xlogreader.c:1152
+#: xlogreader.c:1195
#, c-format
msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
-msgstr "ani BKPIMAGE_HAS_HOLE ani BKPIMAGE_IS_COMPRESSED nie jest ustawione, ale długość bloku obrazu to %u na %X/%X"
+msgstr ""
+"ani BKPIMAGE_HAS_HOLE ani BKPIMAGE_IS_COMPRESSED nie jest ustawione, ale "
+"długość bloku obrazu to %u na %X/%X"
-#: xlogreader.c:1168
+#: xlogreader.c:1211
#, c-format
msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
msgstr "BKPBLOCK_SAME_REL jest ustawione ale brak poprzedniej rel na %X/%X"
-#: xlogreader.c:1180
+#: xlogreader.c:1223
#, c-format
msgid "invalid block_id %u at %X/%X"
msgstr "niepoprawny block_id %u na %X/%X"
-#: xlogreader.c:1245
+#: xlogreader.c:1291
#, c-format
msgid "record with invalid length at %X/%X"
msgstr "rekord o niepoprawnej długości w %X/%X"
-#: xlogreader.c:1334
+#: xlogreader.c:1380
#, c-format
msgid "invalid compressed image at %X/%X, block %d"
msgstr "niepoprawny skompresowany obraz na %X/%X, blok %d"
-#~ msgid "could not truncate file \"%s\" to %u bytes: %s\n"
-#~ msgstr "nie można obciąć pliku \"%s\" do %u bajtów: %s\n"
-
#~ msgid "Expected an XLOG switchpoint location.\n"
#~ msgstr "Oczekiwano położenia przełączenia XLOG.\n"
+
+#~ msgid "could not truncate file \"%s\" to %u bytes: %s\n"
+#~ msgstr "nie można obciąć pliku \"%s\" do %u bajtów: %s\n"
diff --git a/src/bin/pg_rewind/po/pt_BR.po b/src/bin/pg_rewind/po/pt_BR.po
new file mode 100644
index 00000000000..378c9035075
--- /dev/null
+++ b/src/bin/pg_rewind/po/pt_BR.po
@@ -0,0 +1,859 @@
+# Brazilian Portuguese message translation file for pg_rewind
+# Copyright (C) 2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_rewind (PostgreSQL) 9.6\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2016-10-25 16:32-0300\n"
+"PO-Revision-Date: 2015-10-04 16:36-0300\n"
+"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
+"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n>1);\n"
+
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127
+#: parsexlog.c:179
+#, c-format
+msgid "out of memory\n"
+msgstr "sem memória\n"
+
+#: ../../common/fe_memutils.c:92
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "não pode duplicar ponteiro nulo (erro interno)\n"
+
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: AVISO: não pode criar informações restritas nessa plataforma\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: não pôde abrir informação sobre processo: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: não pôde alocar SIDs: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: não pôde criar informação restrita: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: não pôde iniciar processo para comando \"%s\": código de erro %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: não pôde executar novamente com informação restrita: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: não pôde obter código de saída de subprocesso: código de erro %lu\n"
+
+#: copy_fetch.c:64
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "não pôde abrir diretório \"%s\": %s\n"
+
+#: copy_fetch.c:93 filemap.c:112 filemap.c:267
+#, c-format
+msgid "could not stat file \"%s\": %s\n"
+msgstr "não pôde executar stat no arquivo \"%s\": %s\n"
+
+#: copy_fetch.c:122
+#, c-format
+msgid "could not read symbolic link \"%s\": %s\n"
+msgstr "não pôde ler link simbólico \"%s\": %s\n"
+
+#: copy_fetch.c:125
+#, c-format
+msgid "symbolic link \"%s\" target is too long\n"
+msgstr "alvo do link simbólico \"%s\" é muito longo\n"
+
+#: copy_fetch.c:140
+#, c-format
+msgid "\"%s\" is a symbolic link, but symbolic links are not supported on this platform\n"
+msgstr "\"%s\" é um link simbólico mas links simbólicos não são suportados nesta plataforma\n"
+
+#: copy_fetch.c:147
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "não pôde ler diretório \"%s\": %s\n"
+
+#: copy_fetch.c:151
+#, c-format
+msgid "could not close directory \"%s\": %s\n"
+msgstr "não pôde fechar diretório \"%s\": %s\n"
+
+#: copy_fetch.c:171
+#, c-format
+msgid "could not open source file \"%s\": %s\n"
+msgstr "não pôde abrir arquivo de origem \"%s\": %s\n"
+
+#: copy_fetch.c:175
+#, c-format
+msgid "could not seek in source file: %s\n"
+msgstr "não pôde posicionar no arquivo de origem: %s\n"
+
+#: copy_fetch.c:192 file_ops.c:300
+#, c-format
+msgid "could not read file \"%s\": %s\n"
+msgstr "não pôde ler arquivo \"%s\": %s\n"
+
+#: copy_fetch.c:195
+#, c-format
+msgid "unexpected EOF while reading file \"%s\"\n"
+msgstr "EOF inesperado ao ler arquivo \"%s\"\n"
+
+#: copy_fetch.c:202
+#, c-format
+msgid "could not close file \"%s\": %s\n"
+msgstr "não pôde fechar arquivo \"%s\": %s\n"
+
+#: datapagemap.c:124
+#, c-format
+msgid " block %u\n"
+msgstr " bloco %u\n"
+
+#: file_ops.c:64
+#, c-format
+msgid "could not open target file \"%s\": %s\n"
+msgstr "não pôde abrir arquivo de destino \"%s\": %s\n"
+
+#: file_ops.c:78
+#, c-format
+msgid "could not close target file \"%s\": %s\n"
+msgstr "não pôde fechar arquivo de destino \"%s\": %s\n"
+
+#: file_ops.c:98
+#, c-format
+msgid "could not seek in target file \"%s\": %s\n"
+msgstr "não pôde posicionar no arquivo de destino \"%s\": %s\n"
+
+#: file_ops.c:114
+#, c-format
+msgid "could not write file \"%s\": %s\n"
+msgstr "não pôde escrever no arquivo \"%s\": %s\n"
+
+#: file_ops.c:164
+#, c-format
+msgid "invalid action (CREATE) for regular file\n"
+msgstr "ação inválida (CREATE) para arquivo regular\n"
+
+#: file_ops.c:179
+#, c-format
+msgid "could not remove file \"%s\": %s\n"
+msgstr "não pôde remover arquivo \"%s\": %s\n"
+
+#: file_ops.c:196
+#, c-format
+msgid "could not open file \"%s\" for truncation: %s\n"
+msgstr "não pôde abrir arquivo \"%s\" para truncamento: %s\n"
+
+#: file_ops.c:200
+#, c-format
+msgid "could not truncate file \"%s\" to %u: %s\n"
+msgstr "não pôde truncar arquivo \"%s\" para %u: %s\n"
+
+#: file_ops.c:216
+#, c-format
+msgid "could not create directory \"%s\": %s\n"
+msgstr "não pôde criar diretório \"%s\": %s\n"
+
+#: file_ops.c:230
+#, c-format
+msgid "could not remove directory \"%s\": %s\n"
+msgstr "não pôde remover diretório \"%s\": %s\n"
+
+#: file_ops.c:244
+#, c-format
+msgid "could not create symbolic link at \"%s\": %s\n"
+msgstr "não pôde criar link simbólico em \"%s\": %s\n"
+
+#: file_ops.c:258
+#, c-format
+msgid "could not remove symbolic link \"%s\": %s\n"
+msgstr "não pôde remover link simbólico \"%s\": %s\n"
+
+#: file_ops.c:288 file_ops.c:292
+#, c-format
+msgid "could not open file \"%s\" for reading: %s\n"
+msgstr "não pôde abrir arquivo \"%s\" para leitura: %s\n"
+
+#: filemap.c:104
+#, c-format
+msgid "data file \"%s\" in source is not a regular file\n"
+msgstr "arquivo de dados \"%s\" na origem não é um arquivo regular\n"
+
+#: filemap.c:126
+#, c-format
+msgid "\"%s\" is not a directory\n"
+msgstr "\"%s\" não é um diretório\n"
+
+#: filemap.c:149
+#, c-format
+msgid "\"%s\" is not a symbolic link\n"
+msgstr "\"%s\" não é um link simbólico\n"
+
+#: filemap.c:161
+#, c-format
+msgid "\"%s\" is not a regular file\n"
+msgstr "\"%s\" não é um arquivo regular\n"
+
+#: filemap.c:279
+#, c-format
+msgid "source file list is empty\n"
+msgstr "lista de arquivos da origem está vazia\n"
+
+#: filemap.c:401
+#, c-format
+msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
+msgstr "modificação de página inesperada em diretório ou link simbólico \"%s\"\n"
+
+#. translator: first %s is a file path, second is a keyword such as COPY
+#: filemap.c:537
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
+#: libpq_fetch.c:56
+#, c-format
+msgid "could not connect to server: %s"
+msgstr "não pôde conectar ao servidor: %s"
+
+#: libpq_fetch.c:59
+#, c-format
+msgid "connected to server\n"
+msgstr "conectado ao servidor\n"
+
+#: libpq_fetch.c:69
+#, c-format
+msgid "source server must not be in recovery mode\n"
+msgstr "servidor de origem não deve estar em modo de recuperação\n"
+
+#: libpq_fetch.c:79
+#, c-format
+msgid "full_page_writes must be enabled in the source server\n"
+msgstr "full_page_writes deve estar habilitado no servidor de origem\n"
+
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "não pôde configurar contexto de conexão: %s"
+
+#: libpq_fetch.c:109
+#, c-format
+msgid "error running query (%s) in source server: %s"
+msgstr "erro ao executar consulta (%s) no servidor de origem: %s"
+
+#: libpq_fetch.c:114
+#, c-format
+msgid "unexpected result set from query\n"
+msgstr "conjunto de resultados inesperado da consulta\n"
+
+#: libpq_fetch.c:137
+#, c-format
+msgid "unrecognized result \"%s\" for current WAL insert location\n"
+msgstr "resultado desconhecido \"%s\" para local de inserção atual no WAL\n"
+
+#: libpq_fetch.c:187
+#, c-format
+msgid "could not fetch file list: %s"
+msgstr "não pôde obter lista de arquivos: %s"
+
+#: libpq_fetch.c:192
+#, c-format
+msgid "unexpected result set while fetching file list\n"
+msgstr "conjunto de resultados inesperado ao obter lista de arquivos\n"
+
+#: libpq_fetch.c:240
+#, c-format
+msgid "could not send query: %s"
+msgstr "não pôde enviar consulta: %s"
+
+#: libpq_fetch.c:242
+#, c-format
+msgid "getting file chunks\n"
+msgstr "obtendo blocos do arquivo\n"
+
+#: libpq_fetch.c:245
+#, c-format
+msgid "could not set libpq connection to single row mode\n"
+msgstr "não pôde definir conexão libpq para modo de registro único\n"
+
+#: libpq_fetch.c:265
+#, c-format
+msgid "unexpected result while fetching remote files: %s"
+msgstr "resultado inesperado ao obter arquivos remotos: %s"
+
+#: libpq_fetch.c:271
+#, c-format
+msgid "unexpected result set size while fetching remote files\n"
+msgstr "tamanho do conjunto de resultados inesperado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:277
+#, c-format
+msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
+msgstr "tipos de daos inesperados no conjunto de resultados ao obter arquivos remotos: %u %u %u\n"
+
+#: libpq_fetch.c:285
+#, c-format
+msgid "unexpected result format while fetching remote files\n"
+msgstr "formato de resultado inesperado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:291
+#, c-format
+msgid "unexpected null values in result while fetching remote files\n"
+msgstr "valores nulos inesperados em resultado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:295
+#, c-format
+msgid "unexpected result length while fetching remote files\n"
+msgstr "tamanho de resultado inesperado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:317
+#, c-format
+msgid "received null value for chunk for file \"%s\", file has been deleted\n"
+msgstr "valor nulo recebido para bloco do arquivo \"%s\", arquivo foi removido\n"
+
+#: libpq_fetch.c:324
+#, c-format
+msgid "received chunk for file \"%s\", offset %d, size %d\n"
+msgstr "bloco recebido para arquivo \"%s\", posição %d, tamanho %d\n"
+
+#: libpq_fetch.c:353
+#, c-format
+msgid "could not fetch remote file \"%s\": %s"
+msgstr "não pôde obter arquivo remoto \"%s\": %s"
+
+#: libpq_fetch.c:358
+#, c-format
+msgid "unexpected result set while fetching remote file \"%s\"\n"
+msgstr "conjunto de resultados inesperado ao obter arquivo remoto \"%s\"\n"
+
+#: libpq_fetch.c:369
+#, c-format
+msgid "fetched file \"%s\", length %d\n"
+msgstr "arquivo \"%s\" obtido, tamanho %d\n"
+
+#: libpq_fetch.c:401
+#, c-format
+msgid "could not send COPY data: %s"
+msgstr "não pôde enviar dados do COPY: %s"
+
+#: libpq_fetch.c:427
+#, c-format
+msgid "could not create temporary table: %s"
+msgstr "não pôde criar tabela temporária: %s"
+
+#: libpq_fetch.c:435
+#, c-format
+msgid "could not send file list: %s"
+msgstr "não pôde enviar lista de arquivos: %s"
+
+#: libpq_fetch.c:477
+#, c-format
+msgid "could not send end-of-COPY: %s"
+msgstr "não pôde enviar fim do COPY: %s"
+
+#: libpq_fetch.c:483
+#, c-format
+msgid "unexpected result while sending file list: %s"
+msgstr "resultado inesperado ao enviar lista de arquivos: %s"
+
+#: logging.c:57
+msgid "Failure, exiting\n"
+msgstr "Falha, terminando\n"
+
+#: logging.c:140
+#, c-format
+msgid "%*s/%s kB (%d%%) copied"
+msgstr "%*s/%s kB (%d%%) copiado"
+
+#: parsexlog.c:87 parsexlog.c:133
+#, c-format
+msgid "could not read WAL record at %X/%X: %s\n"
+msgstr "não pôde ler registro do WAL em %X/%X: %s\n"
+
+#: parsexlog.c:91 parsexlog.c:136
+#, c-format
+msgid "could not read WAL record at %X/%X\n"
+msgstr "não pôde ler registro do WAL em %X/%X\n"
+
+#: parsexlog.c:191
+#, c-format
+msgid "could not find previous WAL record at %X/%X: %s\n"
+msgstr "não pôde encontrar registro do WAL anterior em %X/%X: %s\n"
+
+#: parsexlog.c:195
+#, c-format
+msgid "could not find previous WAL record at %X/%X\n"
+msgstr "não pôde encontrar registro do WAL anterior em %X/%X\n"
+
+#: parsexlog.c:283
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "não pôde abrir arquivo \"%s\": %s\n"
+
+#: parsexlog.c:297
+#, c-format
+msgid "could not seek in file \"%s\": %s\n"
+msgstr "não pôde posicionar no arquivo \"%s\": %s\n"
+
+#: parsexlog.c:304
+#, c-format
+msgid "could not read from file \"%s\": %s\n"
+msgstr "não pôde ler do arquivo \"%s\": %s\n"
+
+#: parsexlog.c:372
+#, c-format
+msgid ""
+"WAL record modifies a relation, but record type is not recognized\n"
+"lsn: %X/%X, rmgr: %s, info: %02X\n"
+msgstr ""
+"registro do WAL modifica uma relação mas tipo do registro é desconhecido\n"
+"lsn: %X/%X, rmgr: %s, info: %02X\n"
+
+#: pg_rewind.c:64
+#, c-format
+msgid ""
+"%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
+"\n"
+msgstr "%s sincroniza um agrupamento do PostgreSQL com outra cópia do agrupamento.\n"
+
+#: pg_rewind.c:65
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION]...\n"
+"\n"
+msgstr ""
+"Uso:\n"
+" %s [OPÇÃO]...\n"
+"\n"
+
+#: pg_rewind.c:66
+#, c-format
+msgid "Options:\n"
+msgstr "Opções:\n"
+
+#: pg_rewind.c:67
+#, c-format
+msgid " -D, --target-pgdata=DIRECTORY existing data directory to modify\n"
+msgstr " -D, --target-pgdata=DIRETÓRIO diretório de dados existente a ser modificado\n"
+
+#: pg_rewind.c:68
+#, c-format
+msgid " --source-pgdata=DIRECTORY source data directory to synchronize with\n"
+msgstr " --source-pgdata=DIRETÓRIO sincroniza com esse diretório de dados de origem\n"
+
+#: pg_rewind.c:69
+#, c-format
+msgid " --source-server=CONNSTR source server to synchronize with\n"
+msgstr " --source-server=TEXTO sincroniza com esse servidor de origem\n"
+
+#: pg_rewind.c:70
+#, c-format
+msgid " -n, --dry-run stop before modifying anything\n"
+msgstr " -n, --dry-run para antes de qualquer modifcação\n"
+
+#: pg_rewind.c:71
+#, c-format
+msgid " -P, --progress write progress messages\n"
+msgstr " -P, --progress escreve mensagens de progresso\n"
+
+#: pg_rewind.c:72
+#, c-format
+msgid " --debug write a lot of debug messages\n"
+msgstr " --debug mostra saída da depuração\n"
+
+#: pg_rewind.c:73
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version mostra informação sobre a versão e termina\n"
+
+#: pg_rewind.c:74
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help mostra essa ajuda e termina\n"
+
+#: pg_rewind.c:75
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Relate erros a <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:175
+#: pg_rewind.c:183
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
+
+#: pg_rewind.c:160
+#, c-format
+msgid "%s: no source specified (--source-pgdata or --source-server)\n"
+msgstr "%s: nenhuma origem especificada (--source-pgdata ou --source-server)\n"
+
+#: pg_rewind.c:167
+#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: somente uma das opções --source-pgdata ou --source-server pode ser especificada\n"
+
+#: pg_rewind.c:174
+#, c-format
+msgid "%s: no target data directory specified (--target-pgdata)\n"
+msgstr "%s: nenhum diretório de dados de destino especificado (--target-pgdata)\n"
+
+#: pg_rewind.c:181
+#, 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_rewind.c:196
+#, c-format
+msgid "cannot be executed by \"root\"\n"
+msgstr "não pode ser executado pelo \"root\"\n"
+
+#: pg_rewind.c:197
+#, c-format
+msgid "You must run %s as the PostgreSQL superuser.\n"
+msgstr "Você deve executar %s como um super-usuário do PostgreSQL.\n"
+
+#: pg_rewind.c:228
+#, c-format
+msgid "source and target cluster are on the same timeline\n"
+msgstr "agrupamentos de origem e destino estão na mesma linha do tempo\n"
+
+#: pg_rewind.c:234
+#, c-format
+msgid "servers diverged at WAL position %X/%X on timeline %u\n"
+msgstr "servidores divergem na posição do WAL %X/%X na linha do tempo %u\n"
+
+#: pg_rewind.c:271
+#, c-format
+msgid "no rewind required\n"
+msgstr "nenhuma sincronização é necessária\n"
+
+#: pg_rewind.c:278
+#, c-format
+msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
+msgstr "sincronizando a partir do último ponto de controle em comum em %X/%X na linha do tempo %u\n"
+
+#: pg_rewind.c:286
+#, c-format
+msgid "reading source file list\n"
+msgstr "lendo lista de arquivos da origem\n"
+
+#: pg_rewind.c:288
+#, c-format
+msgid "reading target file list\n"
+msgstr "lendo lista de arquivos do destino\n"
+
+#: pg_rewind.c:298
+#, c-format
+msgid "reading WAL in target\n"
+msgstr "lendo WAL no destino\n"
+
+#: pg_rewind.c:315
+#, c-format
+msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
+msgstr "precisa copiar %lu MB (tamanho total do diretório de origem é %lu MB)\n"
+
+#: pg_rewind.c:332
+#, c-format
+msgid ""
+"\n"
+"creating backup label and updating control file\n"
+msgstr ""
+"\n"
+"criando rótulo de cópia de segurança e atualizando arquivo de controle\n"
+
+#: pg_rewind.c:360
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "sincronizando diretório de dados de destino\n"
+
+#: pg_rewind.c:363
+#, c-format
+msgid "Done!\n"
+msgstr "Feito!\n"
+
+#: pg_rewind.c:375
+#, c-format
+msgid "source and target clusters are from different systems\n"
+msgstr "agrupamentos de origem e destino são de sistemas diferentes\n"
+
+#: pg_rewind.c:383
+#, c-format
+msgid "clusters are not compatible with this version of pg_rewind\n"
+msgstr "agrupamentos não são compatíveis com esta versão do pg_rewind\n"
+
+#: pg_rewind.c:393
+#, c-format
+msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
+msgstr "servidor de destino precisa utilizar soma de verificação de dados ou \"wal_log_hints = on\"\n"
+
+#: pg_rewind.c:404
+#, c-format
+msgid "target server must be shut down cleanly\n"
+msgstr "servidor de destino deve ser desligado corretamente\n"
+
+#: pg_rewind.c:414
+#, c-format
+msgid "source data directory must be shut down cleanly\n"
+msgstr "diretório de dados de origem deve ser desligado corretamente\n"
+
+#: pg_rewind.c:469
+#, c-format
+msgid "invalid control file"
+msgstr "arquivo de controle inválido"
+
+#: pg_rewind.c:480
+#, c-format
+msgid "Source timeline history:\n"
+msgstr "Histórico da linha do tempo de origem:\n"
+
+#: pg_rewind.c:482
+#, c-format
+msgid "Target timeline history:\n"
+msgstr "Histórico da linha do tempo de destino:\n"
+
+#. translator: %d is a timeline number, others are LSN positions
+#: pg_rewind.c:496
+#, c-format
+msgid "%d: %X/%X - %X/%X\n"
+msgstr "%d: %X/%X - %X/%X\n"
+
+#: pg_rewind.c:555
+#, c-format
+msgid "could not find common ancestor of the source and target cluster's timelines\n"
+msgstr "não pôde encontrar antecessor comum das linhas do tempo dos agrupamentos de origem e destino\n"
+
+#: pg_rewind.c:596
+#, c-format
+msgid "backup label buffer too small\n"
+msgstr "buffer do rótulo da cópia de segurança é muito pequeno\n"
+
+#: pg_rewind.c:619
+#, c-format
+msgid "unexpected control file CRC\n"
+msgstr "CRC do arquivo de controle inesperado\n"
+
+#: pg_rewind.c:629
+#, c-format
+msgid "unexpected control file size %d, expected %d\n"
+msgstr "tamanho de arquivo de controle inesperado %d, esperado %d\n"
+
+#: pg_rewind.c:696
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was\n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"O programa \"initdb\" é requerido pelo %s mas não\n"
+"foi encontrado no mesmo diretório que \"%s\".\n"
+"Verifique sua instalação.\n"
+
+#: pg_rewind.c:700
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"O programa \"initdb\" foi encontrado pelo \"%s\"\n"
+"mas não tem a mesma versão que %s.\n"
+"Verifique sua instalação.\n"
+
+#: pg_rewind.c:718
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "sincronia do diretório de destino falhou\n"
+
+#: timeline.c:76 timeline.c:82
+#, c-format
+msgid "syntax error in history file: %s\n"
+msgstr "erro de sintaxe no arquivo de histórico: %s\n"
+
+#: timeline.c:77
+#, c-format
+msgid "Expected a numeric timeline ID.\n"
+msgstr "Esperado um ID de linha do tempo numérico.\n"
+
+#: timeline.c:83
+#, c-format
+msgid "Expected a transaction log switchpoint location.\n"
+msgstr "Esperado um local de transição do log de transação.\n"
+
+#: timeline.c:88
+#, c-format
+msgid "invalid data in history file: %s\n"
+msgstr "dado é inválido no arquivo de histórico: %s\n"
+
+#: timeline.c:89
+#, c-format
+msgid "Timeline IDs must be in increasing sequence.\n"
+msgstr "IDs de linha do tempo devem ser uma sequência crescente.\n"
+
+#: timeline.c:109
+#, c-format
+msgid "invalid data in history file\n"
+msgstr "dado é inválido no arquivo de histórico\n"
+
+#: timeline.c:110
+#, c-format
+msgid "Timeline IDs must be less than child timeline's ID.\n"
+msgstr "IDs de linha do tempo devem ser menores do que ID de linha do tempo descendente.\n"
+
+#: xlogreader.c:276
+#, c-format
+msgid "invalid record offset at %X/%X"
+msgstr "posição do registro é inválida em %X/%X"
+
+#: xlogreader.c:284
+#, c-format
+msgid "contrecord is requested by %X/%X"
+msgstr "contrecord é solicitado por %X/%X"
+
+#: xlogreader.c:325 xlogreader.c:624
+#, c-format
+msgid "invalid record length at %X/%X: wanted %u, got %u"
+msgstr "tamanho do registro inválido em %X/%X: desejado %u, obtido %u"
+
+#: xlogreader.c:340
+#, c-format
+msgid "record length %u at %X/%X too long"
+msgstr "tamanho do registro %u em %X/%X é muito longo"
+
+#: xlogreader.c:381
+#, c-format
+msgid "there is no contrecord flag at %X/%X"
+msgstr "não há marcação contrecord em %X/%X"
+
+#: xlogreader.c:394
+#, c-format
+msgid "invalid contrecord length %u at %X/%X"
+msgstr "tamanho de contrecord %u é inválido em %X/%X"
+
+#: xlogreader.c:632
+#, c-format
+msgid "invalid resource manager ID %u at %X/%X"
+msgstr "ID do gerenciador de recursos %u é inválido em %X/%X"
+
+#: xlogreader.c:646 xlogreader.c:663
+#, c-format
+msgid "record with incorrect prev-link %X/%X at %X/%X"
+msgstr "registro com prev-link %X/%X incorreto em %X/%X"
+
+#: xlogreader.c:700
+#, c-format
+msgid "incorrect resource manager data checksum in record at %X/%X"
+msgstr "soma de verificação do gerenciador de recursos é incorreta no registro em %X/%X"
+
+#: xlogreader.c:733
+#, c-format
+msgid "invalid magic number %04X in log segment %s, offset %u"
+msgstr "número mágico %04X inválido no arquivo de log %s, posição %u"
+
+#: xlogreader.c:747 xlogreader.c:798
+#, c-format
+msgid "invalid info bits %04X in log segment %s, offset %u"
+msgstr "bits de marcação %04X inválidos no arquivo de log %s, posição %u"
+
+#: xlogreader.c:773
+#, c-format
+msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
+msgstr "arquivo do WAL é de um sistema de banco de dados diferente: identificador do sistema de banco de dados do arquivo do WAL é %s, identificador do sistema de banco de dados do pg_control é %s"
+
+#: xlogreader.c:780
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
+msgstr "arquivo do WAL é de um sistema de banco de dados diferente: XLOG_SEG_SIZE incorreto no cabeçalho da página"
+
+#: xlogreader.c:786
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
+msgstr "arquivo do WAL é de um sistema de banco de dados diferente: XLOG_BLCKSZ incorreto no cabeçalho da página"
+
+#: xlogreader.c:812
+#, c-format
+msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
+msgstr "endereço da página %X/%X inesperado no arquivo de log %s, posição %u"
+
+#: xlogreader.c:837
+#, c-format
+msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
+msgstr "ID de linha do tempo %u fora de sequência (após %u) no arquivo de log %s, posição %u"
+
+#: xlogreader.c:1081
+#, c-format
+msgid "out-of-order block_id %u at %X/%X"
+msgstr "block_id %u fora de ordem em %X/%X"
+
+#: xlogreader.c:1103
+#, c-format
+msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
+msgstr "BKPBLOCK_HAS_DATA definido mas nenhum dado incluído em %X/%X"
+
+#: xlogreader.c:1110
+#, c-format
+msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
+msgstr "BKPBLOCK_HAS_DATA não foi definido mas tamanho do dado é %u em %X/%X"
+
+#: xlogreader.c:1143
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLE definido mas posição do espaço livre %u tamanho %u tamanho da imagem do bloco %u em %X/%X"
+
+#: xlogreader.c:1159
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLE não foi definido mas posição do espaço livre %u tamanho %u em %X/%X"
+
+#: xlogreader.c:1174
+#, c-format
+msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
+msgstr "BKPIMAGE_IS_COMPRESSED definido mas tamanho da imagem do bloco %u em %X/%X"
+
+#: xlogreader.c:1189
+#, c-format
+msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
+msgstr "nem BKPIMAGE_HAS_HOLE nem BKPIMAGE_IS_COMPRESSED foi definido mas tamanho da imagem do bloco é %u em %X/%X"
+
+#: xlogreader.c:1205
+#, c-format
+msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
+msgstr "BKPBLOCK_SAME_REL definido mas não há relação anterior em %X/%X"
+
+#: xlogreader.c:1217
+#, c-format
+msgid "invalid block_id %u at %X/%X"
+msgstr "block_id %u é inválido em %X/%X"
+
+#: xlogreader.c:1282
+#, c-format
+msgid "record with invalid length at %X/%X"
+msgstr "registro com tamanho inválido em %X/%X"
+
+#: xlogreader.c:1371
+#, c-format
+msgid "invalid compressed image at %X/%X, block %d"
+msgstr "imagem compactada é inválida em %X/%X, bloco %d"
diff --git a/src/bin/pg_rewind/po/ru.po b/src/bin/pg_rewind/po/ru.po
index cf8133303bc..198a7f64781 100644
--- a/src/bin/pg_rewind/po/ru.po
+++ b/src/bin/pg_rewind/po/ru.po
@@ -1,23 +1,22 @@
-# LANGUAGE message translation file for pg_rewind
-# Copyright (C) 2015 PostgreSQL Global Development Group
+# Russian message translation file for pg_rewind
+# Copyright (C) 2015-2016 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
+# Alexander Lakhin <exclusion@gmail.com>, 2015-2017.
#
-# Alexander Lakhin <exclusion@gmail.com>, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: pg_rewind (PostgreSQL) 9.6\n"
+"Project-Id-Version: pg_rewind (PostgreSQL current)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-06-14 20:44+0000\n"
-"PO-Revision-Date: 2015-10-18 18:13+0400\n"
+"POT-Creation-Date: 2017-03-27 12:46+0000\n"
+"PO-Revision-Date: 2016-11-24 14:26+0300\n"
"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127 parsexlog.c:179
@@ -67,27 +66,27 @@ msgstr ""
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr "%s: не удалось получить код выхода от подпроцесса (код ошибки: %lu)\n"
-#: copy_fetch.c:64
+#: copy_fetch.c:62
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "не удалось открыть каталог \"%s\": %s\n"
-#: copy_fetch.c:93 filemap.c:112 filemap.c:267
+#: copy_fetch.c:91 filemap.c:111 filemap.c:266
#, c-format
msgid "could not stat file \"%s\": %s\n"
msgstr "не удалось получить информацию о файле \"%s\": %s\n"
-#: copy_fetch.c:122
+#: copy_fetch.c:120
#, c-format
msgid "could not read symbolic link \"%s\": %s\n"
msgstr "не удалось прочитать символическую ссылку \"%s\": %s\n"
-#: copy_fetch.c:125
+#: copy_fetch.c:123
#, c-format
msgid "symbolic link \"%s\" target is too long\n"
msgstr "целевой путь символической ссылки \"%s\" слишком длинный\n"
-#: copy_fetch.c:140
+#: copy_fetch.c:138
#, c-format
msgid ""
"\"%s\" is a symbolic link, but symbolic links are not supported on this "
@@ -96,37 +95,37 @@ msgstr ""
"\"%s\" - символическая ссылка, но в этой ОС символические ссылки не "
"поддерживаются\n"
-#: copy_fetch.c:147
+#: copy_fetch.c:145
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "не удалось прочитать каталог \"%s\": %s\n"
-#: copy_fetch.c:151
+#: copy_fetch.c:149
#, c-format
msgid "could not close directory \"%s\": %s\n"
msgstr "не удалось закрыть каталог \"%s\": %s\n"
-#: copy_fetch.c:171
+#: copy_fetch.c:169
#, c-format
msgid "could not open source file \"%s\": %s\n"
msgstr "не удалось открыть исходный файл \"%s\": %s\n"
-#: copy_fetch.c:175
+#: copy_fetch.c:173
#, c-format
msgid "could not seek in source file: %s\n"
msgstr "не удалось переместиться в исходном файле: %s\n"
-#: copy_fetch.c:192 file_ops.c:300
+#: copy_fetch.c:190 file_ops.c:299
#, c-format
msgid "could not read file \"%s\": %s\n"
msgstr "не удалось прочитать файл \"%s\": %s\n"
-#: copy_fetch.c:195
+#: copy_fetch.c:193
#, c-format
msgid "unexpected EOF while reading file \"%s\"\n"
msgstr "неожиданный конец при чтении файла \"%s\"\n"
-#: copy_fetch.c:202
+#: copy_fetch.c:200
#, c-format
msgid "could not close file \"%s\": %s\n"
msgstr "не удалось закрыть файл \"%s\": %s\n"
@@ -136,97 +135,97 @@ msgstr "не удалось закрыть файл \"%s\": %s\n"
msgid " block %u\n"
msgstr " блок %u\n"
-#: file_ops.c:64
+#: file_ops.c:63
#, c-format
msgid "could not open target file \"%s\": %s\n"
msgstr "не удалось открыть целевой файл \"%s\": %s\n"
-#: file_ops.c:78
+#: file_ops.c:77
#, c-format
msgid "could not close target file \"%s\": %s\n"
msgstr "не удалось закрыть целевой файл \"%s\": %s\n"
-#: file_ops.c:98
+#: file_ops.c:97
#, c-format
msgid "could not seek in target file \"%s\": %s\n"
msgstr "не удалось переместиться в целевом файле \"%s\": %s\n"
-#: file_ops.c:114
+#: file_ops.c:113
#, c-format
msgid "could not write file \"%s\": %s\n"
msgstr "не удалось записать файл \"%s\": %s\n"
-#: file_ops.c:164
+#: file_ops.c:163
#, c-format
msgid "invalid action (CREATE) for regular file\n"
msgstr "неверное действие (CREATE) для обычного файла\n"
-#: file_ops.c:179
+#: file_ops.c:178
#, c-format
msgid "could not remove file \"%s\": %s\n"
msgstr "не удалось стереть файл \"%s\": %s\n"
-#: file_ops.c:196
+#: file_ops.c:195
#, c-format
msgid "could not open file \"%s\" for truncation: %s\n"
msgstr "не удалось открыть файл \"%s\" для усечения: %s\n"
-#: file_ops.c:200
+#: file_ops.c:199
#, c-format
msgid "could not truncate file \"%s\" to %u: %s\n"
msgstr "не удалось усечь файл \"%s\" до нужного размера (%u): %s\n"
-#: file_ops.c:216
+#: file_ops.c:215
#, c-format
msgid "could not create directory \"%s\": %s\n"
msgstr "создать каталог \"%s\" не удалось: %s\n"
-#: file_ops.c:230
+#: file_ops.c:229
#, c-format
msgid "could not remove directory \"%s\": %s\n"
msgstr "ошибка при удалении каталога \"%s\": %s\n"
-#: file_ops.c:244
+#: file_ops.c:243
#, c-format
msgid "could not create symbolic link at \"%s\": %s\n"
msgstr "не удалось создать символическую ссылку \"%s\": %s\n"
-#: file_ops.c:258
+#: file_ops.c:257
#, c-format
msgid "could not remove symbolic link \"%s\": %s\n"
msgstr "ошибка при удалении символической ссылки \"%s\": %s\n"
-#: file_ops.c:288 file_ops.c:292
+#: file_ops.c:287 file_ops.c:291
#, c-format
msgid "could not open file \"%s\" for reading: %s\n"
msgstr "не удалось открыть файл \"%s\" для чтения: %s\n"
-#: filemap.c:104
+#: filemap.c:103
#, c-format
msgid "data file \"%s\" in source is not a regular file\n"
msgstr "файл данных \"%s\" в источнике не является обычным файлом\n"
-#: filemap.c:126
+#: filemap.c:125
#, c-format
msgid "\"%s\" is not a directory\n"
msgstr "\"%s\" не является каталогом\n"
-#: filemap.c:149
+#: filemap.c:148
#, c-format
msgid "\"%s\" is not a symbolic link\n"
msgstr "\"%s\" не является символической ссылкой\n"
-#: filemap.c:161
+#: filemap.c:160
#, c-format
msgid "\"%s\" is not a regular file\n"
msgstr "\"%s\" не является обычным файлом\n"
-#: filemap.c:279
+#: filemap.c:278
#, c-format
msgid "source file list is empty\n"
msgstr "список файлов в источнике пуст\n"
-#: filemap.c:401
+#: filemap.c:400
#, c-format
msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
msgstr ""
@@ -234,7 +233,7 @@ msgstr ""
"\"\n"
#. translator: first %s is a file path, second is a keyword such as COPY
-#: filemap.c:537
+#: filemap.c:536
#, c-format
msgid "%s (%s)\n"
msgstr "%s (%s)\n"
@@ -257,60 +256,65 @@ msgstr "исходный сервер должен быть в режиме во
#: libpq_fetch.c:78
#, c-format
msgid "full_page_writes must be enabled in the source server\n"
-msgstr "на исходном сервере должен быть включен режим full_page_writes\n"
+msgstr "на исходном сервере должен быть включён режим full_page_writes\n"
-#: libpq_fetch.c:95
+#: libpq_fetch.c:90
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "не удалось настроить контекст подключения: %s"
+
+#: libpq_fetch.c:108
#, c-format
msgid "error running query (%s) in source server: %s"
msgstr "ошибка выполнения запроса (%s) на исходном сервере: %s"
-#: libpq_fetch.c:100
+#: libpq_fetch.c:113
#, c-format
msgid "unexpected result set from query\n"
msgstr "неожиданный результат запроса\n"
-#: libpq_fetch.c:123
+#: libpq_fetch.c:136
#, c-format
msgid "unrecognized result \"%s\" for current WAL insert location\n"
msgstr ""
"нераспознанный результат \"%s\" вместо текущей позиции добавления в WAL\n"
-#: libpq_fetch.c:173
+#: libpq_fetch.c:186
#, c-format
msgid "could not fetch file list: %s"
msgstr "не удалось получить список файлов: %s"
-#: libpq_fetch.c:178
+#: libpq_fetch.c:191
#, c-format
msgid "unexpected result set while fetching file list\n"
msgstr "неожиданный результат при получении списка файлов\n"
-#: libpq_fetch.c:226
+#: libpq_fetch.c:239
#, c-format
msgid "could not send query: %s"
msgstr "не удалось отправить запрос: %s"
-#: libpq_fetch.c:228
+#: libpq_fetch.c:241
#, c-format
msgid "getting file chunks\n"
msgstr "получение сегментов файлов\n"
-#: libpq_fetch.c:231
+#: libpq_fetch.c:244
#, c-format
msgid "could not set libpq connection to single row mode\n"
msgstr "не удалось перевести подключение libpq в однострочный режим\n"
-#: libpq_fetch.c:251
+#: libpq_fetch.c:264
#, c-format
msgid "unexpected result while fetching remote files: %s"
msgstr "неожиданный результат при получении удалённых файлов: %s"
-#: libpq_fetch.c:257
+#: libpq_fetch.c:270
#, c-format
msgid "unexpected result set size while fetching remote files\n"
msgstr "неожиданный размер набора результатов при получении удалённых файлов\n"
-#: libpq_fetch.c:263
+#: libpq_fetch.c:276
#, c-format
msgid ""
"unexpected data types in result set while fetching remote files: %u %u %u\n"
@@ -318,68 +322,68 @@ msgstr ""
"неожиданные типы данных в наборе результатов при получении удалённых файлов: "
"%u %u %u\n"
-#: libpq_fetch.c:271
+#: libpq_fetch.c:284
#, c-format
msgid "unexpected result format while fetching remote files\n"
msgstr "неожиданный формат результата при получении удалённых файлов\n"
-#: libpq_fetch.c:277
+#: libpq_fetch.c:290
#, c-format
msgid "unexpected null values in result while fetching remote files\n"
msgstr ""
"неожиданные значения NULL в результате при получении удалённых файлов\n"
-#: libpq_fetch.c:281
+#: libpq_fetch.c:294
#, c-format
msgid "unexpected result length while fetching remote files\n"
msgstr "неожиданная длина результата при получении удалённых файлов\n"
-#: libpq_fetch.c:303
+#: libpq_fetch.c:316
#, c-format
msgid "received null value for chunk for file \"%s\", file has been deleted\n"
msgstr "для файла \"%s\" вместо сегмента получено NULL-значение, файл удалён\n"
-#: libpq_fetch.c:310
+#: libpq_fetch.c:323
#, c-format
msgid "received chunk for file \"%s\", offset %d, size %d\n"
msgstr "получен сегмент файла \"%s\": смещение %d, размер %d\n"
-#: libpq_fetch.c:339
+#: libpq_fetch.c:352
#, c-format
msgid "could not fetch remote file \"%s\": %s"
msgstr "не удалось получить удалённый файл \"%s\": %s"
-#: libpq_fetch.c:344
+#: libpq_fetch.c:357
#, c-format
msgid "unexpected result set while fetching remote file \"%s\"\n"
msgstr "неожиданный набор результатов при получении удалённого файла \"%s\"\n"
-#: libpq_fetch.c:355
+#: libpq_fetch.c:368
#, c-format
msgid "fetched file \"%s\", length %d\n"
msgstr "получен файл \"%s\", длина %d\n"
-#: libpq_fetch.c:387
+#: libpq_fetch.c:400
#, c-format
msgid "could not send COPY data: %s"
msgstr "не удалось отправить данные COPY: %s"
-#: libpq_fetch.c:413
+#: libpq_fetch.c:426
#, c-format
msgid "could not create temporary table: %s"
msgstr "не удалось создать временную таблицу: %s"
-#: libpq_fetch.c:421
+#: libpq_fetch.c:434
#, c-format
msgid "could not send file list: %s"
msgstr "не удалось отправить список файлов: %s"
-#: libpq_fetch.c:463
+#: libpq_fetch.c:476
#, c-format
msgid "could not send end-of-COPY: %s"
msgstr "не удалось отправить сообщение о завершении копирования: %s"
-#: libpq_fetch.c:469
+#: libpq_fetch.c:482
#, c-format
msgid "unexpected result while sending file list: %s"
msgstr "неожиданный результат при передаче списка: %s"
@@ -477,6 +481,7 @@ msgstr ""
" --source-pgdata=КАТАЛОГ исходный каталог, с которым будет проведена "
"синхронизация\n"
+# well-spelled: ПОДКЛ
#: pg_rewind.c:69
#, c-format
msgid " --source-server=CONNSTR source server to synchronize with\n"
@@ -522,7 +527,8 @@ msgstr ""
"\n"
"Об ошибках сообщайте по адресу <pgsql-bugs@postgresql.org>.\n"
-#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:176
+#: pg_rewind.c:130 pg_rewind.c:161 pg_rewind.c:168 pg_rewind.c:175
+#: pg_rewind.c:183
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
@@ -535,68 +541,73 @@ msgstr ""
#: pg_rewind.c:167
#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: указать можно только --source-pgdata либо --source-server\n"
+
+#: pg_rewind.c:174
+#, c-format
msgid "%s: no target data directory specified (--target-pgdata)\n"
msgstr "%s: целевой каталог данных не указан (--target-pgdata)\n"
-#: pg_rewind.c:174
+#: pg_rewind.c:181
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
-#: pg_rewind.c:189
+#: pg_rewind.c:196
#, c-format
msgid "cannot be executed by \"root\"\n"
msgstr "программу не должен запускать root\n"
-#: pg_rewind.c:190
+#: pg_rewind.c:197
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "Запускать %s нужно от имени суперпользователя PostgreSQL.\n"
-#: pg_rewind.c:221
+#: pg_rewind.c:228
#, c-format
msgid "source and target cluster are on the same timeline\n"
msgstr "исходный и целевой кластер уже на одной линии времени\n"
-#: pg_rewind.c:227
+#: pg_rewind.c:234
#, c-format
msgid "servers diverged at WAL position %X/%X on timeline %u\n"
msgstr "Серверы разошлись в позиции WAL %X/%X на линии времени %u.\n"
-#: pg_rewind.c:264
+#: pg_rewind.c:271
#, c-format
msgid "no rewind required\n"
msgstr "перемотка не требуется.\n"
-#: pg_rewind.c:271
+#: pg_rewind.c:278
#, c-format
msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
msgstr ""
"перемотка от последней общей контрольной точки в позиции %X/%X на линии "
"времени %u\n"
-#: pg_rewind.c:279
+#: pg_rewind.c:286
#, c-format
msgid "reading source file list\n"
msgstr "чтение списка исходных файлов\n"
-#: pg_rewind.c:281
+#: pg_rewind.c:288
#, c-format
msgid "reading target file list\n"
msgstr "чтение списка целевых файлов\n"
-#: pg_rewind.c:291
+#: pg_rewind.c:298
#, c-format
msgid "reading WAL in target\n"
msgstr "чтение WAL в целевом кластере\n"
-#: pg_rewind.c:308
+#: pg_rewind.c:315
#, c-format
msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
msgstr ""
"требуется скопировать %lu МБ (общий размер исходного каталога: %lu МБ)\n"
-#: pg_rewind.c:325
+#: pg_rewind.c:332
#, c-format
msgid ""
"\n"
@@ -605,27 +616,27 @@ msgstr ""
"\n"
"создание метки копии и модификация управляющего файла\n"
-#: pg_rewind.c:353
+#: pg_rewind.c:360
#, c-format
msgid "syncing target data directory\n"
msgstr "синхронизация целевого каталога данных\n"
-#: pg_rewind.c:356
+#: pg_rewind.c:363
#, c-format
msgid "Done!\n"
msgstr "Готово!\n"
-#: pg_rewind.c:368
+#: pg_rewind.c:375
#, c-format
msgid "source and target clusters are from different systems\n"
msgstr "исходный и целевой кластеры относятся к разным системам\n"
-#: pg_rewind.c:376
+#: pg_rewind.c:383
#, c-format
msgid "clusters are not compatible with this version of pg_rewind\n"
msgstr "кластеры несовместимы с этой версией pg_rewind\n"
-#: pg_rewind.c:386
+#: pg_rewind.c:393
#, c-format
msgid ""
"target server needs to use either data checksums or \"wal_log_hints = on\"\n"
@@ -633,60 +644,60 @@ msgstr ""
"на целевом сервере должны быть контрольные суммы данных или \"wal_log_hints "
"= on\"\n"
-#: pg_rewind.c:397
+#: pg_rewind.c:404
#, c-format
msgid "target server must be shut down cleanly\n"
msgstr "целевой сервер должен быть выключен штатно\n"
-#: pg_rewind.c:407
+#: pg_rewind.c:414
#, c-format
msgid "source data directory must be shut down cleanly\n"
msgstr "работа с исходным каталогом данных должна быть завершена штатно\n"
-#: pg_rewind.c:462
+#: pg_rewind.c:469
#, c-format
msgid "invalid control file"
msgstr "неверный управляющий файл"
-#: pg_rewind.c:473
+#: pg_rewind.c:480
#, c-format
msgid "Source timeline history:\n"
msgstr "История линии времени источника:\n"
-#: pg_rewind.c:475
+#: pg_rewind.c:482
#, c-format
msgid "Target timeline history:\n"
msgstr "История линии времени получателя:\n"
#. translator: %d is a timeline number, others are LSN positions
-#: pg_rewind.c:489
+#: pg_rewind.c:496
#, c-format
msgid "%d: %X/%X - %X/%X\n"
msgstr "%d: %X/%X - %X/%X\n"
-#: pg_rewind.c:548
+#: pg_rewind.c:555
#, c-format
msgid ""
"could not find common ancestor of the source and target cluster's timelines\n"
msgstr ""
"не удалось найти общего предка линий времени исходного и целевого кластеров\n"
-#: pg_rewind.c:589
+#: pg_rewind.c:596
#, c-format
msgid "backup label buffer too small\n"
msgstr "буфер для метки копии слишком мал\n"
-#: pg_rewind.c:612
+#: pg_rewind.c:619
#, c-format
msgid "unexpected control file CRC\n"
msgstr "неверная контрольная сумма управляющего файла\n"
-#: pg_rewind.c:622
+#: pg_rewind.c:629
#, c-format
msgid "unexpected control file size %d, expected %d\n"
msgstr "неверный размер управляющего файла (%d), ожидалось: %d\n"
-#: pg_rewind.c:689
+#: pg_rewind.c:696
#, c-format
msgid ""
"The program \"initdb\" is needed by %s but was\n"
@@ -695,9 +706,9 @@ msgid ""
msgstr ""
"Для %s необходима программа \"initdb\", но она не найдена\n"
"в каталоге \"%s\".\n"
-"Проверьте вашу установку PostgreSQL.\n"
+"Проверьте правильность установки СУБД.\n"
-#: pg_rewind.c:693
+#: pg_rewind.c:700
#, c-format
msgid ""
"The program \"initdb\" was found by \"%s\"\n"
@@ -706,9 +717,9 @@ msgid ""
msgstr ""
"Программа \"initdb\" найдена в \"%s\",\n"
"но её версия отличается от версии %s.\n"
-"Проверьте вашу установку PostgreSQL.\n"
+"Проверьте правильность установки СУБД.\n"
-#: pg_rewind.c:711
+#: pg_rewind.c:718
#, c-format
msgid "sync of target directory failed\n"
msgstr "сбой синхронизации целевого каталога\n"
@@ -760,7 +771,7 @@ msgstr "неверное смещение записи: %X/%X"
msgid "contrecord is requested by %X/%X"
msgstr "по смещению %X/%X запрошено продолжение записи"
-#: xlogreader.c:325 xlogreader.c:624
+#: xlogreader.c:325 xlogreader.c:625
#, c-format
msgid "invalid record length at %X/%X: wanted %u, got %u"
msgstr "неверная длина записи по смещению %X/%X: ожидалось %u, получено %u"
@@ -780,34 +791,34 @@ msgstr "нет флага contrecord в позиции %X/%X"
msgid "invalid contrecord length %u at %X/%X"
msgstr "неверная длина contrecord (%u) в позиции %X/%X"
-#: xlogreader.c:632
+#: xlogreader.c:633
#, c-format
msgid "invalid resource manager ID %u at %X/%X"
msgstr "неверный ID менеджера ресурсов %u по смещению %X/%X"
-#: xlogreader.c:646 xlogreader.c:663
+#: xlogreader.c:647 xlogreader.c:664
#, c-format
msgid "record with incorrect prev-link %X/%X at %X/%X"
msgstr "запись с неверной ссылкой назад %X/%X по смещению %X/%X"
-#: xlogreader.c:700
+#: xlogreader.c:701
#, c-format
msgid "incorrect resource manager data checksum in record at %X/%X"
msgstr ""
"некорректная контрольная сумма данных менеджера ресурсов в записи по "
"смещению %X/%X"
-#: xlogreader.c:733
+#: xlogreader.c:734
#, c-format
msgid "invalid magic number %04X in log segment %s, offset %u"
msgstr "неверное магическое число %04X в сегменте журнала %s, смещение %u"
-#: xlogreader.c:747 xlogreader.c:798
+#: xlogreader.c:748 xlogreader.c:799
#, c-format
msgid "invalid info bits %04X in log segment %s, offset %u"
msgstr "неверные информационные биты %04X в сегменте журнала %s, смещение %u"
-#: xlogreader.c:773
+#: xlogreader.c:774
#, c-format
msgid ""
"WAL file is from different database system: WAL file database system "
@@ -816,7 +827,7 @@ msgstr ""
"файл WAL принадлежит другой СУБД: в нём указан идентификатор системы БД %s, "
"а идентификатор системы pg_control: %s"
-#: xlogreader.c:780
+#: xlogreader.c:781
#, c-format
msgid ""
"WAL file is from different database system: incorrect XLOG_SEG_SIZE in page "
@@ -825,7 +836,7 @@ msgstr ""
"файл WAL принадлежит другой СУБД: некорректный XLOG_SEG_SIZE в заголовке "
"страницы"
-#: xlogreader.c:786
+#: xlogreader.c:787
#, c-format
msgid ""
"WAL file is from different database system: incorrect XLOG_BLCKSZ in page "
@@ -834,35 +845,35 @@ msgstr ""
"файл WAL принадлежит другой СУБД: некорректный XLOG_BLCKSZ в заголовке "
"страницы"
-#: xlogreader.c:812
+#: xlogreader.c:813
#, c-format
msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
msgstr "неожиданный pageaddr %X/%X в сегменте журнала %s, смещение %u"
-#: xlogreader.c:837
+#: xlogreader.c:838
#, c-format
msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
msgstr ""
"нарушение последовательности ID линии времени %u (после %u) в сегменте "
"журнала %s, смещение %u"
-#: xlogreader.c:1044
+#: xlogreader.c:1083
#, c-format
msgid "out-of-order block_id %u at %X/%X"
msgstr "идентификатор блока %u идёт не по порядку в позиции %X/%X"
-#: xlogreader.c:1066
+#: xlogreader.c:1106
#, c-format
msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
msgstr "BKPBLOCK_HAS_DATA установлен, но данных в позиции %X/%X нет"
-#: xlogreader.c:1073
+#: xlogreader.c:1113
#, c-format
msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
msgstr ""
"BKPBLOCK_HAS_DATA не установлен, но длина данных равна %u в позиции %X/%X"
-#: xlogreader.c:1106
+#: xlogreader.c:1149
#, c-format
msgid ""
"BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -871,21 +882,21 @@ msgstr ""
"BKPIMAGE_HAS_HOLE установлен, но для пропуска заданы смещение %u и длина %u "
"при длине образа блока %u в позиции %X/%X"
-#: xlogreader.c:1122
+#: xlogreader.c:1165
#, c-format
msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
msgstr ""
"BKPIMAGE_HAS_HOLE не установлен, но для пропуска заданы смещение %u и длина "
"%u в позиции %X/%X"
-#: xlogreader.c:1137
+#: xlogreader.c:1180
#, c-format
msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
msgstr ""
"BKPIMAGE_IS_COMPRESSED установлен, но длина образа блока равна %u в позиции "
"%X/%X"
-#: xlogreader.c:1152
+#: xlogreader.c:1195
#, c-format
msgid ""
"neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image "
@@ -894,25 +905,24 @@ msgstr ""
"ни BKPIMAGE_HAS_HOLE, ни BKPIMAGE_IS_COMPRESSED не установлены, но длина "
"образа блока равна %u в позиции %X/%X"
-#: xlogreader.c:1168
+#: xlogreader.c:1211
#, c-format
msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
msgstr ""
"BKPBLOCK_SAME_REL установлен, но предыдущее значение не задано в позиции %X/"
"%X"
-#: xlogreader.c:1180
+#: xlogreader.c:1223
#, c-format
msgid "invalid block_id %u at %X/%X"
msgstr "неверный идентификатор блока %u в позиции %X/%X"
-#: xlogreader.c:1245
+#: xlogreader.c:1291
#, c-format
msgid "record with invalid length at %X/%X"
msgstr "запись с неверной длиной в позиции %X/%X"
-#: xlogreader.c:1334
+#: xlogreader.c:1380
#, c-format
msgid "invalid compressed image at %X/%X, block %d"
msgstr "неверный сжатый образ в позиции %X/%X, блок %d"
-