Fix URL generation for atom feed on history page

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 21426931685f357231cd2a56cd72d48174bff466..b48b8b72756079dd537dbfd1b9962de4cc1811d6 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -147,20 +147,29 @@ en-GB:
         title: Subject
         body: Body
         recipient: Recipient
+      redaction:
+        description: Description
       report:
         category: 'Select a reason for your report:'
         details: Please provide some more details about the problem (required).
       user:
         email: E-mail
+        new_email: 'New Email Address:'
         active: Active
         display_name: Display Name
         description: Description
+        home_lat: 'Latitude:'
+        home_lon: 'Longitude:'
         languages: Languages
         pass_crypt: Password
         pass_crypt_confirmation: Confirm Password
     help:
       trace:
         tagstring: comma delimited
+      user_block:
+        needs_view: Does the user need to log in before this block will be cleared?
+      user:
+        new_email: (never displayed publicly)
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -2022,15 +2031,10 @@ en-GB:
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
-      not_displayed_publicly_html: Your address is not displayed publicly, see our
-        <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy
-        policy including section on email addresses">privacy policy</a> for more information
       display name: 'Display Name:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'
-      password: 'Password:'
-      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.
@@ -2134,8 +2138,6 @@ en-GB:
       title: Edit account
       my settings: My settings
       current email address: 'Current Email Address:'
-      new email address: 'New Email Address:'
-      email never displayed publicly: (never displayed publicly)
       external auth: 'External Authentication:'
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
@@ -2166,14 +2168,10 @@ en-GB:
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?
-      profile description: 'Profile Description:'
-      preferred languages: 'Preferred Languages:'
-      preferred editor: 'Preferred Editor:'
       image: 'Image:'
       gravatar:
         gravatar: Use Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
-        link text: what is this?
         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image
@@ -2183,8 +2181,6 @@ en-GB:
       image size hint: (square images at least 100x100 work best)
       home location: 'Home Location:'
       no home location: You have not entered your home location.
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
       update home location on click: Update home location when I click on the map?
       save changes button: Save Changes
       make edits public button: Make all my edits public
@@ -2291,27 +2287,17 @@ en-GB:
     new:
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation, remembering
-        that the message will be publicly visible. Bear in mind that not all users
-        understand the community jargon, so please try to use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
       tried_contacting: I have contacted the user and asked them to stop.
       tried_waiting: I have given a reasonable amount of time for the user to respond
         to those communications.
-      needs_view: User needs to log in before this block will be cleared
       back: View all blocks
     edit:
       title: Editing block on %{name}
       heading_html: Editing block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation. Bear in
-        mind that not all users understand the community jargon, so please try to
-        use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
       show: View this block
       back: View all blocks
-      needs_view: Does the user need to log in before this block will be cleared?
     filter:
       block_expired: The block has already expired and cannot be edited.
       block_period: The blocking period must be one of the values selectable in the
@@ -2406,7 +2392,6 @@ en-GB:
       custom_dimensions: Set custom dimensions
       format: 'Format:'
       scale: 'Scale:'
-      image_size: Image will show standard layer at
       download: Download
       short_url: Short URL
       include_marker: Include marker
@@ -2562,7 +2547,6 @@ en-GB:
       centre_map: Centre map here
   redactions:
     edit:
-      description: Description
       heading: Edit redaction
       title: Edit redaction
     index:
@@ -2570,7 +2554,6 @@ en-GB:
       heading: List of redactions
       title: List of redactions
     new:
-      description: Description
       heading: Enter information for new redaction
       title: Creating new redaction
     show: