Merge pull request #4813 from AntonKhorev/no-fst-italic

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b2d20128faeac3bf5836c81265383532b550475a..213127d454ee3e0bb5255c7bd42c8ae78777a864 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -394,6 +394,11 @@ en-GB:
       join_discussion: Log in to join the discussion
       still_open: Changeset still open - discussion will open once the changeset is
         closed.
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe
+      hide_comment: hide
+      unhide_comment: unhide
+      comment: Comment
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -500,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
@@ -1428,9 +1434,6 @@ en-GB:
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Add a note
       license:
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that
@@ -2086,13 +2089,6 @@ en-GB:
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
-    changesets:
-      show:
-        comment: Comment
-        subscribe: Subscribe
-        unsubscribe: Unsubscribe
-        hide_comment: hide
-        unhide_comment: unhide
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions: