Merge remote-tracking branch 'origin/develop' into develop

delivrance · delivrance · commit 568300121e4f · 2019-01-30T17:17:10.000+01:00
diff --git a/compiler/error/source/420_FLOOD.tsv b/compiler/error/source/420_FLOOD.tsv
@@ -1,2 +1,3 @@
 id	message
 FLOOD_WAIT_X	A wait of {x} seconds is required
+TAKEOUT_INIT_DELAY_X	You have to confirm the data export request using one of your mobile devices or wait {x} seconds

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`id message`
`2`	`2`	`FLOOD_WAIT_X A wait of {x} seconds is required`
	`3`	`+TAKEOUT_INIT_DELAY_X You have to confirm the data export request using one of your mobile devices or wait {x} seconds`