From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Jun 2019 17:58:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2256'
X-Git-Tag: live~3636
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5708c25e04a3d31796771fbcb44485bf601cec8b?hp=46e3d846747a8ed50b2fd29d1e162432fca38e7d

Merge remote-tracking branch 'upstream/pull/2256'
---

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c5a636569..df2001b0a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -54,6 +54,13 @@ might be difficult to understand what the code does, why it does it
 and why it should be the way it is.
 * Check existing comments to ensure that they are not misleading.
 
+## i18n
+
+If you make a change that involve the locale files (in `config/locales`) then please
+only submit changes to the `en.yml` file. The other files are updated via
+[Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) and should
+not be included in your pull request.
+
 ## Code Documentation
 
 To generate the HTML documentation of the API/rails code, run the command