diff --git a/data/core.yaml b/data/core.yaml index e0cb00c69..80d36ba07 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -1315,7 +1315,7 @@ en: select_h: "Select" select_left_click: "{leftclick} Left-click or {tap_icon} tap a feature to select it. This will highlight it with a pulsing glow and display further details about it in the sidebar." select_right_click: "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides commands such as copy, rotate, and delete." - select_space: "The `{space}` key can also be used in place of left-click when selecting and drawing." + select_space: "The `{space}` key can also be used instead of left-click when selecting and drawing." multiselect_h: "Multiselect" multiselect: "Selecting multiple features together lets you quickly edit them all at once." multiselect_shift_click: "With a mouse and keyboard, hold `{shift}` and {leftclick} left-click features to add them to the selection. On a touchscreen, {longpress_icon} tap-and-hold one feature while {tap_icon} tapping additional features with another finger." @@ -1352,7 +1352,7 @@ en: add_point: "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`." add_point_finish: "Next, place the new point on the map. With a mouse, position the cursor where the point should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location." move_point_h: "Moving Points" - move_point: "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen." + move_point: "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen." delete_point_h: "Deleting Points" delete_point: "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it." delete_point_command: "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** command." @@ -1428,7 +1428,7 @@ en: add_note_h: "Adding Notes" add_note: "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`." place_note: "Next, place the new note on the map. With a mouse, position the cursor where the note should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location." - move_note: "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen. Only new notes can be moved." + move_note: "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen. Only new notes can be moved." update_note_h: "Closing, Reopening, and Commenting" update_note: "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved." save_note_h: "Saving Notes" @@ -2051,7 +2051,7 @@ en: retry_building: "It looks like you had some trouble placing the nodes at the building corners. Try again!" choose_category_building: "**Choose {category} from the list.**" choose_preset_house: "There are many different types of buildings, but this one is clearly a house.{br}If you're not sure of the type, it's OK to just choose the generic Building type. **Choose the {preset} type.**" - close: "**Press `{esc}` or the {apply} button to close the feature editor.**" + close: "**Press the {button} button or `{esc}` to close the feature editor.**" rightclick_building: "**{rightclick} Right-click to select the building you created and show the edit menu.**" edit_menu_building_touch: "**{longpress_icon} Long-press the building you created to show the edit menu.**" square_building: "The house that you just added will look even better with perfectly square corners. **Press the {orthogonalize_icon} {orthogonalize} button to tidy up the building's shape.**" diff --git a/dist/locales/en.json b/dist/locales/en.json index 9e1fda685..2adb27e11 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1651,7 +1651,7 @@ "select_h": "Select", "select_left_click": "{leftclick} Left-click or {tap_icon} tap a feature to select it. This will highlight it with a pulsing glow and display further details about it in the sidebar.", "select_right_click": "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides commands such as copy, rotate, and delete.", - "select_space": "The `{space}` key can also be used in place of left-click when selecting and drawing.", + "select_space": "The `{space}` key can also be used instead of left-click when selecting and drawing.", "multiselect_h": "Multiselect", "multiselect": "Selecting multiple features together lets you quickly edit them all at once.", "multiselect_shift_click": "With a mouse and keyboard, hold `{shift}` and {leftclick} left-click features to add them to the selection. On a touchscreen, {longpress_icon} tap-and-hold one feature while {tap_icon} tapping additional features with another finger.", @@ -1690,7 +1690,7 @@ "add_point": "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`.", "add_point_finish": "Next, place the new point on the map. With a mouse, position the cursor where the point should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location.", "move_point_h": "Moving Points", - "move_point": "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen.", + "move_point": "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen.", "delete_point_h": "Deleting Points", "delete_point": "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it.", "delete_point_command": "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** command." @@ -1770,7 +1770,7 @@ "add_note_h": "Adding Notes", "add_note": "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`.", "place_note": "Next, place the new note on the map. With a mouse, position the cursor where the note should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location.", - "move_note": "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen. Only new notes can be moved.", + "move_note": "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen. Only new notes can be moved.", "update_note_h": "Closing, Reopening, and Commenting", "update_note": "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved.", "save_note_h": "Saving Notes", @@ -2530,7 +2530,7 @@ "retry_building": "It looks like you had some trouble placing the nodes at the building corners. Try again!", "choose_category_building": "**Choose {category} from the list.**", "choose_preset_house": "There are many different types of buildings, but this one is clearly a house.{br}If you're not sure of the type, it's OK to just choose the generic Building type. **Choose the {preset} type.**", - "close": "**Press `{esc}` or the {apply} button to close the feature editor.**", + "close": "**Press the {button} button or `{esc}` to close the feature editor.**", "rightclick_building": "**{rightclick} Right-click to select the building you created and show the edit menu.**", "edit_menu_building_touch": "**{longpress_icon} Long-press the building you created to show the edit menu.**", "square_building": "The house that you just added will look even better with perfectly square corners. **Press the {orthogonalize_icon} {orthogonalize} button to tidy up the building's shape.**", diff --git a/modules/ui/intro/area.js b/modules/ui/intro/area.js index 8aa81ac67..2eabd6b67 100644 --- a/modules/ui/intro/area.js +++ b/modules/ui/intro/area.js @@ -436,7 +436,7 @@ export function uiIntroArea(context, reveal) { }); reveal('.entity-editor-pane', - helpString('intro.areas.describe_playground', { button: icon('#iD-icon-apply', 'pre-text') }), + helpString('intro.areas.describe_playground', { button: icon('#iD-icon-close', 'pre-text') }), { duration: 300 } ); diff --git a/modules/ui/intro/building.js b/modules/ui/intro/building.js index c8cf14393..226127b33 100644 --- a/modules/ui/intro/building.js +++ b/modules/ui/intro/building.js @@ -9,7 +9,7 @@ import { t } from '../../core/localizer'; import { modeBrowse } from '../../modes/browse'; import { modeSelect } from '../../modes/select'; import { utilArrayUniq, utilRebind } from '../../util'; -import { helpString, pad, isMostlySquare, selectMenuItem, transitionTime } from './helper'; +import { helpString, icon, pad, isMostlySquare, selectMenuItem, transitionTime } from './helper'; export function uiIntroBuilding(context, reveal) { @@ -300,7 +300,7 @@ export function uiIntroBuilding(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - helpString('intro.buildings.close') + helpString('intro.buildings.close', { button: icon('#iD-icon-close', 'pre-text') }) ); }, 500); @@ -628,7 +628,7 @@ export function uiIntroBuilding(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - helpString('intro.buildings.close') + helpString('intro.buildings.close', { button: icon('#iD-icon-close', 'pre-text') }) ); }, 500); diff --git a/modules/ui/intro/helper.js b/modules/ui/intro/helper.js index 43bd9a9a6..36a4554f2 100644 --- a/modules/ui/intro/helper.js +++ b/modules/ui/intro/helper.js @@ -67,8 +67,6 @@ export function helpString(id, replacements) { layers_icon: icon('#iD-icon-layers', 'pre-text'), data_icon: icon('#iD-icon-data', 'pre-text'), inspect: icon('#iD-icon-inspect', 'pre-text'), - close: icon('#iD-icon-close', 'pre-text'), - apply: icon('#iD-icon-apply', 'pre-text'), help_icon: icon('#iD-icon-help', 'pre-text'), undo_icon: icon(localizer.textDirection() === 'rtl' ? '#iD-icon-redo' : '#iD-icon-undo', 'pre-text'), redo_icon: icon(localizer.textDirection() === 'rtl' ? '#iD-icon-undo' : '#iD-icon-redo', 'pre-text'), diff --git a/modules/ui/intro/line.js b/modules/ui/intro/line.js index 821118ccc..72fcb0ac2 100644 --- a/modules/ui/intro/line.js +++ b/modules/ui/intro/line.js @@ -338,7 +338,7 @@ export function uiIntroLine(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - helpString('intro.lines.name_road', { button: icon('#iD-icon-apply', 'pre-text') }), + helpString('intro.lines.name_road', { button: icon('#iD-icon-close', 'pre-text') }), { tooltipClass: 'intro-lines-name_road' } ); }, 500); diff --git a/modules/ui/intro/point.js b/modules/ui/intro/point.js index d0655777d..8aa6fe53a 100644 --- a/modules/ui/intro/point.js +++ b/modules/ui/intro/point.js @@ -351,7 +351,7 @@ export function uiIntroPoint(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - helpString('intro.points.update_close', { button: icon('#iD-icon-apply', 'pre-text') }) + helpString('intro.points.update_close', { button: icon('#iD-icon-close', 'pre-text') }) ); }, 500); diff --git a/svg/iD-sprite/graphics/walkthrough-doubletap.svg b/svg/iD-sprite/graphics/walkthrough-doubletap.svg index 68994fa0e..a783dfc44 100644 --- a/svg/iD-sprite/graphics/walkthrough-doubletap.svg +++ b/svg/iD-sprite/graphics/walkthrough-doubletap.svg @@ -1,5 +1,5 @@ - - + +