<p dir="auto">I've fixed the merge conflicts for this ancient PR; it seems like the name corrections are still helpful.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/3536'>https://github.com/openstreetmap/openstreetmap-website/pull/3536</a></p>

<h4>Commit Summary</h4>
<ul>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3536/commits/4c8c978191a4a28cb92efb43f190fe9c545084ad" class="commit-link">4c8c978</a>  Meaningful and disambiguating reference labels.</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3536/commits/f730147766ee891fb3d3fd3e3acb151010def20d" class="commit-link">f730147</a>  Roll back contentious and faulty changes and change "Pre-school" to "Kindergarten".</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3536/commits/550c4a3a45814fde5c809334c85f1ebc47659a82" class="commit-link">550c4a3</a>  Merge branch 'master' into HEAD</li>
</ul>

<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3536/files">1 file</a>)</p>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3536/files#diff-44438ce218f5287c58d0017f965d888715635d94280669896f75841fbd7b4cd7">config/locales/en.yml</a>
    (28)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3536.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/3536.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3536.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/3536.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3536">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLI4XGFNO34W7UB242DVGX52HANCNFSM5UHEEIIA">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLNEWIDYRNWJNOW4BILVGX52HA5CNFSM5UHEEIIKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4SC2DG4A.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/3536</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/3536",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/3536",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>