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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1cec3f148..e9ee39812 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -360,10 +360,6 @@ en:
       title: "No such diary entry"
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      title: "No such user"
-      heading: "The user %{user} does not exist"
-      body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
       posted_by: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry
@@ -974,13 +970,13 @@ en:
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
     intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
-    intro_2: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+    intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
     intro_2_create_account: "Create a user account"
     intro_2_license: "open license"
     intro_2_use: "use"
     intro_2_download: "download"
     intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
-    partners: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
+    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
     partners_ucl: "the UCL VR Centre"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
@@ -1257,10 +1253,6 @@ en:
       back_to_inbox: "Back to inbox"
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
-    no_such_user:
-      title: "No such user"
-      heading: "No such user"
-      body: "Sorry there is no user with that name."
     no_such_message:
       title: "No such message"
       heading: "No such message"
@@ -1404,6 +1396,23 @@ en:
           permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
+    richtext_area:
+      edit: Edit
+      preview: Preview
+    markdown_help:
+      title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</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
   trace:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
@@ -1431,10 +1440,6 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-    no_such_user:
-      title: "No such user"
-      heading: "The user %{user} does not exist"
-      body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     trace_form:
       upload_gpx: "Upload GPX File:"
       description: "Description:"