X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/40b452ac7431387979fa2c2cdd2565bae5993f29..33a6b79bd78f1903011367f6a5adf2f91d160f74:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 555eab344..302c3dbd3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -462,12 +462,13 @@ en:
   geocoder:
     search:
       title:
-        latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
         us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
+        osm_nominatim_reverse: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
@@ -1031,15 +1032,7 @@ en:
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     donate_link_text: donating
-    help: Help
-    help_centre: Help Centre
-    help_url: http://help.openstreetmap.org/
-    help_title: Help site for the project
-    wiki: Wiki
-    wiki_url: http://wiki.openstreetmap.org/
-    wiki_title: Wiki site for the project
-    documentation: Documentation
-    documentation_title: Documentation for the project
+    help: help
     copyright: "Copyright & License"
     community: Community
     community_blogs: "Community Blogs"
@@ -1076,7 +1069,7 @@ en:
       intro_3_html: |
         The cartography in our map tiles, and our documentation, are
         licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-        Commons Attribution-ShareAlike 2.0</a> license (CC-BY-SA).
+        Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
       credit_title_html: How to credit OpenStreetMap
       credit_1_html: |
         We require that you use the credit &ldquo;&copy; OpenStreetMap
@@ -1084,7 +1077,7 @@ en:
       credit_2_html: |
         You must also make it clear that the data is available under the Open
         Database License, and if using our map tiles, that the cartography is
-        licensed as CC-BY-SA. You may do this by linking to
+        licensed as CC BY-SA. You may do this by linking to
         <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
         Alternatively, and as a requirement if you are distributing OSM in a
         data form, you can name and link directly to the license(s). In media
@@ -1119,7 +1112,7 @@ en:
         <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
         <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
         <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).
+        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
       contributors_ca_html: |
         <strong>Canada</strong>: Contains data from
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1207,6 +1200,27 @@ en:
         Just go to <a href='%{map_url}'>the map</a> and click the note icon:
         <span class='icon note'></span>. This will add a marker to the map, which you can move
         by dragging. Add your message, then click save, and other mappers will investigate.
+  help_page:
+    title: Getting Help
+    introduction: |
+      OpenStreetMap has several resources for learning about the project, asking and answering questions,
+      and collaboratively discussing and documenting mapping topics.
+    welcome:
+      url: http://www.openstreetmap.org/welcome
+      title: Welcome to OSM
+      description: A one-page introduction for new users
+    learnosm:
+      url: http://learnosm.org/
+      title: LearnOSM
+      description: Learn OpenStreetMap Step by Step
+    help:
+      url: https://help.openstreetmap.org/
+      title: help.openstreetmap.org
+      description: OSM's question-and-answer site
+    wiki:
+      url: http://wiki.openstreetmap.org/
+      title: wiki.openstreetmap.org
+      description: A wiki-based documentation site
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -2131,11 +2145,13 @@ en:
         cycle_map: Cycle Map
         transport_map: Transport Map
         mapquest: MapQuest Open
+        hot: Humanitarian
       layers:
         header: Map Layers
         notes: Map Notes
         data: Map Data
         overlays: Enable overlays for troubleshooting the map
+        title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
     site:
       edit_tooltip: Edit the map