Refactor login/logout into sessions controller

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2a51a1e9609971eb15f4b401540bf634c30fb176..7b2558ca2b24a62e8c4f427704d83a622dc790a9 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -21,6 +21,7 @@
 # Author: Jlrb+
 # Author: Kosovastar
 # Author: Macofe
 # Author: Jlrb+
 # Author: Kosovastar
 # Author: Macofe

+# Author: Maro21

 # Author: Meno25
 # Author: Michel Bakni
 # Author: Mvolz
 # Author: Meno25
 # Author: Michel Bakni
 # Author: Mvolz


@@ -109,7 +110,7 @@ en-GB:
       client_application:
         name: Name (Required)
         url: Main Application URL (Required)
       client_application:
         name: Name (Required)
         url: Main Application URL (Required)

-        callback_url: Callback URL
+        callback_url: 'Callback URL:'

         support_url: Support URL
         allow_read_prefs: read their user preferences
         allow_write_prefs: modify their user preferences
         support_url: Support URL
         allow_read_prefs: read their user preferences
         allow_write_prefs: modify their user preferences


@@ -146,20 +147,29 @@ en-GB:
         title: Subject
         body: Body
         recipient: Recipient
         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
       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
         active: Active
         display_name: Display Name

-        description: Description
-        languages: Languages
+        description: Profile Description
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Preferred Languages

         pass_crypt: Password
         pass_crypt_confirmation: Confirm Password
     help:
       trace:
         tagstring: comma delimited
         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:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -204,18 +214,12 @@ en-GB:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Default (currently %{name})
     with_name_html: '%{name} (%{id})'
   editor:
     default: Default (currently %{name})

-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (in-browser editor)

     id:
       name: iD
       description: iD (in-browser editor)
     id:
       name: iD
       description: iD (in-browser editor)

-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-browser editor)

     remote:
       name: Remote Control
     remote:
       name: Remote Control

-      description: Remote Control (JOSM or Merkaartor)
+      description: Remote Control (JOSM, Potlatch, Merkaartor)

   auth:
     providers:
       none: None
   auth:
     providers:
       none: None


@@ -422,13 +426,8 @@ en-GB:
     new:
       title: New Diary Entry
     form:
     new:
       title: New Diary Entry
     form:

-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Language:'
-      location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: use map
+      location: Location
+      use_map_link: Use map

     index:
       title: Users' diaries
       title_friends: Friends' diaries
     index:
       title: Users' diaries
       title_friends: Friends' diaries


@@ -457,7 +456,7 @@ en-GB:
       body: Sorry, there is no diary entry or comment with the id %{id}. Please check
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:
       body: Sorry, there is no diary entry or comment with the id %{id}. Please check
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:

-      posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
+      posted_by_html: Posted by %{link_user} on %{created} in %{language_link}.

       updated_at_html: Last updated on %{updated}.
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       updated_at_html: Last updated on %{updated}.
       comment_link: Comment on this entry
       reply_link: Send a message to the author


@@ -657,12 +656,17 @@ en-GB:
         building:
           apartment: Apartment
           apartments: Apartments
         building:
           apartment: Apartment
           apartments: Apartments

+          bungalow: Bungalow

           cabin: Cabin
           cabin: Cabin

+          chapel: Chapel
+          church: Church

           college: College Building
           commercial: Commercial Building
           construction: Building under Construction
           garage: Garage
           garages: Garages
           college: College Building
           commercial: Commercial Building
           construction: Building under Construction
           garage: Garage
           garages: Garages

+          hospital: Hospital
+          hotel: Hotel

           house: House
           industrial: Industrial Building
           roof: Roof
           house: House
           industrial: Industrial Building
           roof: Roof


@@ -1265,7 +1269,6 @@ en-GB:
     inbox:
       title: Inbox
       my_inbox: My Inbox
     inbox:
       title: Inbox
       my_inbox: My Inbox

-      outbox: outbox

       messages: You have %{new_messages} and %{old_messages}
       new_messages:
         one: '%{count} new message'
       messages: You have %{new_messages} and %{old_messages}
       new_messages:
         one: '%{count} new message'


@@ -1300,9 +1303,6 @@ en-GB:
       body: Sorry, there is no message with that id.
     outbox:
       title: Outbox
       body: Sorry, there is no message with that id.
     outbox:
       title: Outbox

-      my_inbox_html: My %{inbox_link}
-      inbox: inbox
-      outbox: outbox

       messages:
         one: You have %{count} sent message
         other: You have %{count} sent messages
       messages:
         one: You have %{count} sent message
         other: You have %{count} sent messages


@@ -1507,17 +1507,6 @@ en-GB:
       user_page_link: user page
       anon_edits_html: (%{link})
       anon_edits_link_text: Find out why this is the case.
       user_page_link: user page
       anon_edits_html: (%{link})
       anon_edits_link_text: Find out why this is the case.

-      flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap
-        Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download
-        Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several
-        other options</a> are also available for editing OpenStreetMap.
-      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
-        should deselect the current way or point, if editing in live mode, or click
-        save if you have a save button.)
-      potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        for more information
-      potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
-        you should click save.)

       id_not_configured: iD has not been configured
       no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
         for this feature.
       id_not_configured: iD has not been configured
       no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
         for this feature.


@@ -1707,23 +1696,6 @@ en-GB:
           bicycle_shop: Bicycle shop
           bicycle_parking: Bicycle parking
           toilets: Toilets
           bicycle_shop: Bicycle shop
           bicycle_parking: Bicycle parking
           toilets: Toilets

-    richtext_area:
-      edit: Edit
-      preview: Preview
-    markdown_help:
-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Headings
-      heading: Heading
-      subheading: Subheading
-      unordered: Unordered list
-      ordered: Ordered list
-      first: First item
-      second: Second item
-      link: Link
-      text: Text
-      image: Image
-      alt: Alt text
-      url: URL

     welcome:
       title: Welcome!
       introduction_html: Welcome to OpenStreetMap, the free and editable map of the
     welcome:
       title: Welcome!
       introduction_html: Welcome to OpenStreetMap, the free and editable map of the


@@ -1834,7 +1806,6 @@ en-GB:
       more: more
       trace_details: View Trace Details
       view_map: View Map
       more: more
       trace_details: View Trace Details
       view_map: View Map

-      edit: edit

       edit_map: Edit Map
       public: PUBLIC
       identifiable: IDENTIFIABLE
       edit_map: Edit Map
       public: PUBLIC
       identifiable: IDENTIFIABLE


@@ -1842,7 +1813,6 @@ en-GB:
       trackable: TRACKABLE
       by: by
       in: in
       trackable: TRACKABLE
       by: by
       in: in

-      map: map

     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}


@@ -2038,15 +2008,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:'
           <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:'
       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.
       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.


@@ -2149,15 +2114,13 @@ en-GB:
     account:
       title: Edit account
       my settings: My settings
     account:
       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:'
+      current email address: Current Email Address
+      external auth: External Authentication

       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: what is this?
       public editing:
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: what is this?
       public editing:

-        heading: 'Public editing:'
+        heading: Public editing

         enabled: Enabled. Not anonymous and can edit data.
         enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: what is this?
         enabled: Enabled. Not anonymous and can edit data.
         enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: what is this?


@@ -2173,7 +2136,7 @@ en-GB:
           public.</li><li>This action cannot be reversed and all new users are now
           public by default.</li></ul>
       contributor terms:
           public.</li><li>This action cannot be reversed and all new users are now
           public by default.</li></ul>
       contributor terms:

-        heading: 'Contributor Terms:'
+        heading: Contributor Terms

         agreed: You have agreed to the new Contributor Terms.
         not yet agreed: You have not yet agreed to the new Contributor Terms.
         review link text: Please follow this link at your convenience to review and
         agreed: You have agreed to the new Contributor Terms.
         not yet agreed: You have not yet agreed to the new Contributor Terms.
         review link text: Please follow this link at your convenience to review and


@@ -2182,14 +2145,10 @@ en-GB:
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?
           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:'
+      image: Image

       gravatar:
         gravatar: Use Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
       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
         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image


@@ -2197,10 +2156,8 @@ en-GB:
       delete image: Remove the current image
       replace image: Replace the current image
       image size hint: (square images at least 100x100 work best)
       delete image: Remove the current image
       replace image: Replace the current image
       image size hint: (square images at least 100x100 work best)

-      home location: 'Home Location:'
+      home location: Home Location

       no home location: You have not entered your 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
       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


@@ -2307,27 +2264,17 @@ en-GB:
     new:
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
     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.
       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}
       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
       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
     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


@@ -2422,7 +2369,6 @@ en-GB:
       custom_dimensions: Set custom dimensions
       format: 'Format:'
       scale: 'Scale:'
       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
       download: Download
       short_url: Short URL
       include_marker: Include marker


@@ -2578,7 +2524,6 @@ en-GB:
       centre_map: Centre map here
   redactions:
     edit:
       centre_map: Centre map here
   redactions:
     edit:

-      description: Description

       heading: Edit redaction
       title: Edit redaction
     index:
       heading: Edit redaction
       title: Edit redaction
     index:


@@ -2586,7 +2531,6 @@ en-GB:
       heading: List of redactions
       title: List of redactions
     new:
       heading: List of redactions
       title: List of redactions
     new:

-      description: Description

       heading: Enter information for new redaction
       title: Creating new redaction
     show:
       heading: Enter information for new redaction
       title: Creating new redaction
     show: