Merge remote-tracking branch 'upstream/pull/2994'

diff --combined config/locales/en.yml
index 4f97a3fb196a3ddf99d534d490b379379e707bd6,e1c1802532af39b13c46fb42eae7e8eed30cc823..a520fcb0286d0df49ef09bafe208e7f711977060
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -175,12 -175,18 +175,12 @@@ en
      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)"
 -    potlatch2:
 -      name: "Potlatch 2"
 -      description: "Potlatch 2 (in-browser editor)"
      remote:
        name: "Remote Control"
 -      description: "Remote Control (JOSM or Merkaartor)"
 +      description: "Remote Control (JOSM, Potlatch, Merkaartor)"
    auth:
      providers:
        none: None
@@@ -393,8 -399,13 +393,8 @@@
      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"
@@@ -1567,24 -1578,6 +1567,24 @@@
        as_unread: "Message marked as unread"
      destroy:
        destroyed: "Message deleted"
 +  shared:
 +    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
 +    richtext_field:
 +      edit: Edit
 +      preview: Preview
    site:
      about:
        next: Next
@@@ -1789,6 -1782,10 +1789,6 @@@
        anon_edits_html: "(%{link})"
        anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
        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."
      export:
@@@ -1892,10 -1889,6 +1892,10 @@@
          url: https://wiki.openstreetmap.org/
          title: OpenStreetMap Wiki
          description: Browse the wiki for in-depth OpenStreetMap documentation.
 +    potlatch:
 +      removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
 +      desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
 +      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
      sidebar:
        search_results: Search Results
        close: Close
@@@ -2696,6 -2689,7 +2696,7 @@@
            other: You are within %{count} feet of this point
        base:
          standard: Standard
+         cyclosm: CyclOSM
          cycle_map: Cycle Map
          transport_map: Transport Map
          hot: Humanitarian
@@@ -2710,6 -2704,7 +2711,7 @@@
        copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
        donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
        terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+       cyclosm: "Tiles style by <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
        thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
        opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
        hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"