Update tests for change in name from "map_bug" to "note" etc

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e57bbd050d944eb645779cc74b3e93a0e49d9e87..49f8da0f783e906adb354d08d9e477d50a267b77 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -141,6 +141,8 @@ en:
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"

+      deleted_at: "Deleted at:"
+      deleted_by: "Deleted by:"

       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"
       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"


@@ -275,9 +277,9 @@ en:
       download_xml: "Download XML"
       view_history: "view history"
       edit: "edit"
       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:"
       created_at: "Created at:"
       edited_at: "Edited at:"
       closed_at: "Closed at:"


@@ -1071,7 +1073,7 @@ en:
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>
           <li><strong>France</strong>: Contains data sourced from
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>
           <li><strong>France</strong>: Contains data sourced from

-          Direction Générale des Impôts.</i>
+          Direction Générale des Impôts.</li>

           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
           <li><strong>Poland</strong>: Contains data from <a
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
           <li><strong>Poland</strong>: Contains data from <a


@@ -1176,6 +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."
       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."

+    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_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"
   message:
     inbox:
       title: "Inbox"


@@ -1389,10 +1398,9 @@ en:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:

-      your_traces: "See just your traces"

       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"

-      see_your_traces: "See all your traces"
+      see_your_traces: "See your traces"

       traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     trace_optionals:
       tags: "Tags"
       traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     trace_optionals:
       tags: "Tags"


@@ -1607,7 +1615,7 @@ en:
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces
       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
       my settings: my settings
       oauth settings: oauth settings
       blocks on me: blocks on me


@@ -1616,7 +1624,7 @@ en:
       diary: diary
       edits: edits
       traces: traces
       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:"
       remove as friend: remove as friend
       add as friend: add as friend
       mapper since: "Mapper since:"


@@ -1864,17 +1872,18 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."

-  bugs:
+  note:

     rss:
     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}})"
       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"
 
       id: "Id"
       last_changed: "Last changed"
 


@@ -1906,10 +1915,13 @@ en:
       Mark as fixed: Mark as fixed
       Cancel: Cancel
       Create OpenStreetBug: Create OpenStreetBug
       Mark as fixed: Mark as fixed
       Cancel: Cancel
       Create OpenStreetBug: Create OpenStreetBug

-      Create bug: Create bug
-      Bug description: Bug description
-      Create: Create
+      Create bug: Report a problem with the map
+      Bug description: Problem description
+      Create: Report problem

       Permalink: Permalink
       Login: Login
       Details: Details
       Permalink: Permalink
       Login: Login
       Details: Details

+      edityourself: You can also edit the map directly your self
+      draghelp1: Please drag the marker to the location of the problem
+      draghelp2: and descripe it as accurate as possible