Alternative conflict resolutions after repository conversion for the translation bot#33

Open

cameel wants to merge 2 commits intodevelopfrom alternative-conflict-resolutions

+19-34

Commits on Jul 22, 2022

Restore text that (rightly or wrongly) disappeared due to past conflict resolutions
cameel
committed
Alternative versions of text that was not chosen in past conflict resolutions
cameel
committed