]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/3297'
authorTom Hughes <tom@compton.nu>
Wed, 15 Sep 2021 17:44:23 +0000 (18:44 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 15 Sep 2021 17:44:23 +0000 (18:44 +0100)
1  2 
config/locales/en.yml

diff --combined config/locales/en.yml
index c241f902079ef4d82d34e816d36507d7c642a7ec,9f0e42f7a1689e2c476eb8f08fa7f61f149aad70..6869e966b821503bafb3b4e568ef033cecb95ca7
@@@ -416,6 -416,26 +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."
+   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
            window_construction: "Window Construction"
            winery: "Winery"
            "yes": "Craft Shop"
 +        crossing: "Crossing"
          emergency:
            access_point: "Access Point"
            ambulance_station: "Ambulance Station"
            hill: "Hill"
            hot_spring: "Hot Spring"
            island: "Island"
 +          isthmus: "Isthmus"
            land: "Land"
            marsh: "Marsh"
            moor: "Moor"
            sand: "Sand"
            scree: "Scree"
            scrub: "Scrub"
 +          shingle: "Shingle"
            spring: "Spring"
            stone: "Stone"
            strait: "Strait"
            tree: "Tree"
 +          tree_row: "Tree Row"
 +          tundra: "Tundra"
            valley: "Valley"
            volcano: "Volcano"
            water: "Water"
      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_fastly: "Fastly"
      partners_bytemark: "Bytemark Hosting"
      partners_partners: "partners"
      tou: "Terms of Use"
            <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
 -          <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
        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"
        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
        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"
        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
-     popup:
-       your location: "Your location"
-       nearby mapper: "Nearby mapper"
-       friend: "Friend"
      account:
        title: "Edit account"
        my settings: My Settings
          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: