From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 19 Jun 2024 14:26:21 +0000 (+0100)
Subject: Merge pull request #4884 from AntonKhorev/copyright-page-title
X-Git-Tag: live~844
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/54aa89a4bf8118a3fdec2d60acba6aeb7beaa8c8?hp=-c

Merge pull request #4884 from AntonKhorev/copyright-page-title

Add title to copyright page
---

54aa89a4bf8118a3fdec2d60acba6aeb7beaa8c8
diff --combined config/locales/en.yml
index e8dde9521,c86bfa2c0..8de8a8721
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -592,14 -592,7 +592,14 @@@ en
        all:
          title: "OpenStreetMap diary entries"
          description: "Recent diary entries from users of OpenStreetMap"
 -    comments:
 +    subscribe:
 +      heading: Subscribe to the following diary entry discussion?
 +      button: Subscribe to discussion
 +    unsubscribe:
 +      heading: Unsubscribe from the following diary entry discussion?
 +      button: Unsubscribe from discussion
 +  diary_comments:
 +    index:
        title: "Diary Comments added by %{user}"
        heading: "%{user}'s Diary Comments"
        subheading_html: "Diary Comments added by %{user}"
@@@ -609,6 -602,12 +609,6 @@@
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
 -    subscribe:
 -      heading: Subscribe to the following diary entry discussion?
 -      button: Subscribe to discussion
 -    unsubscribe:
 -      heading: Unsubscribe from the following diary entry discussion?
 -      button: Unsubscribe from discussion
    doorkeeper:
      errors:
        messages:
@@@ -1961,6 -1960,7 +1961,7 @@@
        legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
        partners_title: Partners
      copyright:
+       title: Copyright and License
        foreign:
          title: About this translation
          html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence
@@@ -1971,7 -1971,6 +1972,6 @@@
          native_link: THIS_LANGUAGE_NAME_HERE version
          mapping_link: start mapping
        legal_babble:
-         title_html: Copyright and License
          introduction_1_html: |
            OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
            %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).
@@@ -2174,6 -2173,9 +2174,6 @@@
      index:
        js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
        js_2: "OpenStreetMap uses JavaScript for its slippy map."
 -      permalink: Permalink
 -      shortlink: Shortlink
 -      createnote: Add a note
        license:
          copyright: "Copyright OpenStreetMap and contributors, under an open license"
          license_url: "https://openstreetmap.org/copyright"