Do not merge zoom/lat/lon options with oauth_return_url

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 3fbb69c26d3ddad7a9b6f5a95d2efe1c60210345..5858dd57c7aa018d2760f847d7d9f9721f00da4e 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -421,6 +421,7 @@ en-GB:
     contact:
       km away: '%{count}km away'
       m away: '%{count}m away'
+      latest_edit_html: 'Latest edit (%{ago}):'
     popup:
       your location: Your location
       nearby mapper: Nearby mapper
@@ -1883,7 +1884,6 @@ en-GB:
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined
-      latest edit: 'Latest edit (%{ago}):'
       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'
@@ -1993,8 +1993,8 @@ en-GB:
     revoke:
       title: Revoking block on %{block_on}
       heading_html: Revoking block on %{block_on} by %{block_by}
-      time_future: This block will end in %{time}.
-      past: This block ended %{time} and cannot be revoked now.
+      time_future_html: This block will end in %{time}.
+      past_html: This block ended %{time} and cannot be revoked now.
       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.