Fix display of raw HTML in flash message

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad20f490521e43e66f4c81f3459ee85a2f51f848..9027252f7e2f571030a949a46fe7bec79c858efd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1425,6 +1425,7 @@ en:
       table:
         entry:
           motorway: "Motorway"
+          main_road: "Main road"
           trunk: "Trunk road"
           primary: "Primary road"
           secondary: "Secondary road"
@@ -1784,16 +1785,6 @@ en:
       confirm password: "Confirm Password:"
       use external auth: "Alternatively, use a third party to login"
       auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
-      auth association: |
-        <p>Your ID is not associated with a OpenStreetMap account yet.</p>
-        <ul>
-          <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
-          <li>
-            If you already have an account, you can login to your account
-            using your username and password and then associate the account
-            with your ID in your user settings.
-          </li>
-        </ul>
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
@@ -2008,6 +1999,15 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
+    auth_association:
+      heading: Your ID is not associated with a OpenStreetMap account yet.
+      option_1: |
+        If you are new to OpenStreetMap, please create a new account
+        using the form below.
+      option_2: |
+        If you already have an account, you can login to your account
+        using your username and password and then associate the account
+        with your ID in your user settings.
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."