James Lakin 6e6da2c276 Tweak locale to respect singular conflicting file message in P… (#10177)
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
2020-02-07 17:38:18 +01:00
..
2020-01-14 22:57:13 +01:00