Refactor translation strings for notes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b1752834be165044a47cc9d2f9c83e65d7cabc10..40eb533a2db2b44ba7b3b24254749c2083ea8917 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -407,24 +407,6 @@ en:
       telephone_link: "Call %{phone_number}"
       colour_preview: "Colour %{colour_value} preview"
       email_link: "Email %{email}"
-    note:
-      title: "Note: %{id}"
-      new_note: "New Note"
-      description: "Description"
-      open_title: "Unresolved note #%{note_name}"
-      closed_title: "Resolved note #%{note_name}"
-      hidden_title: "Hidden note #%{note_name}"
-      opened_by_html: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      opened_by_anonymous_html: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_anonymous_html: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_html: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_anonymous_html: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      report: report this note
-      coordinates_html: "%{latitude}, %{longitude}"
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
@@ -2837,6 +2819,38 @@ en:
       description: "Description"
       created_at: "Created at"
       last_changed: "Last changed"
+    show:
+      title: "Note: %{id}"
+      description: "Description"
+      open_title: "Unresolved note #%{note_name}"
+      closed_title: "Resolved note #%{note_name}"
+      hidden_title: "Hidden note #%{note_name}"
+      opened_by_html: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      opened_by_anonymous_html: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_anonymous_html: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      closed_by_html: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      closed_by_anonymous_html: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      report: report this note
+      coordinates_html: "%{latitude}, %{longitude}"
+      anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+      hide: Hide
+      resolve: Resolve
+      reactivate: Reactivate
+      comment_and_resolve: Comment & Resolve
+      comment: Comment
+      report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
+      other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
+      other_problems_resolved: "For all other problems, resolving is sufficient."
+      disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."
+    new:
+      title: "New Note"
+      intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
+      advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
+      add: Add Note
   javascripts:
     close: Close
     share:
@@ -2914,22 +2928,6 @@ en:
         unsubscribe: "Unsubscribe"
         hide_comment: "hide"
         unhide_comment: "unhide"
-    notes:
-      new:
-        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
-        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
-        add: Add Note
-      show:
-        anonymous_warning: This note includes comments from anonymous users which should be independently verified.
-        hide: Hide
-        resolve: Resolve
-        reactivate: Reactivate
-        comment_and_resolve: Comment & Resolve
-        comment: Comment
-        report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
-        other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
-        other_problems_resolved: "For all other problems, resolving is sufficient."
-        disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"