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

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 96c31d469823cfa2993a13284bec57b32b834487..6e6906c0d490f532fce4320541b3cafdd0828dca 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,7 +38,7 @@ en:
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable

-    # Translates all the model names, which is used in error handling on the web site
+    # Translates all the model names, which is used in error handling on the website

     models:
       acl: "Access Control List"
       changeset: "Changeset"
     models:
       acl: "Access Control List"
       changeset: "Changeset"


@@ -75,8 +75,8 @@ en:
       way: "Way"
       way_node: "Way Node"
       way_tag: "Way Tag"
       way: "Way"
       way_node: "Way Node"
       way_tag: "Way Tag"

-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
+    # Translates all the model attributes, which is used in error handling on the website
+    # Only the ones that are used on the website are translated at the moment

     attributes:
       client_application:
         name: Name (Required)
     attributes:
       client_application:
         name: Name (Required)


@@ -615,7 +615,7 @@ en:
           hangar: "Hangar"
           helipad: "Helipad"
           holding_position: "Holding Position"
           hangar: "Hangar"
           helipad: "Helipad"
           holding_position: "Holding Position"

-          navigationaid: "Aviation Navigation aid"
+          navigationaid: "Aviation Navigation Aid"

           parking_position: "Parking Position"
           runway: "Runway"
           taxilane: "Taxilane"
           parking_position: "Parking Position"
           runway: "Runway"
           taxilane: "Taxilane"


@@ -675,7 +675,7 @@ en:
           ice_cream: "Ice Cream"
           internet_cafe: "Internet Cafe"
           kindergarten: "Kindergarten"
           ice_cream: "Ice Cream"
           internet_cafe: "Internet Cafe"
           kindergarten: "Kindergarten"

-          language_school: "Language school"
+          language_school: "Language School"

           library: "Library"
           loading_dock: "Loading Dock"
           love_hotel: "Love Hotel"
           library: "Library"
           loading_dock: "Loading Dock"
           love_hotel: "Love Hotel"


@@ -794,7 +794,7 @@ en:
           "yes": "Building"
         club:
           scout: "Scout Group Base"
           "yes": "Building"
         club:
           scout: "Scout Group Base"

-          sport: "Sportsclub"
+          sport: "Sports Club"

           "yes": "Club"
         craft:
           beekeeper: "Beekeeper"
           "yes": "Club"
         craft:
           beekeeper: "Beekeeper"


@@ -1838,7 +1838,7 @@ en:
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors

-      used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"
+      used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"

       lede_text: |
         OpenStreetMap is built by a community of mappers that contribute and maintain data
         about roads, trails, cafés, railway stations, and much more, all over the world.
       lede_text: |
         OpenStreetMap is built by a community of mappers that contribute and maintain data
         about roads, trails, cafés, railway stations, and much more, all over the world.


@@ -2066,7 +2066,7 @@ en:
           description: "Extracts for major world cities and their surrounding areas"
         other:
           title: "Other Sources"
           description: "Extracts for major world cities and their surrounding areas"
         other:
           title: "Other Sources"

-          description: "Additional sources listed on the OpenStreetMap wiki"
+          description: "Additional sources listed on the OpenStreetMap Wiki"

       options: "Options"
       format: "Format"
       scale: "Scale"
       options: "Options"
       format: "Format"
       scale: "Scale"


@@ -2384,7 +2384,7 @@ en:
     require_admin:
       not_an_admin: You need to be an admin to perform that action.
     setup_user_auth:
     require_admin:
       not_an_admin: You need to be an admin to perform that action.
     setup_user_auth:

-      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
+      blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits."

       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu: