From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 Jul 2019 17:47:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2322'
X-Git-Tag: live~2493
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/43b0d4236300e65c5fa9f9c49f348e95f96bcc16?hp=a254efb5ec6b30601aeb82cf6380ace02d71c4e8

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 67d68fe61..e8a36f945 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1597,7 +1597,7 @@ en:
         and collaboratively discussing and documenting mapping topics.
       welcome:
         url: /welcome
-        title: Welcome to OSM
+        title: Welcome to OpenStreetMap
         description: Start with this quick guide covering the OpenStreetMap basics.
       beginners_guide:
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
@@ -1605,8 +1605,8 @@ en:
         description: Community maintained guide for beginners.
       help:
         url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
-        description: Ask a question or look up answers on OSM's question-and-answer site.
+        title: Help Forum
+        description: Ask a question or look up answers on OpenStreetMap's question-and-answer site.
       mailing_lists:
         url: https://lists.openstreetmap.org/
         title: Mailing Lists
@@ -1629,8 +1629,8 @@ en:
         description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
       wiki:
         url: https://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: Browse the wiki for in-depth OSM documentation.
+        title: OpenStreetMap Wiki
+        description: Browse the wiki for in-depth OpenStreetMap documentation.
     sidebar:
       search_results: Search Results
       close: Close