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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 91cbeadbc423a6b1a220eb90d0100099dbeb05ec..d2cda9abebc55134b3831ee620c0f4c0e95c2b1b 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -505,7 +505,8 @@ en-GB:
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
-    comments:
+  diary_comments:
+    index:
       post: Post
       when: When
       comment: Comment
@@ -1399,6 +1400,7 @@ en-GB:
       legal_title: Legal
       partners_title: Partners
     copyright:
+      title: Copyright and Licence
       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},
@@ -1412,7 +1414,6 @@ en-GB:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:
-        title_html: Copyright and Licence
         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage