X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f13f9473798a81113ac640612b878febd4afa714..1c7ead6008397ce815de4102d023a708be636a3c:/config/locales/en.yml?ds=sidebyside

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a728fe183..29c416c76 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"
+      note: "Note"
       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"
@@ -356,8 +357,7 @@ en:
         way: "Way"
         relation: "Relation"
     containing_relation:
-      entry_html: "Relation %{relation_name}"
-      entry_role_html: "Relation %{relation_name} (as %{relation_role})"
+      entry_role_html: "%{relation_name} (as %{relation_role})"
     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."
@@ -1076,7 +1076,7 @@ en:
         man_made:
           adit: "Adit"
           advertising: "Advertising"
-          antenna:  "Antenna"
+          antenna: "Antenna"
           avalanche_protection: "Avalanche Protection"
           beacon: "Beacon"
           beam: "Beam"
@@ -1763,14 +1763,14 @@ en:
         one: "%{count} muted message"
         other: "You have %{count} muted messages"
     reply:
-      wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
+      wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
     show:
       title: "Read message"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       destroy_button: "Delete"
       back: "Back"
-      wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."
+      wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."
     sent_message_summary:
       destroy_button: "Delete"
     heading:
@@ -2544,7 +2544,7 @@ en:
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
-      traces_from: "Public Traces from %{user}"
+      traces_from_html: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
@@ -2826,14 +2826,14 @@ en:
         with your ID in your user settings.
   user_role:
     filter:
-      not_a_role: "The string `%{role}' is not a valid role."
+      not_a_role: "The string '%{role}' is not a valid role."
       already_has_role: "The user already has role %{role}."
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:
-      are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
+      are_you_sure: "Are you sure you want to grant the role '%{role}' to the user '%{name}'?"
     revoke:
-      are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
+      are_you_sure: "Are you sure you want to revoke the role '%{role}' from the user '%{name}'?"
   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
@@ -2925,9 +2925,9 @@ en:
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
-      blocks_on_user: "Blocks on %{user}"
+      blocks_on_user_html: "Blocks on %{user}"
       blocks_by_me: "Blocks by Me"
-      blocks_by_user: "Blocks by %{user}"
+      blocks_by_user_html: "Blocks by %{user}"
       block: "Block #%{id}"
       new_block: "New Block"
   user_mutes:
@@ -2966,6 +2966,11 @@ en:
       description: "Description"
       created_at: "Created at"
       last_changed: "Last changed"
+      apply: "Apply"
+      all: "All"
+      open: "Open"
+      closed: "Closed"
+      status: "Status"
     show:
       title: "Note: %{id}"
       description: "Description"
@@ -2984,6 +2989,9 @@ en:
       report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
       anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+      discussion: Discussion
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe
       hide: Hide
       resolve: Resolve
       reactivate: Reactivate