Move localised text to locale file

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6403087ef0a6b8e41485533ba6d331e8d90ec38a..7a255cd4b5c82e2e08e115b527aff5c634db0ebe 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1013,10 +1013,10 @@ en:
         FAQ</a>.
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
-        free-of-charge map API for third-party developers.
-        See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
-        <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
-        and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
+        free-of-charge map API for third-parties.
+        See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+        <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+        and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
       contributors_title_html: Our contributors
       contributors_intro_html: |
         Our contributors are thousands of individuals. We also include
@@ -1315,10 +1315,23 @@ en:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
         your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}"
+        your_changeset_html: '<a href="%{commenter_url}" target="_blank" style="text-decoration: none; color: #222"><strong>%{commenter}</strong></a>
+           has left a comment on one of your changesets
+           created at %{time}'
         commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}"
+        commented_changeset_html: '<a href="%{commenter_url}" target="_blank" style="text-decoration: none; color: #222"><strong>%{commenter}</strong></a>
+          has left a comment on a map changeset you are watching created by
+          %{changeset_author}
+          at %{time}'
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
+        partial_changeset_with_comment_html: 'with comment <em>%{changeset_comment}</em>'
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
+      details_html: 'More details about the changeset can be found at
+         <nobr>%{url}</nobr>.'
+      unsubscribe_html: 'To unsubscribe from updates to this changeset,
+        visit <nobr><a style="color: #222" href="%{url}">%{url}</a></nobr>
+        and click "Unsubscribe".'
   message:
     inbox:
       title: "Inbox"
@@ -1746,6 +1759,9 @@ en:
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
@@ -2285,6 +2301,11 @@ en:
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+        turn_left_with_exit: At roundabout turn left onto %{name}
+        slight_left_with_exit: At roundabout slight left onto %{name}
+        turn_right_with_exit: At roundabout turn right onto %{name}
+        slight_right_with_exit: At roundabout slight right onto %{name}
+        continue_with_exit: At roundabout continue straight onto %{name}
         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
       time: "Time"