Mark class_descr strings for translation

1 patchset tracked - current t248730_1

v1t248730_1posted Jul 03, 06:37successneeds rebaserecent 13dpg 20

basef836b688f Sep 07, 02:50 on master

applyapplied Sep 07, 05:45

rebaselast tried about 22 hours ago on 9e17d25e7

Applying: Mark object class descriptions for translation
Using index info to reconstruct a base tree...
M	src/backend/catalog/objectaddress.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/catalog/objectaddress.c
CONFLICT (content): Merge conflict in src/backend/catalog/objectaddress.c
Patch failed at 0001 Mark object class descriptions for translation

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

conflicts on master: src/backend/catalog/objectaddress.c

pushSep 07, 05:45 -> a26495f52 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1024 / 1024	2m 50s / 5m 25s	`docker run ... :t248730`	Sep 07, 05:56
run 34088007759 executed 1024 - ccache 98 hit / 6527 miss - head a26495f52 - digest sha256:08bb3b54bdc502... - run 34088007759
success	1	20	1024 / 1024	2m 54s / 5m 13s	`docker run ... @sha256:5364fdb...`	Sep 05, 07:48
run 33953017510 executed 1024 - ccache 98 hit / 6527 miss - head e0e947df9 - digest sha256:5364fdbc91c622... - run 33953017510
success	1	20	1024 / 1024	2m 55s / 5m 29s	`docker run ... @sha256:d157497...`	Sep 04, 07:46
run 33849440500 executed 1024 - ccache 98 hit / 6527 miss - head b9ff6954b - digest sha256:d1574976fe82ee... - run 33849440500
success	1	20	1023 / 1023	2m 47s / 5m 05s	`docker run ... @sha256:edf0c9b...`	Sep 03, 07:43
run 33728667760 executed 1023 - ccache 98 hit / 6526 miss - head 0d3ee44c9 - digest sha256:edf0c9b7f2c0ef... - run 33728667760
success	1	20	1022 / 1022	2m 54s / 5m 17s	`docker run ... @sha256:6ccfa71...`	Sep 02, 07:42
run 33604022207 executed 1022 - ccache 98 hit / 6526 miss - head 001e54b54 - digest sha256:6ccfa71bca67f0... - run 33604022207
success	1	20	1022 / 1022	2m 45s / 5m 23s	`docker run ... @sha256:5c6403a...`	Sep 01, 07:39
run 33482319799 executed 1022 - ccache 98 hit / 6526 miss - head 302ebf331 - digest sha256:5c6403acc3b281... - run 33482319799
success	1	20	1022 / 1022	3m 11s / 5m 54s	`docker run ... @sha256:0634f4d...`	Aug 31, 07:25
run 33367171369 executed 1022 - ccache 98 hit / 6526 miss - head 0dc9ce8ab - digest sha256:0634f4d237c5a5... - run 33367171369
success	1	20	1021 / 1021	2m 55s / 5m 40s	`docker run ... @sha256:7adb797...`	Aug 30, 07:19
run 33298476318 executed 1021 - ccache 98 hit / 6525 miss - head 0f8435d69 - digest sha256:7adb797120ab20... - run 33298476318
success	1	20	1021 / 1021	1m 49s / 4m 12s	`docker run ... @sha256:2bd9c84...`	Aug 29, 07:13
run 33239978164 executed 1021 - ccache 98 hit / 6525 miss - head 142eff408 - digest sha256:2bd9c84abd287f... - run 33239978164
success	1	20	1021 / 1021	2m 57s / 5m 25s	`docker run ... @sha256:91acc5a...`	Aug 28, 07:06
run 33149626899 executed 1021 - ccache 98 hit / 6525 miss - head 7424155cc - digest sha256:91acc5a40f6eca... - run 33149626899
success	1	20	1021 / 1021	2m 55s / 5m 12s	`docker run ... @sha256:d1837b8...`	Aug 27, 07:04
run 33047544663 executed 1021 - ccache 98 hit / 6525 miss - head 78346e239 - digest sha256:d1837b80f47f31... - run 33047544663
success	1	20	1024 / 1024	2m 11s / 4m 40s	`docker run ... @sha256:c70133c...`	Aug 26, 06:40
run 32938422138 executed 1024 - ccache 98 hit / 6525 miss - head cd671d24e - digest sha256:c70133c3e35796... - run 32938422138
success	1	20	1024 / 1024	2m 55s / 5m 30s	`docker run ... @sha256:7715e5c...`	Aug 25, 06:35
run 32816716059 executed 1024 - ccache 98 hit / 6525 miss - head 86363b72f - digest sha256:7715e5c00944f3... - run 32816716059
success	1	20	1023 / 1023	2m 50s / 5m 26s	`docker run ... @sha256:520317f...`	Aug 24, 06:33
run 32697018697 executed 1023 - ccache 98 hit / 6525 miss - head 386fd4809 - digest sha256:520317f8e30b58... - run 32697018697
success	1	20	1023 / 1023	2m 57s / 5m 31s	`docker run ... @sha256:a54c759...`	Aug 23, 06:31
run 32622661026 executed 1023 - ccache 98 hit / 6525 miss - head bdd9178a7 - digest sha256:a54c7597b8386f... - run 32622661026
success	1	20	1023 / 1023	2m 50s / 5m 25s	`docker run ... @sha256:2022246...`	Aug 22, 06:30
run 32556638048 executed 1023 - ccache 98 hit / 6525 miss - head ac241dca8 - digest sha256:2022246dd0255e... - run 32556638048
success	1	20	1023 / 1023	2m 48s / 5m 15s	`docker run ... @sha256:777dfc3...`	Aug 21, 06:27
run 32453770858 executed 1023 - ccache 98 hit / 6525 miss - head 34846ace9 - digest sha256:777dfc3c7fcce7... - run 32453770858
success	1	20	1023 / 1023	2m 55s / 5m 28s	`docker run ... @sha256:280f8c8...`	Aug 20, 06:29
run 32338868869 executed 1023 - ccache 98 hit / 6525 miss - head a2654b54b - digest sha256:280f8c801b55e8... - run 32338868869
success	1	20	1023 / 1023	2m 58s / 5m 36s	`docker run ... @sha256:77350eb...`	Aug 19, 06:33
run 32222553701 executed 1023 - ccache 98 hit / 6525 miss - head 1cf1a7d67 - digest sha256:77350ebdf3c5a7... - run 32222553701
success	1	20	1020 / 1020	2m 53s / 5m 19s	`docker run ... @sha256:e28e7eb...`	Aug 18, 06:24
run 32105960375 executed 1020 - ccache 98 hit / 6524 miss - head b546e4054 - digest sha256:e28e7eb1b20e4d... - run 32105960375
success	1	20	1019 / 1019	2m 55s / 5m 29s	`docker run ... @sha256:d5cc906...`	Aug 17, 06:23
run 32000656394 executed 1019 - ccache 98 hit / 6524 miss - head 199fbd65c - digest sha256:d5cc9069d55fd3... - run 32000656394
success	1	20	1019 / 1019	2m 54s / 5m 14s	`docker run ... @sha256:c0826f2...`	Aug 16, 06:21
run 31930788398 executed 1019 - ccache 98 hit / 6524 miss - head 23d049016 - digest sha256:c0826f21d46c78... - run 31930788398
success	1	20	1019 / 1019	2m 13s / 4m 40s	`docker run ... @sha256:1305014...`	Aug 15, 06:18
run 31868724481 executed 1019 - ccache 98 hit / 6524 miss - head e1a09b2e6 - digest sha256:13050148730ce3... - run 31868724481
success	1	20	1019 / 1019	2m 54s / 5m 15s	`docker run ... @sha256:3e62539...`	Aug 14, 06:19
run 31775276346 executed 1019 - ccache 165 hit / 6457 miss - head 3cca97f62 - digest sha256:3e62539c037cc0... - run 31775276346
success	1	20	1019 / 1019	2m 56s / 5m 18s	`docker run ... @sha256:da75c12...`	Aug 13, 06:17
run 31672648224 executed 1019 - ccache 165 hit / 6457 miss - head 73d3190dd - digest sha256:da75c124c459d6... - run 31672648224
success	1	20	1019 / 1019	2m 57s / 5m 27s	`docker run ... @sha256:5215cd7...`	Aug 12, 06:16
run 31568742510 executed 1019 - ccache 165 hit / 6454 miss - head aa5a07adf - digest sha256:5215cd7d5aadbc... - run 31568742510
success	1	20	1019 / 1019	3m 14s / 5m 49s	`docker run ... @sha256:e34717a...`	Aug 11, 06:16
run 31463794361 executed 1019 - ccache 165 hit / 6453 miss - head e889598e0 - digest sha256:e34717a8d54caa... - run 31463794361
success	1	20	1019 / 1019	2m 54s / 5m 34s	`docker run ... @sha256:8662bbb...`	Aug 10, 06:17
run 31360527367 executed 1019 - ccache 166 hit / 6452 miss - head 2b8222a16 - digest sha256:8662bbbfb3140c... - run 31360527367
success	1	20	1019 / 1019	2m 19s / 4m 29s	`docker run ... @sha256:9ee858a...`	Aug 08, 04:51
run 31240001894 executed 1019 - ccache 166 hit / 6452 miss - head 14727c43e - digest sha256:9ee858a252f4f1... - run 31240001894
success	1	20	1018 / 1018	2m 47s / 5m 16s	`docker run ... @sha256:8e717f5...`	Aug 07, 04:50
run 31148074967 executed 1018 - ccache 166 hit / 6452 miss - head 1c4a12ed4 - digest sha256:8e717f5c0cc983... - run 31148074967
success	1	20	1018 / 1018	2m 49s / 5m 22s	`docker run ... @sha256:c4f00a6...`	Aug 05, 23:43
run 31056758795 executed 1018 - ccache 166 hit / 6452 miss - head cb0288161 - digest sha256:c4f00a66b7b605... - run 31056758795
success	1	20	1018 / 1018	2m 59s / 5m 43s	`docker run ... @sha256:ce50202...`	Aug 04, 23:43
run 30960304429 executed 1018 - ccache 166 hit / 6452 miss - head 53dfcb3d9 - digest sha256:ce5020295165c9... - run 30960304429
success	1	20	1018 / 1018	2m 55s / 5m 36s	`docker run ... @sha256:c83a3b5...`	Aug 03, 23:41
run 30862518544 executed 1018 - ccache 166 hit / 6452 miss - head 2b20cbece - digest sha256:c83a3b58e465d3... - run 30862518544
success	1	20	1017 / 1017	2m 26s / 4m 26s	`docker run ... @sha256:4fac1ed...`	Aug 02, 23:39
run 30772361116 executed 1017 - ccache 166 hit / 6452 miss - head 4214fce47 - digest sha256:4fac1ed56c5ec8... - run 30772361116
success	1	20	1017 / 1017	2m 55s / 5m 12s	`docker run ... @sha256:5aa8fa0...`	Aug 01, 23:37
run 30723354006 executed 1017 - ccache 166 hit / 6452 miss - head 03a6d0858 - digest sha256:5aa8fa07e560a7... - run 30723354006
success	1	20	1017 / 1017	2m 55s / 5m 44s	`docker run ... @sha256:9553225...`	Jul 31, 23:37
run 30672842726 executed 1017 - ccache 166 hit / 6452 miss - head d4c98c0c2 - digest sha256:95532256de40a6... - run 30672842726
success	1	20	1016 / 1016	2m 49s / 4m 52s	`docker run ... @sha256:b095b92...`	Jul 30, 23:34
run 30590387976 executed 1016 - ccache 166 hit / 6452 miss - head f5352ef11 - digest sha256:b095b92501f6c3... - run 30590387976
success	1	20	1016 / 1016	2m 54s / 5m 30s	`docker run ... @sha256:afd4cc4...`	Jul 29, 23:33
run 30499313560 executed 1016 - ccache 166 hit / 6452 miss - head 95db89c61 - digest sha256:afd4cc451ce799... - run 30499313560
success	1	20	1015 / 1015	2m 13s / 4m 07s	`docker run ... @sha256:d46978b...`	Jul 28, 23:34
run 30407724766 executed 1015 - ccache 166 hit / 6452 miss - head 902bdbe5c - digest sha256:d46978b1941d9d... - run 30407724766