Merge branch 'master' into iD-2.19.6

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0def1aaec16461b881eb00f573c0707526d387d8..f7ee6d04a5822234ed598383e0d835056ff50766 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -116,6 +116,9 @@ en:
         title: "Subject"
         body: "Body"
         recipient: "Recipient"
         title: "Subject"
         body: "Body"
         recipient: "Recipient"

+      redaction:
+        title: Title
+        description: Description

       report:
         category: Select a reason for your report
         details: Please provide some more details about the problem (required).
       report:
         category: Select a reason for your report
         details: Please provide some more details about the problem (required).


@@ -1992,23 +1995,6 @@ en:
           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"
           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"

-    richtext_area:
-      edit: Edit
-      preview: Preview
-    markdown_help:
-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Headings
-      heading: Heading
-      subheading: Subheading
-      unordered: Unordered list
-      ordered: Ordered list
-      first: First item
-      second: Second item
-      link: Link
-      text: Text
-      image: Image
-      alt: Alt text
-      url: URL

     welcome:
       title: Welcome!
       introduction_html: |
     welcome:
       title: Welcome!
       introduction_html: |


@@ -2841,7 +2827,6 @@ en:
       centre_map: Centre map here
   redactions:
     edit:
       centre_map: Centre map here
   redactions:
     edit:

-      description: "Description"

       heading: "Edit redaction"
       title: "Edit redaction"
     index:
       heading: "Edit redaction"
       title: "Edit redaction"
     index:


@@ -2849,7 +2834,6 @@ en:
       heading: "List of redactions"
       title: "List of redactions"
     new:
       heading: "List of redactions"
       title: "List of redactions"
     new:

-      description: "Description"

       heading: "Enter information for new redaction"
       title: "Creating new redaction"
     show:
       heading: "Enter information for new redaction"
       title: "Creating new redaction"
     show: