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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5b1686c6b81b6eddf6c2f63304d00b9428bcde85..caee480d9448425f5a0b38aa01e916a7e4ad7bf5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -416,6 +416,26 @@ en:
       title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
     timeout:
       sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
       title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
     timeout:
       sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."

+  dashboards:
+    contact:
+      km away: "%{count}km away"
+      m away: "%{count}m away"
+    popup:
+      your location: "Your location"
+      nearby mapper: "Nearby mapper"
+      friend: "Friend"
+    show:
+      title: My Dashboard
+      no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
+      edit_your_profile: Edit your profile
+      my friends: My friends
+      no friends: You have not added any friends yet.
+      nearby users: "Other nearby users"
+      no nearby users: "There are no other users who admit to mapping nearby yet."
+      friends_changesets: "friends' changesets"
+      friends_diaries: "friends' diary entries"
+      nearby_changesets: "nearby user changesets"
+      nearby_diaries: "nearby user diary entries"

   diary_entries:
     new:
       title: New Diary Entry
   diary_entries:
     new:
       title: New Diary Entry


@@ -747,6 +767,7 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"

+        crossing: "Crossing"

         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"


@@ -1002,6 +1023,7 @@ en:
           hill: "Hill"
           hot_spring: "Hot Spring"
           island: "Island"
           hill: "Hill"
           hot_spring: "Hot Spring"
           island: "Island"

+          isthmus: "Isthmus"

           land: "Land"
           marsh: "Marsh"
           moor: "Moor"
           land: "Land"
           marsh: "Marsh"
           moor: "Moor"


@@ -1016,10 +1038,13 @@ en:
           sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"
           sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"

+          shingle: "Shingle"

           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           tree: "Tree"
           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           tree: "Tree"

+          tree_row: "Tree Row"
+          tundra: "Tundra"

           valley: "Valley"
           volcano: "Volcano"
           water: "Water"
           valley: "Valley"
           volcano: "Volcano"
           water: "Water"


@@ -1420,8 +1445,9 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."

     partners_ucl: "UCL"
     partners_ucl: "UCL"

+    partners_fastly: "Fastly"

     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     tou: "Terms of Use"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     tou: "Terms of Use"


@@ -1838,9 +1864,8 @@ en:
         credit_3_1_html: |
           The map tiles in the “standard style” at www.openstreetmap.org are a
           Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
         credit_3_1_html: |
           The map tiles in the “standard style” at www.openstreetmap.org are a
           Produced Work by the OpenStreetMap Foundation using OpenStreetMap data

-          under the Open Database License. If you are using these tiles please use
-          the following attribution:
-          “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+          under the Open Database License. When using this map style, the same attribution is
+          required as for the map data.

         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:


@@ -1869,10 +1894,10 @@ en:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
         contributors_au_html: |
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
         contributors_au_html: |

-          <strong>Australia</strong>: Contains data sourced from
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+          <strong>Australia</strong>: Incorporates or developed using Administrative Boundaries &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>

           licensed by the Commonwealth of Australia under
           licensed by the Commonwealth of Australia under

-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.

         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural


@@ -2304,6 +2329,11 @@ en:
       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: "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."
       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: "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:
+      account_settings: Account Settings
+      oauth1_settings: OAuth 1 settings
+      oauth2_applications: OAuth 2 applications
+      oauth2_authorizations: OAuth 2 authorizations

   oauth:
     authorize:
       title: "Authorize access to your account"
   oauth:
     authorize:
       title: "Authorize access to your account"


@@ -2337,6 +2367,8 @@ en:
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes

+      read_email: Read user email address
+      skip_authorization: Auto approve application

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -2484,6 +2516,7 @@ en:
       my settings: My Settings
       my comments: My Comments
       my_preferences: My Preferences
       my settings: My Settings
       my comments: My Comments
       my_preferences: My Preferences

+      my_dashboard: My Dashboard

       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       edit_profile: Edit Profile
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       edit_profile: Edit Profile


@@ -2505,14 +2538,6 @@ en:
       spam score: "Spam Score:"
       description: Description
       user location: User location
       spam score: "Spam Score:"
       description: Description
       user location: User location

-      no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
-      edit_your_profile: Edit your profile
-      my friends: My friends
-      no friends: You have not added any friends yet.
-      km away: "%{count}km away"
-      m away: "%{count}m away"
-      nearby users: "Other nearby users"
-      no nearby users: "There are no other users who admit to mapping nearby yet."

       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"


@@ -2533,15 +2558,7 @@ en:
       unhide_user: "Unhide this User"
       delete_user: "Delete this User"
       confirm: "Confirm"
       unhide_user: "Unhide this User"
       delete_user: "Delete this User"
       confirm: "Confirm"

-      friends_changesets: "friends' changesets"
-      friends_diaries: "friends' diary entries"
-      nearby_changesets: "nearby user changesets"
-      nearby_diaries: "nearby user diary entries"

       report: Report this User
       report: Report this User

-    popup:
-      your location: "Your location"
-      nearby mapper: "Nearby mapper"
-      friend: "Friend"

     account:
       title: "Edit account"
       my settings: My Settings
     account:
       title: "Edit account"
       my settings: My Settings


@@ -2570,10 +2587,6 @@ en:
         link text: "what is this?"
       save changes button: Save Changes
       make edits public button: Make all my edits public
         link text: "what is this?"
       save changes button: Save Changes
       make edits public button: Make all my edits public

-      return to profile: Return to profile
-      oauth1 settings: OAuth 1 settings
-      oauth2 applications: OAuth 2 applications
-      oauth2 authorizations: OAuth 2 authorizations

       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
     set_home:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
     set_home:


@@ -2610,6 +2623,7 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope

+      unknown_error: Authentication failed

     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |
     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |