X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bb490aca81d8063a9ad8dd8f1a023c709c096792..e3b8b8933044104bb515d34c3d36851caba78ac7:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a8f523b47..49f8da0f7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -277,9 +277,9 @@ en:
       download_xml: "Download XML"
       view_history: "view history"
       edit: "edit"
-    bug:
-      open_title: "Unresolved issue: {{bug_name}}"
-      closed_title: "Resolved issue: {{bug_name}}"
+    note:
+      open_title: "Unresolved issue: {{note_name}}"
+      closed_title: "Resolved issue: {{note_name}}"
       created_at: "Created at:"
       edited_at: "Edited at:"
       closed_at: "Closed at:"
@@ -1178,13 +1178,13 @@ en:
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
-    map_bug_plain:
-      subject_own: "[OpenStreetMap bugs] {{commenter}} has commented on one of your bugs"
-      subject_other: "[OpenStreetMap bugs] {{commenter}} has commented on a bug you are interested in"
+    note_plain:
+      subject_own: "[OpenStreetMap] {{commenter}} has commented on one of your notes"
+      subject_other: "[OpenStreetMap] {{commenter}} has commented on a note you are interested in"
       greeting: "Hi,"
-      your_bug: "{{commenter}} has left a comment on one of your map bug reports near {{place}}."
-      commented_bug: "{{commenter}} has left a comment on a map bug report you have commented on. The bug is near {{place}}."
-      details: "More details about the bug report can be found at {{URL}}."
+      your_note: "{{commenter}} has left a comment on one of your map notes near {{place}}."
+      commented_note: "{{commenter}} has left a comment on a map note you have commented on. The note is near {{place}}."
+      details: "More details about the note can be found at {{URL}}."
   message:
     inbox:
       title: "Inbox"
@@ -1615,7 +1615,7 @@ en:
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces
-      my bugs: my map bugs
+      my notes: my map notes
       my settings: my settings
       oauth settings: oauth settings
       blocks on me: blocks on me
@@ -1624,7 +1624,7 @@ en:
       diary: diary
       edits: edits
       traces: traces
-      bugs: map bugs
+      notes: map notes
       remove as friend: remove as friend
       add as friend: add as friend
       mapper since: "Mapper since:"
@@ -1872,17 +1872,18 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
-  bugs:
+  note:
     rss:
-      description_area: "A list of bugs, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]"
-      description_item: "An rss feed for bug {{id}}"
-      closed: "closed bug (near {{place}})"
-      new: "new bug (near {{place}})"
+      title: "OpenStreetMap Notes"
+      description_area: "A list of notes, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]"
+      description_item: "An rss feed for note {{id}}"
+      closed: "closed note (near {{place}})"
+      new: "new note (near {{place}})"
       comment: "new comment (near {{place}})"
-    user:
-      title_user: "Bugs submitted or commented on by {{user}}"
-      heading_user: "{{user}}'s bugs"
-      description_user: "Bugs submitted or commented on by {{user}}"
+    mine:
+      title: "Notes submitted or commented on by {{user}}"
+      heading: "{{user}}'s notes"
+      description: "Notes submitted or commented on by {{user}}"
       id: "Id"
       last_changed: "Last changed"