X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/256637f6cb34977356b30059a39af53e9e92702d..43d60108daf5f097b81afd2200273713e244b9b7:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e887a71aa..747c23c83 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -251,13 +251,6 @@ en:
       openid:
         link: "https://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
-      public editing:
-        heading: "Public editing"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "what is this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
       contributor terms:
         heading: "Contributor Terms"
         agreed: "You have agreed to the new Contributor Terms."
@@ -629,15 +622,6 @@ en:
       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}"
-      no_comments: "No diary comments"
-    page:
-      post: Post
-      when: When
-      comment: Comment
     new:
       heading: Add a comment to the following diary entry discussion?
   doorkeeper:
@@ -1661,7 +1645,7 @@ en:
       header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
-    friendship_notification:
+    follow_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} followed you"
       followed_you: "%{user} is now following you on OpenStreetMap."
@@ -2888,6 +2872,16 @@ en:
       user:
         summary_html: "%{name} created from %{ip_address} on %{date}"
         summary_no_ip_html: "%{name} created on %{date}"
+    diary_comments:
+      index:
+        title: "Diary Comments added by %{user}"
+        heading_html: "%{user}'s Comments"
+        diary_entries: "Diary entries"
+        no_comments: "No comments"
+      page:
+        post: Post
+        when: When
+        comment: Comment
     suspended:
       title: Account Suspended
       heading: Account Suspended