From b19ac4cdd10006b33fd28579345ec82e694b296f Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Tue, 7 May 2013 14:28:27 -0400 Subject: [PATCH] Fix grammar in walkthrough. Fixes #1422 --- data/core.yaml | 4 ++-- data/presets.yaml | 3 +++ data/presets/presets.json | 14 ++++++++++++++ dist/locales/en.json | 10 +++++++--- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 060548d3d..df3ced8e9 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -460,7 +460,7 @@ en: add: "Points can be used to represent features such as shops, restaurants and monuments. They mark a specific location, and describe what's there. **Click the Point button to add a new point.**" place: "Click to place the point on the map. The point we are adding is a Cafe. **Place the point at the corner of This Street and That Street**" place: "The point can be placed by clicking on the map. **Place the point on top of the building.**" - search: "There many different features that can be represented by points. The point you just added is a Cafe. **Search for 'Cafe' **" + search: "There are many different features that can be represented by points. The point you just added is a Cafe. **Search for 'Cafe' **" choose: "**Choose Cafe from the list.**" describe: "The point is now marked as a cafe. Using the feature editor, we can add more information about the feature. **Add a name**" close: "The feature editor can be closed by clicking on the close button. **Close the feature editor**" @@ -469,7 +469,7 @@ en: reselect_delete: "All features on the map can be deleted. **Click on the point you created.**" delete: "The menu around the point contains operations that can be performed on it, including delete. **Delete the point.**" areas: - add: "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most features types points can be used for, and are often preferred. **Click the Area button to add a new area.**" + add: "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most feature types points can be used for, and are often preferred. **Click the Area button to add a new area.**" corner: "Areas are drawn by placing nodes that mark the boundary of the area. **Place the starting node on one of the corners of the playground.**" place: "Draw the area by placing more nodes. Finish the area by clicking on the starting node. **Draw an area for the playground.**" search: "**Search for Playground.**" diff --git a/data/presets.yaml b/data/presets.yaml index 124a400e9..99c4a178c 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -250,6 +250,9 @@ en: amenity: name: Amenity terms: "" + amenity/atm: + name: ATM + terms: "" amenity/bank: name: Bank terms: "coffer,countinghouse,credit union,depository,exchequer,fund,hoard,investment firm,repository,reserve,reservoir,safe,savings,stock,stockpile,store,storehouse,thrift,treasury,trust company,vault" diff --git a/data/presets/presets.json b/data/presets/presets.json index ff3abd936..7767ee830 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -157,6 +157,20 @@ }, "name": "Amenity" }, + "amenity/atm": { + "icon": "bank", + "fields": [ + "operator" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "atm" + }, + "name": "ATM" + }, "amenity/bank": { "icon": "bank", "fields": [ diff --git a/dist/locales/en.json b/dist/locales/en.json index 0d12fac8f..ca1392ae0 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -230,7 +230,7 @@ }, "splash": { "welcome": "Welcome to the iD OpenStreetMap editor", - "text": "iD is a friendly but powerful tool for contributing to the world's best free world map. This is development version {version}. For more information see {website} and report bugs at {github}.", + "text": "iD is a friendly but powerful tool for contributing to the world's best free world map. This is version {version}. For more information see {website} and report bugs at {github}.", "walkthrough": "Start the Walkthrough", "start": "Edit Now" }, @@ -282,7 +282,7 @@ "points": { "add": "Points can be used to represent features such as shops, restaurants and monuments. They mark a specific location, and describe what's there. **Click the Point button to add a new point.**", "place": "The point can be placed by clicking on the map. **Place the point on top of the building.**", - "search": "There many different features that can be represented by points. The point you just added is a Cafe. **Search for 'Cafe' **", + "search": "There are many different features that can be represented by points. The point you just added is a Cafe. **Search for 'Cafe' **", "choose": "**Choose Cafe from the list.**", "describe": "The point is now marked as a cafe. Using the feature editor, we can add more information about the feature. **Add a name**", "close": "The feature editor can be closed by clicking on the close button. **Close the feature editor**", @@ -292,7 +292,7 @@ "delete": "The menu around the point contains operations that can be performed on it, including delete. **Delete the point.**" }, "areas": { - "add": "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most features types points can be used for, and are often preferred. **Click the Area button to add a new area.**", + "add": "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most feature types points can be used for, and are often preferred. **Click the Area button to add a new area.**", "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Place the starting node on one of the corners of the playground.**", "place": "Draw the area by placing more nodes. Finish the area by clicking on the starting node. **Draw an area for the playground.**", "search": "**Search for Playground.**", @@ -673,6 +673,10 @@ "name": "Amenity", "terms": "" }, + "amenity/atm": { + "name": "ATM", + "terms": "" + }, "amenity/bank": { "name": "Bank", "terms": "coffer,countinghouse,credit union,depository,exchequer,fund,hoard,investment firm,repository,reserve,reservoir,safe,savings,stock,stockpile,store,storehouse,thrift,treasury,trust company,vault"