X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/25f83967dfa30ed4043852c1b2edf5414155d92f..aeb4271a27f3a331d65973f3c279cbc5bfa8a8dc:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 31e956c2a..5858dd57c 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -220,7 +220,6 @@ en-GB: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live github: GitHub wikipedia: Wikipedia api: @@ -422,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 @@ -1349,7 +1349,6 @@ en-GB: image: Image gravatar: gravatar: Use Gravatar - link: https://wiki.openstreetmap.org/wiki/Gravatar disabled: Gravatar has been disabled. enabled: Display of your Gravatar has been enabled. new image: Add an image @@ -1385,7 +1384,7 @@ en-GB: facebook: title: Login with Facebook alt: Login with a Facebook Account - windowslive: + microsoft: title: Login with Windows Live alt: Login with a Windows Live Account github: @@ -1704,7 +1703,6 @@ en-GB: trace_not_found: Trace not found! visibility: 'Visibility:' trace_paging_nav: - showing_page: Page %{page} older: Older Traces newer: Newer Traces trace: @@ -1886,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:' @@ -1996,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.