X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/547459314bd5a942c7dfc8914ddae93a8bac9151..4abd9cfcf19701bf43322374c5df6dd586449e54:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ebbe71b2c..a520fcb02 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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
@@ -1795,10 +1789,6 @@ en:
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 download Flash Player from Adobe.com. Several other options 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:
@@ -1902,6 +1892,10 @@ en:
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 downloading the desktop application for Mac and Windows.
+ id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your user settings here.
sidebar:
search_results: Search Results
close: Close
@@ -2702,6 +2696,7 @@ en:
other: You are within %{count} feet of this point
base:
standard: Standard
+ cyclosm: CyclOSM
cycle_map: Cycle Map
transport_map: Transport Map
hot: Humanitarian
@@ -2716,6 +2711,7 @@ en:
copyright: "© OpenStreetMap contributors"
donate_link_text: "Make a Donation"
terms: "Website and API terms"
+ cyclosm: "Tiles style by CyclOSM hosted by OpenStreetMap France"
thunderforest: "Tiles courtesy of Andy Allan"
opnvkarte: "Tiles courtesy of MeMoMaps"
hotosm: "Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France"